Jun 14, 2022 · Jun 10, 2022 · Jun 10, 2022 · Jun 10, 2022 · Jun 10, 2022 · Jun 10, 2022
diff --git a/cli/server.go b/cli/server.go
 "golang.org/x/mod/semver"
 "golang.org/x/oauth2"
 xgithub"golang.org/x/oauth2/github"
 "golang.org/x/sync/errgroup"
 "golang.org/x/xerrors"
 "google.golang.org/api/idtoken"
 "google.golang.org/api/option"
 }

 var (
 tunnelErrChan<-chanerror
 ctxTunnel,closeTunnel=context.WithCancel(cmd.Context())
 devTunnel= (*devtunnel.Tunnel)(nil)
 devTunnelErrChan=make(<-chanerror,1)
 )
 defercloseTunnel()

 }
 }
 iferr==nil {
 accessURL,tunnelErrChan,err=devtunnel.New(ctxTunnel,localURL)
 devTunnel,devTunnelErrChan,err=devtunnel.New(ctxTunnel,logger.Named("devtunnel"))
 iferr!=nil {
 returnxerrors.Errorf("create tunnel: %w",err)
 }
 accessURL=devTunnel.URL
 }
 _,_=fmt.Fprintln(cmd.ErrOrStderr())
 }

 // Warn the user if the access URL appears to be a loopback address.
 isLocal,err:=isLocalURL(cmd.Context(),accessURL)
 ifisLocal||err!=nil {
 varreasonstring
 ifisLocal {
 reason="appears to be a loopback address"
 }else {
 reason="could not be resolved"
 }
 _,_=fmt.Fprintf(cmd.ErrOrStderr(),cliui.Styles.Wrap.Render(
 cliui.Styles.Warn.Render("Warning:")+" The current access URL:")+"\n\n")
 _,_=fmt.Fprintf(cmd.ErrOrStderr(),"  "+cliui.Styles.Field.Render(accessURL)+"\n\n")
 _,_=fmt.Fprintf(cmd.ErrOrStderr(),cliui.Styles.Wrap.Render(
 reason+". Provisioned workspaces are unlikely to be able to "+
 "connect to Coder. Please consider changing your "+
 "access URL using the --access-url option, or directly "+
 "specifying access URLs on templates.",
 )+"\n\n")
 _,_=fmt.Fprintf(cmd.ErrOrStderr(),"For more information, see "+
 "https://github.com/coder/coder/issues/1528\n\n")
 }

 validator,err:=idtoken.NewValidator(cmd.Context(),option.WithoutAuthentication())
 iferr!=nil {
 returnerr
 returnshutdownConnsCtx
 },
 }
 errCh<-server.Serve(listener)

 wg:= errgroup.Group{}
 wg.Go(func()error {
 // Make sure to close the tunnel listener if we exit so the
 // errgroup doesn't wait forever!
 ifdev&&tunnel {
 deferdevTunnel.Listener.Close()
 }

 returnserver.Serve(listener)
 })

 ifdev&&tunnel {
 wg.Go(func()error {
 deferlistener.Close()

 returnserver.Serve(devTunnel.Listener)
 })
 }

 errCh<-wg.Wait()
 }()

 config:=createConfig(cmd)
 case<-cmd.Context().Done():
 coderAPI.Close()
 returncmd.Context().Err()
 caseerr:=<-tunnelErrChan:
 caseerr:=<-devTunnelErrChan:
 iferr!=nil {
 returnerr
 }
 ifdev&&tunnel {
 _,_=fmt.Fprintf(cmd.OutOrStdout(),cliui.Styles.Prompt.String()+"Waiting for dev tunnel to close...\n")
 closeTunnel()
 <-tunnelErrChan
 <-devTunnelErrChan
 }

 _,_=fmt.Fprintf(cmd.OutOrStdout(),cliui.Styles.Prompt.String()+"Waiting for WebSocket connections to close...\n")

 returnfunc() {_=srv.Close() }
 }

 // isLocalURL returns true if the hostname of the provided URL appears to
 // resolve to a loopback address.
 funcisLocalURL(ctx context.Context,urlStringstring) (bool,error) {
 parsedURL,err:=url.Parse(urlString)
 iferr!=nil {
 returnfalse,err
 }
 resolver:=&net.Resolver{}
 ips,err:=resolver.LookupIPAddr(ctx,parsedURL.Hostname())
 iferr!=nil {
 returnfalse,err
 }

 for_,ip:=rangeips {
 ifip.IP.IsLoopback() {
 returntrue,nil
 }
 }
 returnfalse,nil
 }
diff --git a/cli/server_test.go b/cli/server_test.go
 }else {
 t.Error("expected password line output; got no match")
 }

 // Verify that we warned the user about the default access URL possibly not being what they want.
 assert.Contains(t,buf.String(),"coder/coder/issues/1528")
 })

 // Duplicated test from "Development" above to test setting email/password via env.
 assert.Contains(t,buf.String(),fmt.Sprintf("password: %s",wantPassword),"expected output %q; got no match",wantPassword)
 })

 t.Run("NoWarningWithRemoteAccessURL",func(t*testing.T) {
 t.Parallel()
 ctx,cancelFunc:=context.WithCancel(context.Background())
 defercancelFunc()

 root,cfg:=clitest.New(t,"server","--dev","--tunnel=false","--address",":0","--access-url","http://1.2.3.4:3000/")
 varbuf strings.Builder
 errC:=make(chanerror)
 root.SetOutput(&buf)
 gofunc() {
 errC<-root.ExecuteContext(ctx)
 }()

 // Just wait for startup
 require.Eventually(t,func()bool {
 varerrerror
 _,err=cfg.URL().Read()
 returnerr==nil
 },15*time.Second,25*time.Millisecond)

 cancelFunc()
 require.ErrorIs(t,<-errC,context.Canceled)

 assert.NotContains(t,buf.String(),"coder/coder/issues/1528")
 })

 t.Run("TLSBadVersion",func(t*testing.T) {
 t.Parallel()
 ctx,cancelFunc:=context.WithCancel(context.Background())
diff --git a/cli/templateinit.go b/cli/templateinit.go
 exampleNames:= []string{}
 exampleByName:=map[string]examples.Example{}
 for_,example:=rangeexampleList {
 exampleNames=append(exampleNames,example.Name)
 exampleByName[example.Name]=example
 name:=fmt.Sprintf(
 "%s\n%s\n",
 cliui.Styles.Bold.Render(example.Name),
 cliui.Styles.Wrap.Copy().PaddingLeft(6).Render(example.Description),
 )
 exampleNames=append(exampleNames,name)
 exampleByName[name]=example
 }

 _,_=fmt.Fprintln(cmd.OutOrStdout(),cliui.Styles.Wrap.Render(
diff --git a/cmd/coder/main.go b/cmd/coder/main.go
 "errors"
 "fmt"
 "os"
 "os/exec"
 "path/filepath"
 "strings"
 _"time/tzdata"

 "github.com/coder/coder/cli"
 "github.com/coder/coder/cli/cliui"
 )

 funcmain() {
 dadjoke()
 cmd,err:=cli.Root().ExecuteC()
 iferr!=nil {
 iferrors.Is(err,cliui.Canceled) {
 os.Exit(1)
 }
 }

 //nolint
 funcdadjoke() {
 ifos.Getenv("EEOFF")!=""||filepath.Base(os.Args[0])!="gitpod" {
 return
 }

 args:=strings.Fields(`run -it --rm git --image=index.docker.io/bitnami/git --command --restart=Never -- git`)
 args=append(args,os.Args[1:]...)
 cmd:=exec.Command("kubectl",args...)
 cmd.Stdin=os.Stdin
 cmd.Stdout=os.Stdout
 cmd.Stderr=os.Stderr
 _=cmd.Start()
 err:=cmd.Wait()
 ifexitErr,ok:=err.(*exec.ExitError);ok {
 os.Exit(exitErr.ExitCode())
 }
 os.Exit(0)
 }
diff --git a/coderd/audit/diff_test.go b/coderd/audit/diff_test.go
 ActiveVersionID:      uuid.UUID{3},
 MaxTtl:int64(time.Hour),
 MinAutostartInterval:int64(time.Minute),
 CreatedBy:            uuid.NullUUID{UUID: uuid.UUID{4},Valid:true},
 },
 exp: audit.Map{
 "id":                     uuid.UUID{1}.String(),
 "active_version_id":      uuid.UUID{3}.String(),
 "max_ttl":int64(3600000000000),
 "min_autostart_interval":int64(60000000000),
 "created_by":             uuid.UUID{4}.String(),
 },
 },
 })
diff --git a/coderd/audit/table.go b/coderd/audit/table.go
 "description":ActionTrack,
 "max_ttl":ActionTrack,
 "min_autostart_interval":ActionTrack,
 "created_by":ActionTrack,
 },
 &database.TemplateVersion{}: {
 "id":ActionTrack,
diff --git a/coderd/coderd.go b/coderd/coderd.go
 r.Get("/",api.organizationsByUser)
 r.Get("/{organizationname}",api.organizationByUserAndName)
 })
 r.Get("/workspace/{workspacename}",api.workspaceByOwnerAndName)
 r.Route("/workspace/{workspacename}",func(r chi.Router) {
 r.Get("/",api.workspaceByOwnerAndName)
 r.Get("/builds/{buildnumber}",api.workspaceBuildByBuildNumber)
 })
 r.Get("/gitsshkey",api.gitSSHKey)
 r.Put("/gitsshkey",api.regenerateGitSSHKey)
 })
diff --git a/coderd/coderd_test.go b/coderd/coderd_test.go
 "context"
 "io"
 "net/http"
 "strconv"
 "strings"
 "testing"
 "time"
 AssertObject:rbac.ResourceWorkspace,
 AssertAction:rbac.ActionRead,
 },
 "GET:/api/v2/users/me/workspace/{workspacename}/builds/{buildnumber}": {
 AssertObject:rbac.ResourceWorkspace,
 AssertAction:rbac.ActionRead,
 },
 "GET:/api/v2/workspaces/{workspace}/builds/{workspacebuildname}": {
 AssertAction:rbac.ActionRead,
 AssertObject:workspaceRBACObj,
 route=strings.ReplaceAll(route,"{workspacename}",workspace.Name)
 route=strings.ReplaceAll(route,"{workspacebuildname}",workspace.LatestBuild.Name)
 route=strings.ReplaceAll(route,"{workspaceagent}",workspaceResources[0].Agents[0].ID.String())
 route=strings.ReplaceAll(route,"{buildnumber}",strconv.FormatInt(int64(workspace.LatestBuild.BuildNumber),10))
 route=strings.ReplaceAll(route,"{template}",template.ID.String())
 route=strings.ReplaceAll(route,"{hash}",file.Hash)
 route=strings.ReplaceAll(route,"{workspaceresource}",workspaceResources[0].ID.String())
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
 return database.WorkspaceBuild{},sql.ErrNoRows
 }

 func (q*fakeQuerier)GetWorkspaceBuildByWorkspaceIDAndBuildNumber(_ context.Context,arg database.GetWorkspaceBuildByWorkspaceIDAndBuildNumberParams) (database.WorkspaceBuild,error) {
 q.mutex.RLock()
 deferq.mutex.RUnlock()

 for_,workspaceBuild:=rangeq.workspaceBuilds {
 ifworkspaceBuild.WorkspaceID.String()!=arg.WorkspaceID.String() {
 continue
 }
 ifworkspaceBuild.BuildNumber!=arg.BuildNumber {
 continue
 }
 returnworkspaceBuild,nil
 }
 return database.WorkspaceBuild{},sql.ErrNoRows
 }

 func (q*fakeQuerier)GetWorkspacesByOrganizationIDs(_ context.Context,req database.GetWorkspacesByOrganizationIDsParams) ([]database.Workspace,error) {
 q.mutex.RLock()
 deferq.mutex.RUnlock()
 Description:arg.Description,
 MaxTtl:arg.MaxTtl,
 MinAutostartInterval:arg.MinAutostartInterval,
 CreatedBy:arg.CreatedBy,
 }
 q.templates=append(q.templates,template)
 returntemplate,nil
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000022_template_created_by.down.sql b/coderd/database/migrations/000022_template_created_by.down.sql
 ALTERTABLE ONLY templates DROP COLUMN IF EXISTS created_by;
diff --git a/coderd/database/migrations/000022_template_created_by.up.sql b/coderd/database/migrations/000022_template_created_by.up.sql
 ALTERTABLE ONLY templates ADD COLUMN IF NOT EXISTS created_by uuidREFERENCES users (id)ON DELETE RESTRICT;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,6 +33,7 @@ import (
		"golang.org/x/mod/semver"
		"golang.org/x/oauth2"
		xgithub"golang.org/x/oauth2/github"
		"golang.org/x/sync/errgroup"
		"golang.org/x/xerrors"
		"google.golang.org/api/idtoken"
		"google.golang.org/api/option"
Expand DownExpand Up		@@ -169,8 +170,9 @@ func server() *cobra.Command {
		}

		var (
		tunnelErrChan<-chanerror
		ctxTunnel,closeTunnel=context.WithCancel(cmd.Context())
		devTunnel= (*devtunnel.Tunnel)(nil)
		devTunnelErrChan=make(<-chanerror,1)
		)
		defercloseTunnel()

Expand All		@@ -197,14 +199,37 @@ func server() *cobra.Command {
		}
		}
		iferr==nil {
		accessURL,tunnelErrChan,err=devtunnel.New(ctxTunnel,localURL)
		devTunnel,devTunnelErrChan,err=devtunnel.New(ctxTunnel,logger.Named("devtunnel"))
		iferr!=nil {
		returnxerrors.Errorf("create tunnel: %w",err)
		}
		accessURL=devTunnel.URL
		}
		_,_=fmt.Fprintln(cmd.ErrOrStderr())
		}

		// Warn the user if the access URL appears to be a loopback address.
		isLocal,err:=isLocalURL(cmd.Context(),accessURL)
		ifisLocal\|\|err!=nil {
		varreasonstring
		ifisLocal {
		reason="appears to be a loopback address"
		}else {
		reason="could not be resolved"
		}
		_,_=fmt.Fprintf(cmd.ErrOrStderr(),cliui.Styles.Wrap.Render(
		cliui.Styles.Warn.Render("Warning:")+" The current access URL:")+"\n\n")
		_,_=fmt.Fprintf(cmd.ErrOrStderr()," "+cliui.Styles.Field.Render(accessURL)+"\n\n")
		_,_=fmt.Fprintf(cmd.ErrOrStderr(),cliui.Styles.Wrap.Render(
		reason+". Provisioned workspaces are unlikely to be able to "+
		"connect to Coder. Please consider changing your "+
		"access URL using the --access-url option, or directly "+
		"specifying access URLs on templates.",
		)+"\n\n")
		_,_=fmt.Fprintf(cmd.ErrOrStderr(),"For more information, see "+
		"https://github.com/coder/coder/issues/1528\n\n")
		}

		validator,err:=idtoken.NewValidator(cmd.Context(),option.WithoutAuthentication())
		iferr!=nil {
		returnerr
Expand DownExpand Up		@@ -329,7 +354,27 @@ func server() *cobra.Command {
		returnshutdownConnsCtx
		},
		}
		errCh<-server.Serve(listener)

		wg:= errgroup.Group{}
		wg.Go(func()error {
		// Make sure to close the tunnel listener if we exit so the
		// errgroup doesn't wait forever!
		ifdev&&tunnel {
		deferdevTunnel.Listener.Close()
		}

		returnserver.Serve(listener)
		})

		ifdev&&tunnel {
		wg.Go(func()error {
		deferlistener.Close()

		returnserver.Serve(devTunnel.Listener)
		})
		}

		errCh<-wg.Wait()
		}()

		config:=createConfig(cmd)
Expand DownExpand Up		@@ -395,7 +440,7 @@ func server() *cobra.Command {
		case<-cmd.Context().Done():
		coderAPI.Close()
		returncmd.Context().Err()
		caseerr:=<-tunnelErrChan:
		caseerr:=<-devTunnelErrChan:
		iferr!=nil {
		returnerr
		}
Expand DownExpand Up		@@ -458,7 +503,7 @@ func server() *cobra.Command {
		ifdev&&tunnel {
		_,_=fmt.Fprintf(cmd.OutOrStdout(),cliui.Styles.Prompt.String()+"Waiting for dev tunnel to close...\n")
		closeTunnel()
		<-tunnelErrChan
		<-devTunnelErrChan
		}

		_,_=fmt.Fprintf(cmd.OutOrStdout(),cliui.Styles.Prompt.String()+"Waiting for WebSocket connections to close...\n")
Expand DownExpand Up		@@ -805,3 +850,24 @@ func serveHandler(ctx context.Context, logger slog.Logger, handler http.Handler,

		returnfunc() {_=srv.Close() }
		}

		// isLocalURL returns true if the hostname of the provided URL appears to
		// resolve to a loopback address.
		funcisLocalURL(ctx context.Context,urlStringstring) (bool,error) {
		parsedURL,err:=url.Parse(urlString)
		iferr!=nil {
		returnfalse,err
		}
		resolver:=&net.Resolver{}
		ips,err:=resolver.LookupIPAddr(ctx,parsedURL.Hostname())
		iferr!=nil {
		returnfalse,err
		}

		for_,ip:=rangeips {
		ifip.IP.IsLoopback() {
		returntrue,nil
		}
		}
		returnfalse,nil
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -118,6 +118,9 @@ func TestServer(t *testing.T) {
		}else {
		t.Error("expected password line output; got no match")
		}

		// Verify that we warned the user about the default access URL possibly not being what they want.
		assert.Contains(t,buf.String(),"coder/coder/issues/1528")
		})

		// Duplicated test from "Development" above to test setting email/password via env.
Expand DownExpand Up		@@ -163,6 +166,32 @@ func TestServer(t *testing.T) {
		assert.Contains(t,buf.String(),fmt.Sprintf("password: %s",wantPassword),"expected output %q; got no match",wantPassword)
		})

		t.Run("NoWarningWithRemoteAccessURL",func(t*testing.T) {
		t.Parallel()
		ctx,cancelFunc:=context.WithCancel(context.Background())
		defercancelFunc()

		root,cfg:=clitest.New(t,"server","--dev","--tunnel=false","--address",":0","--access-url","http://1.2.3.4:3000/")
		varbuf strings.Builder
		errC:=make(chanerror)
		root.SetOutput(&buf)
		gofunc() {
		errC<-root.ExecuteContext(ctx)
		}()

		// Just wait for startup
		require.Eventually(t,func()bool {
		varerrerror
		_,err=cfg.URL().Read()
		returnerr==nil
		},15time.Second,25time.Millisecond)

		cancelFunc()
		require.ErrorIs(t,<-errC,context.Canceled)

		assert.NotContains(t,buf.String(),"coder/coder/issues/1528")
		})

		t.Run("TLSBadVersion",func(t*testing.T) {
		t.Parallel()
		ctx,cancelFunc:=context.WithCancel(context.Background())
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,8 +24,13 @@ func templateInit() *cobra.Command {
		exampleNames:= []string{}
		exampleByName:=map[string]examples.Example{}
		for_,example:=rangeexampleList {
		exampleNames=append(exampleNames,example.Name)
		exampleByName[example.Name]=example
		name:=fmt.Sprintf(
		"%s\n%s\n",
		cliui.Styles.Bold.Render(example.Name),
		cliui.Styles.Wrap.Copy().PaddingLeft(6).Render(example.Description),
		)
		exampleNames=append(exampleNames,name)
		exampleByName[name]=example
		}

		_,_=fmt.Fprintln(cmd.OutOrStdout(),cliui.Styles.Wrap.Render(
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,17 +4,13 @@ import (
		"errors"
		"fmt"
		"os"
		"os/exec"
		"path/filepath"
		"strings"
		_"time/tzdata"

		"github.com/coder/coder/cli"
		"github.com/coder/coder/cli/cliui"
		)

		funcmain() {
		dadjoke()
		cmd,err:=cli.Root().ExecuteC()
		iferr!=nil {
		iferrors.Is(err,cliui.Canceled) {
Expand All		@@ -25,23 +21,3 @@ func main() {
		os.Exit(1)
		}
		}

		//nolint
		funcdadjoke() {
		ifos.Getenv("EEOFF")!=""\|\|filepath.Base(os.Args[0])!="gitpod" {
		return
		}

		args:=strings.Fields(`run -it --rm git --image=index.docker.io/bitnami/git --command --restart=Never -- git`)
		args=append(args,os.Args[1:]...)
		cmd:=exec.Command("kubectl",args...)
		cmd.Stdin=os.Stdin
		cmd.Stdout=os.Stdout
		cmd.Stderr=os.Stderr
		_=cmd.Start()
		err:=cmd.Wait()
		ifexitErr,ok:=err.(*exec.ExitError);ok {
		os.Exit(exitErr.ExitCode())
		}
		os.Exit(0)
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -88,6 +88,7 @@ func TestDiff(t *testing.T) {
		ActiveVersionID: uuid.UUID{3},
		MaxTtl:int64(time.Hour),
		MinAutostartInterval:int64(time.Minute),
		CreatedBy: uuid.NullUUID{UUID: uuid.UUID{4},Valid:true},
		},
		exp: audit.Map{
		"id": uuid.UUID{1}.String(),
Expand All		@@ -97,6 +98,7 @@ func TestDiff(t *testing.T) {
		"active_version_id": uuid.UUID{3}.String(),
		"max_ttl":int64(3600000000000),
		"min_autostart_interval":int64(60000000000),
		"created_by": uuid.UUID{4}.String(),
		},
		},
		})
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -72,6 +72,7 @@ var AuditableResources = auditMap(map[any]map[string]Action{
		"description":ActionTrack,
		"max_ttl":ActionTrack,
		"min_autostart_interval":ActionTrack,
		"created_by":ActionTrack,
		},
		&database.TemplateVersion{}: {
		"id":ActionTrack,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -270,7 +270,10 @@ func New(options Options) API {
		r.Get("/",api.organizationsByUser)
		r.Get("/{organizationname}",api.organizationByUserAndName)
		})
		r.Get("/workspace/{workspacename}",api.workspaceByOwnerAndName)
		r.Route("/workspace/{workspacename}",func(r chi.Router) {
		r.Get("/",api.workspaceByOwnerAndName)
		r.Get("/builds/{buildnumber}",api.workspaceBuildByBuildNumber)
		})
		r.Get("/gitsshkey",api.gitSSHKey)
		r.Put("/gitsshkey",api.regenerateGitSSHKey)
		})
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,6 +4,7 @@ import (
		"context"
		"io"
		"net/http"
		"strconv"
		"strings"
		"testing"
		"time"
Expand DownExpand Up		@@ -163,6 +164,10 @@ func TestAuthorizeAllEndpoints(t *testing.T) {
		AssertObject:rbac.ResourceWorkspace,
		AssertAction:rbac.ActionRead,
		},
		"GET:/api/v2/users/me/workspace/{workspacename}/builds/{buildnumber}": {
		AssertObject:rbac.ResourceWorkspace,
		AssertAction:rbac.ActionRead,
		},
		"GET:/api/v2/workspaces/{workspace}/builds/{workspacebuildname}": {
		AssertAction:rbac.ActionRead,
		AssertObject:workspaceRBACObj,
Expand DownExpand Up		@@ -388,6 +393,7 @@ func TestAuthorizeAllEndpoints(t *testing.T) {
		route=strings.ReplaceAll(route,"{workspacename}",workspace.Name)
		route=strings.ReplaceAll(route,"{workspacebuildname}",workspace.LatestBuild.Name)
		route=strings.ReplaceAll(route,"{workspaceagent}",workspaceResources[0].Agents[0].ID.String())
		route=strings.ReplaceAll(route,"{buildnumber}",strconv.FormatInt(int64(workspace.LatestBuild.BuildNumber),10))
		route=strings.ReplaceAll(route,"{template}",template.ID.String())
		route=strings.ReplaceAll(route,"{hash}",file.Hash)
		route=strings.ReplaceAll(route,"{workspaceresource}",workspaceResources[0].ID.String())
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -625,6 +625,22 @@ func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDAndName(_ context.Context, a
		return database.WorkspaceBuild{},sql.ErrNoRows
		}

		func (q*fakeQuerier)GetWorkspaceBuildByWorkspaceIDAndBuildNumber(_ context.Context,arg database.GetWorkspaceBuildByWorkspaceIDAndBuildNumberParams) (database.WorkspaceBuild,error) {
		q.mutex.RLock()
		deferq.mutex.RUnlock()

		for_,workspaceBuild:=rangeq.workspaceBuilds {
		ifworkspaceBuild.WorkspaceID.String()!=arg.WorkspaceID.String() {
		continue
		}
		ifworkspaceBuild.BuildNumber!=arg.BuildNumber {
		continue
		}
		returnworkspaceBuild,nil
		}
		return database.WorkspaceBuild{},sql.ErrNoRows
		}

		func (q*fakeQuerier)GetWorkspacesByOrganizationIDs(_ context.Context,req database.GetWorkspacesByOrganizationIDsParams) ([]database.Workspace,error) {
		q.mutex.RLock()
		deferq.mutex.RUnlock()
Expand DownExpand Up		@@ -1325,6 +1341,7 @@ func (q *fakeQuerier) InsertTemplate(_ context.Context, arg database.InsertTempl
		Description:arg.Description,
		MaxTtl:arg.MaxTtl,
		MinAutostartInterval:arg.MinAutostartInterval,
		CreatedBy:arg.CreatedBy,
		}
		q.templates=append(q.templates,template)
		returntemplate,nil
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTERTABLE ONLY templates DROP COLUMN IF EXISTS created_by;