oops

aslilac · aslilac · commit c67c3cf0d2a3 · 2025-02-27T16:47:01.000Z
diff --git a/coderd/database/dbauthz/customroles_test.go b/coderd/database/dbauthz/customroles_test.go
@@ -38,6 +38,7 @@ func TestInsertCustomRoles(t *testing.T) {
 		Identifier:  rbac.RoleIdentifier{Name: "can-assign"},
 		DisplayName: "",
 		Site: rbac.Permissions(map[string][]policy.Action{
+			rbac.ResourceAssignRole.Type:    {policy.ActionRead},
 			rbac.ResourceAssignOrgRole.Type: {policy.ActionRead, policy.ActionCreate},
 		}),
 	}
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -1127,7 +1127,7 @@ func (q *querier) CleanTailnetTunnels(ctx context.Context) error {
 }
 
 func (q *querier) CustomRoles(ctx context.Context, arg database.CustomRolesParams) ([]database.CustomRole, error) {
-	roleObject := rbac.ResourceAssignOrgRole
+	roleObject := rbac.ResourceAssignRole
 	if arg.OrganizationID != uuid.Nil {
 		roleObject = rbac.ResourceAssignOrgRole.InOrg(arg.OrganizationID)
 	}
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -1628,7 +1628,7 @@ func (s *MethodTestSuite) TestUser() {
 		check.Args().Asserts(rbac.ResourceSystem, policy.ActionRead).Returns(slice.New(a.ID, b.ID))
 	}))
 	s.Run("CustomRoles", s.Subtest(func(db database.Store, check *expects) {
-		check.Args(database.CustomRolesParams{}).Asserts(rbac.ResourceAssignOrgRole, policy.ActionRead).Returns([]database.CustomRole{})
+		check.Args(database.CustomRolesParams{}).Asserts(rbac.ResourceAssignRole, policy.ActionRead).Returns([]database.CustomRole{})
 	}))
 	s.Run("Organization/DeleteCustomRole", s.Subtest(func(db database.Store, check *expects) {
 		customRole := dbgen.CustomRole(s.T(), db, database.CustomRole{

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ func TestInsertCustomRoles(t *testing.T) {`
`38`	`38`	`Identifier: rbac.RoleIdentifier{Name: "can-assign"},`
`39`	`39`	`DisplayName: "",`
`40`	`40`	`Site: rbac.Permissions(map[string][]policy.Action{`
	`41`	`+ rbac.ResourceAssignRole.Type: {policy.ActionRead},`
`41`	`42`	`rbac.ResourceAssignOrgRole.Type: {policy.ActionRead, policy.ActionCreate},`
`42`	`43`	`}),`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1127,7 +1127,7 @@ func (q *querier) CleanTailnetTunnels(ctx context.Context) error {`
`1127`	`1127`	`}`
`1128`	`1128`
`1129`	`1129`	`func (q *querier) CustomRoles(ctx context.Context, arg database.CustomRolesParams) ([]database.CustomRole, error) {`
`1130`		`- roleObject := rbac.ResourceAssignOrgRole`
	`1130`	`+ roleObject := rbac.ResourceAssignRole`
`1131`	`1131`	`if arg.OrganizationID != uuid.Nil {`
`1132`	`1132`	`roleObject = rbac.ResourceAssignOrgRole.InOrg(arg.OrganizationID)`
`1133`	`1133`	`}`