Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

fix: omit users for 'Everyone' group in response#5937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
sreya merged 2 commits intomainfromjon/fixallusersgroup
Jan 31, 2023
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletionscoderd/database/databasefake/databasefake.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4051,24 +4051,6 @@ func (q *fakeQuerier) GetGroupsByOrganizationID(_ context.Context, organizationI
return groups, nil
}

func (q *fakeQuerier) GetAllOrganizationMembers(_ context.Context, organizationID uuid.UUID) ([]database.User, error) {
q.mutex.RLock()
defer q.mutex.RUnlock()

var users []database.User
for _, member := range q.organizationMembers {
if member.OrganizationID == organizationID {
for _, user := range q.users {
if user.ID == member.UserID {
users = append(users, user)
}
}
}
}

return users, nil
}

func (q *fakeQuerier) DeleteGroupByID(_ context.Context, id uuid.UUID) error {
q.mutex.Lock()
defer q.mutex.Unlock()
Expand Down
1 change: 0 additions & 1 deletioncoderd/database/querier.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

49 changes: 0 additions & 49 deletionscoderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

12 changes: 0 additions & 12 deletionscoderd/database/queries/groups.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,18 +36,6 @@ AND
AND
users.deleted = 'false';

-- name: GetAllOrganizationMembers :many
SELECT
users.*
FROM
users
JOIN
organization_members
ON
users.id = organization_members.user_id
WHERE
organization_members.organization_id = $1;

-- name: GetGroupsByOrganizationID :many
SELECT
*
Expand Down
20 changes: 20 additions & 0 deletionsenterprise/coderd/groups_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -605,6 +605,26 @@ func TestGroup(t *testing.T) {
require.NotContains(t,group.Members,user1)
require.Contains(t,group.Members,user2)
})

t.Run("everyoneGroupReturnsEmpty",func(t*testing.T) {
t.Parallel()

client:=coderdenttest.New(t,nil)
user:=coderdtest.CreateFirstUser(t,client)

_=coderdenttest.AddLicense(t,client, coderdenttest.LicenseOptions{
Features: license.Features{
codersdk.FeatureTemplateRBAC:1,
},
})
ctx,_:=testutil.Context(t)
// The 'Everyone' group always has an ID that matches the organization ID.
group,err:=client.Group(ctx,user.OrganizationID)
require.NoError(t,err)
require.Len(t,group.Members,0)
require.Equal(t,"Everyone",group.Name)
require.Equal(t,user.OrganizationID,group.OrganizationID)
})
}

// TODO: test auth.
Expand Down
7 changes: 1 addition & 6 deletionsenterprise/coderd/templates.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,16 +78,11 @@ func (api *API) templateACL(rw http.ResponseWriter, r *http.Request) {
for _, group := range dbGroups {
var members []database.User

if group.Name == database.AllUsersGroup {
members, err = api.Database.GetAllOrganizationMembers(ctx, group.OrganizationID)
} else {
members, err = api.Database.GetGroupMembers(ctx, group.ID)
}
members, err = api.Database.GetGroupMembers(ctx, group.ID)
if err != nil {
httpapi.InternalServerError(rw, err)
return
}

groups = append(groups, codersdk.TemplateGroup{
Group: convertGroup(group.Group, members),
Role: convertToTemplateRole(group.Actions),
Expand Down
9 changes: 5 additions & 4 deletionsenterprise/coderd/templates_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,7 +66,7 @@ func TestTemplateACL(t *testing.T) {
require.Contains(t, acl.Users, templateUser3)
})

t.Run("allUsersGroup", func(t *testing.T) {
t.Run("everyoneGroup", func(t *testing.T) {
t.Parallel()
client := coderdenttest.New(t, nil)
user := coderdtest.CreateFirstUser(t, client)
Expand All@@ -76,7 +76,8 @@ func TestTemplateACL(t *testing.T) {
},
})

_, user1 := coderdtest.CreateAnotherUserWithUser(t, client, user.OrganizationID)
// Create a user to assert they aren't returned in the response.
_, _ = coderdtest.CreateAnotherUserWithUser(t, client, user.OrganizationID)
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

Expand All@@ -87,8 +88,8 @@ func TestTemplateACL(t *testing.T) {
require.NoError(t, err)

require.Len(t, acl.Groups, 1)
require.Len(t, acl.Groups[0].Members, 2)
require.Contains(t, acl.Groups[0].Members,user1)
// We don't return members for the 'Everyone' group.
require.Len(t, acl.Groups[0].Members,0)
require.Len(t, acl.Users, 0)
})

Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp