8000 linting · coder/coder@0f15263 · GitHub
[go: up one dir, main page]

Skip to content

Commit 0f15263

Browse files
committed
linting
1 parent 1abff51 commit 0f15263

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

coderd/rbac/roles_test.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -555,15 +555,6 @@ func TestRolePermissions(t *testing.T) {
555555
false: {setOtherOrg, memberMe, userAdmin, orgTemplateAdmin, orgUserAdmin, orgAuditor},
556556
},
557557
},
558-
{
559-
Name: "ProvisionerKeys",
560-
Actions: []policy.Action{policy.ActionCreate, policy.ActionRead, policy.ActionDelete},
561-
Resource: rbac.ResourceProvisionerKeys.InOrg(orgID),
562-
AuthorizeMap: map[bool][]hasAuthSubjects{
563-
true: {owner, orgAdmin},
564-
false: {setOtherOrg, memberMe, orgMemberMe, userAdmin, templateAdmin, orgTemplateAdmin, orgUserAdmin, orgAuditor},
565-
},
566-
},
567558
{
568559
Name: "ProvisionerJobs",
569560
Actions: []policy.Action{policy.ActionRead},

enterprise/coderd/roles.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,16 +255,15 @@ func filterInvalidPermissions(permissions []codersdk.Permission) []codersdk.Perm
255255
// Filter out any invalid permissions
256256
var validPermissions []codersdk.Permission
257257
for _, permission := range permissions {
258-
err := (&rbac.Permission{
258+
err := rbac.Permission{
259259
Negate: permission.Negate,
260260
ResourceType: string(permission.ResourceType),
261261
Action: policy.Action(permission.Action),
262-
}).Valid()
263-
if err == nil {
264-
validPermissions = append(validPermissions, permission)
265-
} else {
266-
fmt.Println(err.Error())
262+
}.Valid()
263+
if err != nil {
264+
continue
267265
}
266+
validPermissions = append(validPermissions, permission)
268267
}
269268
return validPermissions
270269
}

0 commit comments

Comments
 (0)
0