add groups to dbauthz role

f0ssel · f0ssel · commit b3cd5f1f3fe4 · 2024-04-03T17:13:22.000Z
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -174,6 +174,7 @@ var (
 					// When org scoped provisioner credentials are implemented,
 					// this can be reduced to read a specific org.
 					rbac.ResourceOrganization.Type: {rbac.ActionRead},
+					rbac.ResourceGroup.Type:        {rbac.ActionRead},
 				}),
 				Org:  map[string][]rbac.Permission{},
 				User: []rbac.Permission{},
diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -467,7 +467,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
 		if err != nil {
 			return nil, failJob(fmt.Sprintf("get owner: %s", err))
 		}
-		orgGroups, err := s.Database.GetGroupsByOrganizationID(ctx, workspace.OrganizationID)
+		orgGroups, err := s.Database.GetGroupsByOrganizationID(ctx, s.OrganizationID)
 		if err != nil {
 			return nil, failJob(fmt.Sprintf("get owner groups: %s", err))
 		}

Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo`
`467`	`467`	`if err != nil {`
`468`	`468`	`return nil, failJob(fmt.Sprintf("get owner: %s", err))`
`469`	`469`	`}`
`470`		`- orgGroups, err := s.Database.GetGroupsByOrganizationID(ctx, workspace.OrganizationID)`
	`470`	`+ orgGroups, err := s.Database.GetGroupsByOrganizationID(ctx, s.OrganizationID)`
`471`	`471`	`if err != nil {`
`472`	`472`	`return nil, failJob(fmt.Sprintf("get owner groups: %s", err))`
`473`	`473`	`}`