fix autobuild/executor unit tests

johnstcn · johnstcn · commit 4b292e2795ec · 2023-02-10T17:23:18.000Z
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -132,6 +132,7 @@ func AsSystem(ctx context.Context) context.Context {
 				User: []rbac.Permission{},
 			},
 		}),
+		Scope: rbac.ScopeAll,
 	},
 	)
 }
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -133,23 +133,23 @@ func (server *Server) AcquireJob(ctx context.Context, _ *proto.Empty) (*proto.Ac
 		if err != nil {
 			return nil, failJob(fmt.Sprintf("unmarshal job input %q: %s", job.Input, err))
 		}
-		workspaceBuild, err := server.Database.GetWorkspaceBuildByID(ctx, input.WorkspaceBuildID)
+		workspaceBuild, err := server.Database.GetWorkspaceBuildByID(dbauthz.AsSystem(ctx), input.WorkspaceBuildID)
 		if err != nil {
 			return nil, failJob(fmt.Sprintf("get workspace build: %s", err))
 		}
-		workspace, err := server.Database.GetWorkspaceByID(ctx, workspaceBuild.WorkspaceID)
+		workspace, err := server.Database.GetWorkspaceByID(dbauthz.AsSystem(ctx), workspaceBuild.WorkspaceID)
 		if err != nil {
 			return nil, failJob(fmt.Sprintf("get workspace: %s", err))
 		}
-		templateVersion, err := server.Database.GetTemplateVersionByID(ctx, workspaceBuild.TemplateVersionID)
+		templateVersion, err := server.Database.GetTemplateVersionByID(dbauthz.AsSystem(ctx), workspaceBuild.TemplateVersionID)
 		if err != nil {
 			return nil, failJob(fmt.Sprintf("get template version: %s", err))
 		}
-		template, err := server.Database.GetTemplateByID(ctx, templateVersion.TemplateID.UUID)
+		template, err := server.Database.GetTemplateByID(dbauthz.AsSystem(ctx), templateVersion.TemplateID.UUID)
 		if err != nil {
 			return nil, failJob(fmt.Sprintf("get template: %s", err))
 		}
-		owner, err := server.Database.GetUserByID(ctx, workspace.OwnerID)
+		owner, err := server.Database.GetUserByID(dbauthz.AsSystem(ctx), workspace.OwnerID)
 		if err != nil {
 			return nil, failJob(fmt.Sprintf("get owner: %s", err))
 		}
@@ -257,7 +257,7 @@ func (server *Server) AcquireJob(ctx context.Context, _ *proto.Empty) (*proto.Ac
 	}
 	switch job.StorageMethod {
 	case database.ProvisionerStorageMethodFile:
-		file, err := server.Database.GetFileByID(ctx, job.FileID)
+		file, err := server.Database.GetFileByID(dbauthz.AsSystem(ctx), job.FileID)
 		if err != nil {
 			return nil, failJob(fmt.Sprintf("get file by hash: %s", err))
 		}

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ func AsSystem(ctx context.Context) context.Context {`
`132`	`132`	`User: []rbac.Permission{},`
`133`	`133`	`},`
`134`	`134`	`}),`
	`135`	`+ Scope: rbac.ScopeAll,`
`135`	`136`	`},`
`136`	`137`	`)`
`137`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,23 +133,23 @@ func (server Server) AcquireJob(ctx context.Context, _ proto.Empty) (*proto.Ac`
`133`	`133`	`if err != nil {`
`134`	`134`	`return nil, failJob(fmt.Sprintf("unmarshal job input %q: %s", job.Input, err))`
`135`	`135`	`}`
`136`		`- workspaceBuild, err := server.Database.GetWorkspaceBuildByID(ctx, input.WorkspaceBuildID)`
	`136`	`+ workspaceBuild, err := server.Database.GetWorkspaceBuildByID(dbauthz.AsSystem(ctx), input.WorkspaceBuildID)`
`137`	`137`	`if err != nil {`
`138`	`138`	`return nil, failJob(fmt.Sprintf("get workspace build: %s", err))`
`139`	`139`	`}`
`140`		`- workspace, err := server.Database.GetWorkspaceByID(ctx, workspaceBuild.WorkspaceID)`
	`140`	`+ workspace, err := server.Database.GetWorkspaceByID(dbauthz.AsSystem(ctx), workspaceBuild.WorkspaceID)`
`141`	`141`	`if err != nil {`
`142`	`142`	`return nil, failJob(fmt.Sprintf("get workspace: %s", err))`
`143`	`143`	`}`
`144`		`- templateVersion, err := server.Database.GetTemplateVersionByID(ctx, workspaceBuild.TemplateVersionID)`
	`144`	`+ templateVersion, err := server.Database.GetTemplateVersionByID(dbauthz.AsSystem(ctx), workspaceBuild.TemplateVersionID)`
`145`	`145`	`if err != nil {`
`146`	`146`	`return nil, failJob(fmt.Sprintf("get template version: %s", err))`
`147`	`147`	`}`
`148`		`- template, err := server.Database.GetTemplateByID(ctx, templateVersion.TemplateID.UUID)`
	`148`	`+ template, err := server.Database.GetTemplateByID(dbauthz.AsSystem(ctx), templateVersion.TemplateID.UUID)`
`149`	`149`	`if err != nil {`
`150`	`150`	`return nil, failJob(fmt.Sprintf("get template: %s", err))`
`151`	`151`	`}`
`152`		`- owner, err := server.Database.GetUserByID(ctx, workspace.OwnerID)`
	`152`	`+ owner, err := server.Database.GetUserByID(dbauthz.AsSystem(ctx), workspace.OwnerID)`
`153`	`153`	`if err != nil {`
`154`	`154`	`return nil, failJob(fmt.Sprintf("get owner: %s", err))`
`155`	`155`	`}`
`@@ -257,7 +257,7 @@ func (server Server) AcquireJob(ctx context.Context, _ proto.Empty) (*proto.Ac`
`257`	`257`	`}`
`258`	`258`	`switch job.StorageMethod {`
`259`	`259`	`case database.ProvisionerStorageMethodFile:`
`260`		`- file, err := server.Database.GetFileByID(ctx, job.FileID)`
	`260`	`+ file, err := server.Database.GetFileByID(dbauthz.AsSystem(ctx), job.FileID)`
`261`	`261`	`if err != nil {`
`262`	`262`	`return nil, failJob(fmt.Sprintf("get file by hash: %s", err))`
`263`	`263`	`}`