opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: change view perm to use (#4496)

Browse Source
This commit is contained in:
Jon Ayers
2022-10-12 14:33:21 -05:00
committed by GitHub
parent 47805643f7
commit 0fa8f528c2
7 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
enterprise/coderd/templates.go
+2 -2
View File
@@ -226,7 +226,7 @@ func validateTemplateRole(role codersdk.TemplateRole) error {
func convertToTemplateRole(actions []rbac.Action) codersdk.TemplateRole {
switch {
case len(actions) == 1 && actions[0] == rbac.ActionRead:
return codersdk.TemplateRoleView
return codersdk.TemplateRoleUse
case len(actions) == 1 && actions[0] == rbac.WildcardSymbol:
return codersdk.TemplateRoleAdmin
}
@@ -238,7 +238,7 @@ func convertSDKTemplateRole(role codersdk.TemplateRole) []rbac.Action {
switch role {
case codersdk.TemplateRoleAdmin:
return []rbac.Action{rbac.WildcardSymbol}
case codersdk.TemplateRoleView:
case codersdk.TemplateRoleUse:
return []rbac.Action{rbac.ActionRead}
}
enterprise/coderd/templates_test.go
+18 -18
View File
@@ -35,7 +35,7 @@ func TestTemplateACL(t *testing.T) {
err := client.UpdateTemplateACL(ctx, template.ID, codersdk.UpdateTemplateACL{
UserPerms: map[string]codersdk.TemplateRole{
user2.ID.String(): codersdk.TemplateRoleView,
user2.ID.String(): codersdk.TemplateRoleUse,
user3.ID.String(): codersdk.TemplateRoleAdmin,
},
})
@@ -46,7 +46,7 @@ func TestTemplateACL(t *testing.T) {
templateUser2 := codersdk.TemplateUser{
User: user2,
Role: codersdk.TemplateRoleView,
Role: codersdk.TemplateRoleUse,
}
templateUser3 := codersdk.TemplateUser{
@@ -149,7 +149,7 @@ func TestTemplateACL(t *testing.T) {
err := client.UpdateTemplateACL(ctx, template.ID, codersdk.UpdateTemplateACL{
UserPerms: map[string]codersdk.TemplateRole{
user1.ID.String(): codersdk.TemplateRoleView,
user1.ID.String(): codersdk.TemplateRoleUse,
},
})
require.NoError(t, err)
@@ -158,7 +158,7 @@ func TestTemplateACL(t *testing.T) {
require.NoError(t, err)
require.Contains(t, acl.Users, codersdk.TemplateUser{
User: user1,
Role: codersdk.TemplateRoleView,
Role: codersdk.TemplateRoleUse,
})
err = client.DeleteUser(ctx, user1.ID)
@@ -187,7 +187,7 @@ func TestTemplateACL(t *testing.T) {
err := client.UpdateTemplateACL(ctx, template.ID, codersdk.UpdateTemplateACL{
UserPerms: map[string]codersdk.TemplateRole{
user1.ID.String(): codersdk.TemplateRoleView,
user1.ID.String(): codersdk.TemplateRoleUse,
},
})
require.NoError(t, err)
@@ -196,7 +196,7 @@ func TestTemplateACL(t *testing.T) {
require.NoError(t, err)
require.Contains(t, acl.Users, codersdk.TemplateUser{
User: user1,
Role: codersdk.TemplateRoleView,
Role: codersdk.TemplateRoleUse,
})
_, err = client.UpdateUserStatus(ctx, user1.ID.String(), codersdk.UserStatusSuspended)
@@ -229,7 +229,7 @@ func TestTemplateACL(t *testing.T) {
err = client.UpdateTemplateACL(ctx, template.ID, codersdk.UpdateTemplateACL{
GroupPerms: map[string]codersdk.TemplateRole{
group.ID.String(): codersdk.TemplateRoleView,
group.ID.String(): codersdk.TemplateRoleUse,
},
})
require.NoError(t, err)
@@ -241,7 +241,7 @@ func TestTemplateACL(t *testing.T) {
require.Contains(t, acl.Groups, codersdk.TemplateGroup{
Group: group,
Role: codersdk.TemplateRoleView,
Role: codersdk.TemplateRoleUse,
})
err = client.DeleteGroup(ctx, group.ID)
@@ -253,7 +253,7 @@ func TestTemplateACL(t *testing.T) {
require.Len(t, acl.Groups, 1)
require.NotContains(t, acl.Groups, codersdk.TemplateGroup{
Group: group,
Role: codersdk.TemplateRoleView,
Role: codersdk.TemplateRoleUse,
})
})
@@ -273,7 +273,7 @@ func TestTemplateACL(t *testing.T) {
err := client.UpdateTemplateACL(ctx, template.ID, codersdk.UpdateTemplateACL{
UserPerms: map[string]codersdk.TemplateRole{
user1.ID.String(): codersdk.TemplateRoleView,
user1.ID.String(): codersdk.TemplateRoleUse,
},
})
require.NoError(t, err)
@@ -331,7 +331,7 @@ func TestUpdateTemplateACL(t *testing.T) {
err := client.UpdateTemplateACL(ctx, template.ID, codersdk.UpdateTemplateACL{
UserPerms: map[string]codersdk.TemplateRole{
user2.ID.String(): codersdk.TemplateRoleView,
user2.ID.String(): codersdk.TemplateRoleUse,
user3.ID.String(): codersdk.TemplateRoleAdmin,
},
})
@@ -342,7 +342,7 @@ func TestUpdateTemplateACL(t *testing.T) {
templateUser2 := codersdk.TemplateUser{
User: user2,
Role: codersdk.TemplateRoleView,
Role: codersdk.TemplateRoleUse,
}
templateUser3 := codersdk.TemplateUser{
@@ -370,7 +370,7 @@ func TestUpdateTemplateACL(t *testing.T) {
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
req := codersdk.UpdateTemplateACL{
UserPerms: map[string]codersdk.TemplateRole{
user2.ID.String(): codersdk.TemplateRoleView,
user2.ID.String(): codersdk.TemplateRoleUse,
user3.ID.String(): codersdk.TemplateRoleAdmin,
},
}
@@ -385,7 +385,7 @@ func TestUpdateTemplateACL(t *testing.T) {
require.NoError(t, err)
require.Contains(t, acl.Users, codersdk.TemplateUser{
User: user2,
Role: codersdk.TemplateRoleView,
Role: codersdk.TemplateRoleUse,
})
require.Contains(t, acl.Users, codersdk.TemplateUser{
User: user3,
@@ -506,7 +506,7 @@ func TestUpdateTemplateACL(t *testing.T) {
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
req := codersdk.UpdateTemplateACL{
UserPerms: map[string]codersdk.TemplateRole{
user2.ID.String(): codersdk.TemplateRoleView,
user2.ID.String(): codersdk.TemplateRoleUse,
},
}
@@ -553,7 +553,7 @@ func TestUpdateTemplateACL(t *testing.T) {
req = codersdk.UpdateTemplateACL{
UserPerms: map[string]codersdk.TemplateRole{
user3.ID.String(): codersdk.TemplateRoleView,
user3.ID.String(): codersdk.TemplateRoleUse,
},
}
@@ -565,7 +565,7 @@ func TestUpdateTemplateACL(t *testing.T) {
require.Contains(t, acl.Users, codersdk.TemplateUser{
User: user3,
Role: codersdk.TemplateRoleView,
Role: codersdk.TemplateRoleUse,
})
})
@@ -622,7 +622,7 @@ func TestUpdateTemplateACL(t *testing.T) {
GroupPerms: map[string]codersdk.TemplateRole{
// The allUsers group shares the same ID as the organization.
user.OrganizationID.String(): codersdk.TemplateRoleDeleted,
group.ID.String(): codersdk.TemplateRoleView,
group.ID.String(): codersdk.TemplateRoleUse,
},
})
require.NoError(t, err)