Aug 29, 2024 · Aug 26, 2024 · Aug 27, 2024 · Aug 27, 2024 · Aug 27, 2024 · Aug 27, 2024
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
 })
 }

 func Group(group database.Group, members []database.GroupMember, totalMemberCount int) codersdk.Group {
 func Group(row database.GetGroupsRow, members []database.GroupMember, totalMemberCount int) codersdk.Group {
 return codersdk.Group{
 ID:               group.ID,
 Name:             group.Name,
 DisplayName:      group.DisplayName,
 OrganizationID:   group.OrganizationID,
 AvatarURL:        group.AvatarURL,
 Members:          ReducedUsersFromGroupMembers(members),
 TotalMemberCount: totalMemberCount,
 QuotaAllowance:   int(group.QuotaAllowance),
 Source:           codersdk.GroupSource(group.Source),
 ID:                      row.Group.ID,
 Name:                    row.Group.Name,
 DisplayName:             row.Group.DisplayName,
 OrganizationID:          row.Group.OrganizationID,
 AvatarURL:               row.Group.AvatarURL,
 Members:                 ReducedUsersFromGroupMembers(members),
 TotalMemberCount:        totalMemberCount,
 QuotaAllowance:          int(row.Group.QuotaAllowance),
 Source:                  codersdk.GroupSource(row.Group.Source),
 OrganizationName:        row.OrganizationName,
 OrganizationDisplayName: row.OrganizationDisplayName,
 }
 }

diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return memberCount, nil
 }

 func (q *querier) GetGroups(ctx context.Context, arg database.GetGroupsParams) ([]database.Group, error) {
 func (q *querier) GetGroups(ctx context.Context, arg database.GetGroupsParams) ([]database.GetGroupsRow, error) {
 if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err == nil {
 // Optimize this query for system users as it is used in telemetry.
 // Calling authz on all groups in a deployment for telemetry jobs is
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 check.Args(database.GetGroupsParams{
 OrganizationID: o.ID,
 }).Asserts(rbac.ResourceSystem, policy.ActionRead, a, policy.ActionRead, b, policy.ActionRead).
 Returns([]database.Group{a, b}).
 Returns([]database.GetGroupsRow{
 {Group: a, OrganizationName: o.Name, OrganizationDisplayName: o.DisplayName},
 {Group: b, OrganizationName: o.Name, OrganizationDisplayName: o.DisplayName},
 }).
 // Fail the system check shortcut
 FailSystemObjectChecks()
 }))
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
 return int64(len(users)), nil
 }

 func (q *FakeQuerier) GetGroups(_ context.Context, arg database.GetGroupsParams) ([]database.Group, error) {
 func (q *FakeQuerier) GetGroups(_ context.Context, arg database.GetGroupsParams) ([]database.GetGroupsRow, error) {
 err := validateDatabaseType(arg)
 if err != nil {
 return nil, err
 }
 }

 filtered := make([]database.Group, 0)
 orgDetailsCache := make(map[uuid.UUID]struct{ name, displayName string })
 filtered := make([]database.GetGroupsRow, 0)
 for _, group := range q.groups {
 if arg.OrganizationID != uuid.Nil && group.OrganizationID != arg.OrganizationID {
 continue
 continue
 }

 filtered = append(filtered, group)
 orgDetails, ok := orgDetailsCache[group.ID]
 if !ok {
 for _, org := range q.organizations {
 if group.OrganizationID == org.ID {
 orgDetails = struct{ name, displayName string }{
 name: org.Name, displayName: org.DisplayName,
 }
 break
 }
 }
 orgDetailsCache[group.ID] = orgDetails
 }

 filtered = append(filtered, database.GetGroupsRow{
 Group:                   group,
 OrganizationName:        orgDetails.name,
 OrganizationDisplayName: orgDetails.displayName,
 })
 }

 return filtered, nil
diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/modelmethods.go b/coderd/database/modelmethods.go
 })
 }

 func (g GetGroupsRow) RBACObject() rbac.Object {
 return g.Group.RBACObject()
 }

 func (gm GroupMember) RBACObject() rbac.Object {
 return rbac.ResourceGroupMember.WithID(gm.UserID).InOrg(gm.OrganizationID).WithOwner(gm.UserID.String())
 }
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/groups.sql b/coderd/database/queries/groups.sql

 -- name: GetGroups :many
 SELECT
 *
 sqlc.embed(groups),
 organizations.nameAS organization_name,
 organizations.display_nameAS organization_display_name
 FROM
    groups
 groups
 INNER JOIN
 organizationsONgroups.organization_id=organizations.id
 WHERE
 true
 AND CASE
 WHEN @organization_id:: uuid!='00000000-0000-0000-0000-000000000000'::uuid THEN
 groups.organization_id= @organization_id
 ELSE true
 END
 AND CASE
 -- Filter to only include groups a user is a member of
 WHEN @has_member_id::uuid!='00000000-0000-0000-0000-000000000000'::uuid THEN
 EXISTS (
 SELECT
 1
 FROM
 -- this view handles the 'everyone' group in orgs.
 group_members_expanded
 WHERE
 group_members_expanded.group_id=groups.id
 AND
 group_members_expanded.user_id= @has_member_id
 )
 ELSE true
 END
 true
 AND CASE
 WHEN @organization_id:: uuid!='00000000-0000-0000-0000-000000000000'::uuid THEN
 groups.organization_id= @organization_id
 ELSE true
 END
 AND CASE
 -- Filter to only include groups a user is a member of
 WHEN @has_member_id::uuid!='00000000-0000-0000-0000-000000000000'::uuid THEN
 EXISTS (
 SELECT
 1
 FROM
 -- this view handles the 'everyone' group in orgs.
 group_members_expanded
 WHERE
 group_members_expanded.group_id=groups.id
 AND
 group_members_expanded.user_id= @has_member_id
 )
 ELSE true
 END
 ;

 -- name: InsertGroup :one
 id,
 name,
 organization_id,
 source
 source
 )
 SELECT
 gen_random_uuid(),
 group_name,
 @organization_id,
 @source
 gen_random_uuid(),
 group_name,
 @organization_id,
 @source
 FROM
 UNNEST(@group_names ::text[])AS group_name
 UNNEST(@group_names ::text[])AS group_name
 -- If the name conflicts, do nothing.
 ON CONFLICT DO NOTHING
 RETURNING*;
 groups
 WHERE
 id= $1;


diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
 }
 ownerGroupNames := []string{}
 for _, group := range ownerGroups {
 ownerGroupNames = append(ownerGroupNames, group.Name)
 ownerGroupNames = append(ownerGroupNames, group.Group.Name)
 }
 err = s.Pubsub.Publish(codersdk.WorkspaceNotifyChannel(workspace.ID), []byte{})
 if err != nil {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -208,17 +208,19 @@ func Users(users []database.User, organizationIDs map[uuid.UUID][]uuid.UUID) []c
		})
		}

		func Group(group database.Group, members []database.GroupMember, totalMemberCount int) codersdk.Group {
		func Group(row database.GetGroupsRow, members []database.GroupMember, totalMemberCount int) codersdk.Group {
		return codersdk.Group{
		ID: group.ID,
		Name: group.Name,
		DisplayName: group.DisplayName,
		OrganizationID: group.OrganizationID,
		AvatarURL: group.AvatarURL,
		Members: ReducedUsersFromGroupMembers(members),
		TotalMemberCount: totalMemberCount,
		QuotaAllowance: int(group.QuotaAllowance),
		Source: codersdk.GroupSource(group.Source),
		ID: row.Group.ID,
		Name: row.Group.Name,
		DisplayName: row.Group.DisplayName,
		OrganizationID: row.Group.OrganizationID,
		AvatarURL: row.Group.AvatarURL,
		Members: ReducedUsersFromGroupMembers(members),
		TotalMemberCount: totalMemberCount,
		QuotaAllowance: int(row.Group.QuotaAllowance),
		Source: codersdk.GroupSource(row.Group.Source),
		OrganizationName: row.OrganizationName,
		OrganizationDisplayName: row.OrganizationDisplayName,
		}
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1503,7 +1503,7 @@ func (q *querier) GetGroupMembersCountByGroupID(ctx context.Context, groupID uui
		return memberCount, nil
		}

		func (q *querier) GetGroups(ctx context.Context, arg database.GetGroupsParams) ([]database.Group, error) {
		func (q *querier) GetGroups(ctx context.Context, arg database.GetGroupsParams) ([]database.GetGroupsRow, error) {
		if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err == nil {
		// Optimize this query for system users as it is used in telemetry.
		// Calling authz on all groups in a deployment for telemetry jobs is
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -607,7 +607,10 @@ func (s *MethodTestSuite) TestOrganization() {
		check.Args(database.GetGroupsParams{
		OrganizationID: o.ID,
		}).Asserts(rbac.ResourceSystem, policy.ActionRead, a, policy.ActionRead, b, policy.ActionRead).
		Returns([]database.Group{a, b}).
		Returns([]database.GetGroupsRow{
		{Group: a, OrganizationName: o.Name, OrganizationDisplayName: o.DisplayName},
		{Group: b, OrganizationName: o.Name, OrganizationDisplayName: o.DisplayName},
		}).
		// Fail the system check shortcut
		FailSystemObjectChecks()
		}))
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2609,7 +2609,7 @@ func (q *FakeQuerier) GetGroupMembersCountByGroupID(ctx context.Context, groupID
		return int64(len(users)), nil
		}

		func (q *FakeQuerier) GetGroups(_ context.Context, arg database.GetGroupsParams) ([]database.Group, error) {
		func (q *FakeQuerier) GetGroups(_ context.Context, arg database.GetGroupsParams) ([]database.GetGroupsRow, error) {
		err := validateDatabaseType(arg)
		if err != nil {
		return nil, err
Expand All		@@ -2634,7 +2634,8 @@ func (q *FakeQuerier) GetGroups(_ context.Context, arg database.GetGroupsParams)
		}
		}

		filtered := make([]database.Group, 0)
		orgDetailsCache := make(map[uuid.UUID]struct{ name, displayName string })
		filtered := make([]database.GetGroupsRow, 0)
		for _, group := range q.groups {
		if arg.OrganizationID != uuid.Nil && group.OrganizationID != arg.OrganizationID {
		continue
Expand All		@@ -2645,7 +2646,24 @@ func (q *FakeQuerier) GetGroups(_ context.Context, arg database.GetGroupsParams)
		continue
		}

		filtered = append(filtered, group)
		orgDetails, ok := orgDetailsCache[group.ID]
		if !ok {
		for _, org := range q.organizations {
		if group.OrganizationID == org.ID {
		orgDetails = struct{ name, displayName string }{
		name: org.Name, displayName: org.DisplayName,
		}
		break
		}
		}
		orgDetailsCache[group.ID] = orgDetails
		}

		filtered = append(filtered, database.GetGroupsRow{
		Group: group,
		OrganizationName: orgDetails.name,
		OrganizationDisplayName: orgDetails.displayName,
		})
		}

		return filtered, nil
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -183,6 +183,10 @@ func (g Group) RBACObject() rbac.Object {
		})
		}

		func (g GetGroupsRow) RBACObject() rbac.Object {
		return g.Group.RBACObject()
		}

		func (gm GroupMember) RBACObject() rbac.Object {
		return rbac.ResourceGroupMember.WithID(gm.UserID).InOrg(gm.OrganizationID).WithOwner(gm.UserID.String())
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,32 +22,36 @@ LIMIT

		-- name: GetGroups :many
		SELECT
		*
		sqlc.embed(groups),
		organizations.nameAS organization_name,
		organizations.display_nameAS organization_display_name
		FROM
		groups
		groups
		INNER JOIN
		organizationsONgroups.organization_id=organizations.id
		WHERE
		true
		AND CASE
		WHEN @organization_id:: uuid!='00000000-0000-0000-0000-000000000000'::uuid THEN
		groups.organization_id= @organization_id
		ELSE true
		END
		AND CASE
		-- Filter to only include groups a user is a member of
		WHEN @has_member_id::uuid!='00000000-0000-0000-0000-000000000000'::uuid THEN
		EXISTS (
		SELECT
		1
		FROM
		-- this view handles the 'everyone' group in orgs.
		group_members_expanded
		WHERE
		group_members_expanded.group_id=groups.id
		AND
		group_members_expanded.user_id= @has_member_id
		)
		ELSE true
		END
		true
		AND CASE
		WHEN @organization_id:: uuid!='00000000-0000-0000-0000-000000000000'::uuid THEN
		groups.organization_id= @organization_id
		ELSE true
		END
		AND CASE
		-- Filter to only include groups a user is a member of
		WHEN @has_member_id::uuid!='00000000-0000-0000-0000-000000000000'::uuid THEN
		EXISTS (
		SELECT
		1
		FROM
		-- this view handles the 'everyone' group in orgs.
		group_members_expanded
		WHERE
		group_members_expanded.group_id=groups.id
		AND
		group_members_expanded.user_id= @has_member_id
		)
		ELSE true
		END
aslilac marked this conversation as resolved. Show resolvedHide resolved
		;

		-- name: InsertGroup :one
Expand All		@@ -70,15 +74,15 @@ INSERT INTO groups (
		id,
		name,
		organization_id,
		source
		source
		)
		SELECT
		gen_random_uuid(),
		group_name,
		@organization_id,
		@source
		gen_random_uuid(),
		group_name,
		@organization_id,
		@source
		FROM
		UNNEST(@group_names ::text[])AS group_name
		UNNEST(@group_names ::text[])AS group_name
		-- If the name conflicts, do nothing.
		ON CONFLICT DO NOTHING
		RETURNING*;
aslilac marked this conversation as resolved. Show resolvedHide resolved
Expand DownExpand Up		@@ -113,5 +117,3 @@ DELETE FROM
		groups
		WHERE
		id= $1;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -491,7 +491,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
		}
		ownerGroupNames := []string{}
		for _, group := range ownerGroups {
		ownerGroupNames = append(ownerGroupNames, group.Name)
		ownerGroupNames = append(ownerGroupNames, group.Group.Name)
		}
		err = s.Pubsub.Publish(codersdk.WorkspaceNotifyChannel(workspace.ID), []byte{})
		if err != nil {
Expand Down