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

Commitb665aa9

Browse files
committed
chore: add tests for shared_with_group filter
1 parent6cff66f commitb665aa9

File tree

2 files changed

+178
-0
lines changed

2 files changed

+178
-0
lines changed

‎coderd/searchquery/search_test.go‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,59 @@ func TestSearchWorkspace(t *testing.T) {
337337
SharedWithUserID:uuid.MustParse("3dd8b1b8-dff5-4b22-8ae9-c243ca136ecf"),
338338
},
339339
},
340+
{
341+
Name:"SharedWithGroupDefaultOrg",
342+
Query:"shared_with_group:wibble",
343+
Setup:func(t*testing.T,db database.Store) {
344+
org,err:=db.GetOrganizationByName(t.Context(), database.GetOrganizationByNameParams{
345+
Name:"coder",
346+
})
347+
require.NoError(t,err)
348+
349+
dbgen.Group(t,db, database.Group{
350+
ID:uuid.MustParse("590f1006-15e6-4b21-a6e1-92e33af8a5c3"),
351+
Name:"wibble",
352+
OrganizationID:org.ID,
353+
})
354+
},
355+
Expected: database.GetWorkspacesParams{
356+
SharedWithGroupID:uuid.MustParse("590f1006-15e6-4b21-a6e1-92e33af8a5c3"),
357+
},
358+
},
359+
{
360+
Name:"SharedWithGroupInOrg",
361+
Query:"shared_with_group:wibble/wobble",
362+
Setup:func(t*testing.T,db database.Store) {
363+
org:=dbgen.Organization(t,db, database.Organization{
364+
ID:uuid.MustParse("dbeb1bd5-dce6-459c-ab7b-b7f8b9b10467"),
365+
Name:"wibble",
366+
})
367+
dbgen.Group(t,db, database.Group{
368+
ID:uuid.MustParse("3c831688-0a5a-45a2-a796-f7648874df34"),
369+
Name:"wobble",
370+
OrganizationID:org.ID,
371+
})
372+
},
373+
Expected: database.GetWorkspacesParams{
374+
SharedWithGroupID:uuid.MustParse("3c831688-0a5a-45a2-a796-f7648874df34"),
375+
},
376+
},
377+
{
378+
Name:"SharedWithGroupID",
379+
Query:"shared_with_group:a7d1ba00-53c7-4aa6-92ea-83157dd57480",
380+
Setup:func(t*testing.T,db database.Store) {
381+
org:=dbgen.Organization(t,db, database.Organization{
382+
ID:uuid.MustParse("8606620f-fee4-4c4e-83ba-f42db804139a"),
383+
})
384+
dbgen.Group(t,db, database.Group{
385+
ID:uuid.MustParse("a7d1ba00-53c7-4aa6-92ea-83157dd57480"),
386+
OrganizationID:org.ID,
387+
})
388+
},
389+
Expected: database.GetWorkspacesParams{
390+
SharedWithGroupID:uuid.MustParse("a7d1ba00-53c7-4aa6-92ea-83157dd57480"),
391+
},
392+
},
340393

341394
// Failures
342395
{
@@ -379,6 +432,21 @@ func TestSearchWorkspace(t *testing.T) {
379432
Query:"param:foo:value",
380433
ExpectedErrorContains:"can only contain 1 ':'",
381434
},
435+
{
436+
Name:"SharedWithGroupTooManySegments",
437+
Query:`shared_with_group:acme/devs/extra`,
438+
ExpectedErrorContains:"the filter must be in the pattern of <organization name>/<group name>",
439+
},
440+
{
441+
Name:"SharedWithGroupEmptyOrg",
442+
Query:`shared_with_group:/devs`,
443+
ExpectedErrorContains:"invalid organization name",
444+
},
445+
{
446+
Name:"SharedWithGroupEmptyGroup",
447+
Query:`shared_with_group:acme/`,
448+
ExpectedErrorContains:"organization\"acme\" either does not exist",
449+
},
382450
}
383451

384452
for_,c:=rangetestCases {

‎enterprise/coderd/workspaces_test.go‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3723,6 +3723,116 @@ func TestWorkspacesFiltering(t *testing.T) {
37233723
require.Equal(t,1,workspaces.Count,"expected only one workspace")
37243724
require.Equal(t,workspaces.Workspaces[0].ID,notSharedWorkspace.ID)
37253725
})
3726+
3727+
t.Run("SharedWithGroupByID",func(t*testing.T) {
3728+
t.Parallel()
3729+
3730+
dv:=coderdtest.DeploymentValues(t)
3731+
dv.Experiments= []string{string(codersdk.ExperimentWorkspaceSharing)}
3732+
3733+
var (
3734+
client,db,orgOwner=coderdenttest.NewWithDatabase(t,&coderdenttest.Options{
3735+
Options:&coderdtest.Options{
3736+
DeploymentValues:dv,
3737+
},
3738+
LicenseOptions:&coderdenttest.LicenseOptions{
3739+
Features: license.Features{
3740+
codersdk.FeatureTemplateRBAC:1,
3741+
},
3742+
},
3743+
})
3744+
_,workspaceOwner=coderdtest.CreateAnotherUser(t,client,orgOwner.OrganizationID,rbac.ScopedRoleOrgAuditor(orgOwner.OrganizationID))
3745+
sharedWorkspace=dbfake.WorkspaceBuild(t,db, database.WorkspaceTable{
3746+
OwnerID:workspaceOwner.ID,
3747+
OrganizationID:orgOwner.OrganizationID,
3748+
}).Do().Workspace
3749+
_=dbfake.WorkspaceBuild(t,db, database.WorkspaceTable{
3750+
OwnerID:workspaceOwner.ID,
3751+
OrganizationID:orgOwner.OrganizationID,
3752+
}).Do().Workspace
3753+
ctx=testutil.Context(t,testutil.WaitMedium)
3754+
)
3755+
3756+
group,err:=client.CreateGroup(ctx,orgOwner.OrganizationID, codersdk.CreateGroupRequest{
3757+
Name:"wibble",
3758+
})
3759+
require.NoError(t,err,"create group")
3760+
err=client.UpdateWorkspaceACL(ctx,sharedWorkspace.ID, codersdk.UpdateWorkspaceACL{
3761+
GroupRoles:map[string]codersdk.WorkspaceRole{
3762+
group.ID.String():codersdk.WorkspaceRoleUse,
3763+
},
3764+
})
3765+
require.NoError(t,err)
3766+
3767+
workspaces,err:=client.Workspaces(ctx, codersdk.WorkspaceFilter{
3768+
SharedWithGroup:group.ID.String(),
3769+
})
3770+
require.NoError(t,err)
3771+
require.Equal(t,1,workspaces.Count)
3772+
require.Equal(t,sharedWorkspace.ID,workspaces.Workspaces[0].ID)
3773+
})
3774+
3775+
t.Run("SharedWithGroupFilter",func(t*testing.T) {
3776+
t.Parallel()
3777+
3778+
dv:=coderdtest.DeploymentValues(t)
3779+
dv.Experiments= []string{string(codersdk.ExperimentWorkspaceSharing)}
3780+
3781+
var (
3782+
client,db,orgOwner=coderdenttest.NewWithDatabase(t,&coderdenttest.Options{
3783+
Options:&coderdtest.Options{
3784+
DeploymentValues:dv,
3785+
},
3786+
LicenseOptions:&coderdenttest.LicenseOptions{
3787+
Features: license.Features{
3788+
codersdk.FeatureTemplateRBAC:1,
3789+
},
3790+
},
3791+
})
3792+
_,workspaceOwner=coderdtest.CreateAnotherUser(t,client,orgOwner.OrganizationID,rbac.ScopedRoleOrgAuditor(orgOwner.OrganizationID))
3793+
sharedWorkspace=dbfake.WorkspaceBuild(t,db, database.WorkspaceTable{
3794+
OwnerID:workspaceOwner.ID,
3795+
OrganizationID:orgOwner.OrganizationID,
3796+
}).Do().Workspace
3797+
_=dbfake.WorkspaceBuild(t,db, database.WorkspaceTable{
3798+
OwnerID:workspaceOwner.ID,
3799+
OrganizationID:orgOwner.OrganizationID,
3800+
}).Do().Workspace
3801+
ctx=testutil.Context(t,testutil.WaitMedium)
3802+
)
3803+
3804+
group,err:=client.CreateGroup(ctx,orgOwner.OrganizationID, codersdk.CreateGroupRequest{
3805+
Name:"wibble",
3806+
})
3807+
require.NoError(t,err,"create group")
3808+
err=client.UpdateWorkspaceACL(ctx,sharedWorkspace.ID, codersdk.UpdateWorkspaceACL{
3809+
GroupRoles:map[string]codersdk.WorkspaceRole{
3810+
group.ID.String():codersdk.WorkspaceRoleUse,
3811+
},
3812+
})
3813+
require.NoError(t,err)
3814+
3815+
workspacesByID,err:=client.Workspaces(ctx, codersdk.WorkspaceFilter{
3816+
SharedWithGroup:group.ID.String(),
3817+
})
3818+
require.NoError(t,err)
3819+
require.Equal(t,1,workspacesByID.Count)
3820+
require.Equal(t,sharedWorkspace.ID,workspacesByID.Workspaces[0].ID)
3821+
3822+
workspacesByName,err:=client.Workspaces(ctx, codersdk.WorkspaceFilter{
3823+
SharedWithGroup:group.Name,
3824+
})
3825+
require.NoError(t,err)
3826+
require.Equal(t,1,workspacesByName.Count)
3827+
require.Equal(t,sharedWorkspace.ID,workspacesByName.Workspaces[0].ID)
3828+
3829+
workspacesByOrgAndName,err:=client.Workspaces(ctx, codersdk.WorkspaceFilter{
3830+
SharedWithGroup:fmt.Sprintf("coder/%s",group.Name),
3831+
})
3832+
require.NoError(t,err)
3833+
require.Equal(t,1,workspacesByOrgAndName.Count)
3834+
require.Equal(t,sharedWorkspace.ID,workspacesByOrgAndName.Workspaces[0].ID)
3835+
})
37263836
}
37273837

37283838
// TestWorkspacesWithoutTemplatePerms creates a workspace for a user, then drops

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp