mirror of
https://github.com/coder/coder.git
synced 2026-10-16 14:48:56 +08:00
test(coderd/provisionerdserver): expect agents-access in the owner's RBAC roles
Organization defaults now include agents-access, so the workspace owner's roles gain it. Sort the acquired job's roles before comparing, because the server returns them in database order.
This commit is contained in:
@@ -691,6 +691,11 @@ func TestAcquireJob(t *testing.T) {
|
||||
|
||||
<-startPublished
|
||||
|
||||
if wk, ok := job.Type.(*proto.AcquiredJob_WorkspaceBuild_); ok {
|
||||
slices.SortFunc(wk.WorkspaceBuild.Metadata.WorkspaceOwnerRbacRoles, func(a, b *sdkproto.Role) int {
|
||||
return strings.Compare(a.Name+a.OrgId, b.Name+b.OrgId)
|
||||
})
|
||||
}
|
||||
got, err := json.Marshal(job.Type)
|
||||
require.NoError(t, err)
|
||||
|
||||
@@ -724,7 +729,7 @@ func TestAcquireJob(t *testing.T) {
|
||||
WorkspaceOwnerSshPrivateKey: sshKey.PrivateKey,
|
||||
WorkspaceBuildId: build.ID.String(),
|
||||
WorkspaceOwnerLoginType: string(user.LoginType),
|
||||
WorkspaceOwnerRbacRoles: []*sdkproto.Role{{Name: rbac.RoleOrgMember(), OrgId: pd.OrganizationID.String()}, {Name: "member", OrgId: ""}, {Name: rbac.RoleOrgAuditor(), OrgId: pd.OrganizationID.String()}, {Name: rbac.RoleOrgWorkspaceAccess(), OrgId: pd.OrganizationID.String()}},
|
||||
WorkspaceOwnerRbacRoles: []*sdkproto.Role{{Name: rbac.RoleOrgMember(), OrgId: pd.OrganizationID.String()}, {Name: "member", OrgId: ""}, {Name: rbac.RoleOrgAuditor(), OrgId: pd.OrganizationID.String()}, {Name: rbac.RoleOrgWorkspaceAccess(), OrgId: pd.OrganizationID.String()}, {Name: rbac.RoleAgentsAccess(), OrgId: pd.OrganizationID.String()}},
|
||||
}
|
||||
if prebuiltWorkspaceBuildStage == sdkproto.PrebuiltWorkspaceBuildStage_CLAIM {
|
||||
// For claimed prebuilds, we expect the prebuild state to be set to CLAIM
|
||||
|
||||
Reference in New Issue
Block a user