add unit test for site wide custom role deletE

Emyrk · Emyrk · commit 5033ee811c93 · 2024-08-07T12:20:32.000-05:00
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -964,7 +964,7 @@ func (q *querier) DeleteCustomRole(ctx context.Context, arg database.DeleteCusto
 			return err
 		}
 	} else {
-		if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceAssignRole); err != nil {
+		if err := q.authorizeContext(ctx, policy.ActionDelete, rbac.ResourceAssignRole); err != nil {
 			return err
 		}
 	}
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -1247,7 +1247,7 @@ func (s *MethodTestSuite) TestUser() {
 	s.Run("CustomRoles", s.Subtest(func(db database.Store, check *expects) {
 		check.Args(database.CustomRolesParams{}).Asserts(rbac.ResourceAssignRole, policy.ActionRead).Returns([]database.CustomRole{})
 	}))
-	s.Run("DeleteCustomRole", s.Subtest(func(db database.Store, check *expects) {
+	s.Run("Organization/DeleteCustomRole", s.Subtest(func(db database.Store, check *expects) {
 		customRole := dbgen.CustomRole(s.T(), db, database.CustomRole{
 			OrganizationID: uuid.NullUUID{
 				UUID:  uuid.New(),
@@ -1260,6 +1260,18 @@ func (s *MethodTestSuite) TestUser() {
 		}).Asserts(
 			rbac.ResourceAssignOrgRole.InOrg(customRole.OrganizationID.UUID), policy.ActionDelete)
 	}))
+	s.Run("Site/DeleteCustomRole", s.Subtest(func(db database.Store, check *expects) {
+		customRole := dbgen.CustomRole(s.T(), db, database.CustomRole{
+			OrganizationID: uuid.NullUUID{
+				UUID:  uuid.Nil,
+				Valid: false,
+			},
+		})
+		check.Args(database.DeleteCustomRoleParams{
+			Name: customRole.Name,
+		}).Asserts(
+			rbac.ResourceAssignRole, policy.ActionDelete)
+	}))
 	s.Run("Blank/UpsertCustomRole", s.Subtest(func(db database.Store, check *expects) {
 		// Blank is no perms in the role
 		check.Args(database.UpsertCustomRoleParams{

Original file line number	Diff line number	Diff line change
`@@ -964,7 +964,7 @@ func (q *querier) DeleteCustomRole(ctx context.Context, arg database.DeleteCusto`
`964`	`964`	`return err`
`965`	`965`	`}`
`966`	`966`	`} else {`
`967`		`- if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceAssignRole); err != nil {`
	`967`	`+ if err := q.authorizeContext(ctx, policy.ActionDelete, rbac.ResourceAssignRole); err != nil {`
`968`	`968`	`return err`
`969`	`969`	`}`
`970`	`970`	`}`