fix test

f0ssel · f0ssel · commit cf0fd5a4e4dd · 2024-04-04T17:23:56.000Z
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -1834,7 +1834,7 @@ func (q *querier) GetUserCount(ctx context.Context) (int64, error) {
 }
 
 func (q *querier) GetUserGroupNames(ctx context.Context, arg database.GetUserGroupNamesParams) ([]string, error) {
-	if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceGroup); err != nil {
+	if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceGroup.InOrg(arg.OrganizationID)); err != nil {
 		return nil, err
 	}
 	return q.db.GetUserGroupNames(ctx, arg)
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -315,15 +315,13 @@ func (s *MethodTestSuite) TestGroup() {
 		check.Args(g.ID).Asserts(g, rbac.ActionRead)
 	}))
 	s.Run("GetUserGroupNames", s.Subtest(func(db database.Store, check *expects) {
-		o := dbgen.Organization(s.T(), db, database.Organization{})
-		u := dbgen.User(s.T(), db, database.User{})
-		g := dbgen.Group(s.T(), db, database.Group{OrganizationID: o.ID})
+		g := dbgen.Group(s.T(), db, database.Group{})
+		gm := dbgen.GroupMember(s.T(), db, database.GroupMember{GroupID: g.ID})
 		check.Args(database.GetUserGroupNamesParams{
-			OrganizationID: o.ID,
-			UserID:         u.ID,
-		}).Asserts(g, rbac.ActionRead)
+			OrganizationID: g.OrganizationID,
+			UserID:         gm.UserID,
+		}).Asserts(rbac.ResourceGroup.InOrg(g.OrganizationID), rbac.ActionRead)
 	}))
-
 	s.Run("InsertAllUsersGroup", s.Subtest(func(db database.Store, check *expects) {
 		o := dbgen.Organization(s.T(), db, database.Organization{})
 		check.Args(o.ID).Asserts(rbac.ResourceGroup.InOrg(o.ID), rbac.ActionCreate)

Original file line number	Diff line number	Diff line change
`@@ -1834,7 +1834,7 @@ func (q *querier) GetUserCount(ctx context.Context) (int64, error) {`
`1834`	`1834`	`}`
`1835`	`1835`
`1836`	`1836`	`func (q *querier) GetUserGroupNames(ctx context.Context, arg database.GetUserGroupNamesParams) ([]string, error) {`
`1837`		`- if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceGroup); err != nil {`
	`1837`	`+ if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceGroup.InOrg(arg.OrganizationID)); err != nil {`
`1838`	`1838`	`return nil, err`
`1839`	`1839`	`}`
`1840`	`1840`	`return q.db.GetUserGroupNames(ctx, arg)`