Skip to content

chore: merge provisioner key and provisioner permissions #16628

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 24, 2025
Merged

chore: merge provisioner key and provisioner permissions #16628

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0e0cd23
chore: merge provisioner key and provisioner permissions
Emyrk Feb 19, 2025
1abff51
chore: filter out invalid permissions on custom role push
Emyrk Feb 19, 2025
0f15263
linting
Emyrk Feb 19, 2025
aee3289
Update site/src/api/rbacresourcesGenerated.ts
Emyrk Feb 19, 2025
ccc3afa
Update coderd/rbac/policy/policy.go
Emyrk Feb 19, 2025
a6fcd52
make gen
Emyrk Feb 19, 2025
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
Prev Previous commit
Next Next commit
linting
  • Loading branch information
@Emyrk
Emyrk committed Feb 19, 2025
commit 0f1526373f1b20a53de253e5e65d1f49d414b33f
9 changes: 0 additions & 9 deletions coderd/rbac/roles_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,15 +555,6 @@ func TestRolePermissions(t *testing.T) {
false: {setOtherOrg, memberMe, userAdmin, orgTemplateAdmin, orgUserAdmin, orgAuditor},
},
},
{
Name: "ProvisionerKeys",
Actions: []policy.Action{policy.ActionCreate, policy.ActionRead, policy.ActionDelete},
Resource: rbac.ResourceProvisionerKeys.InOrg(orgID),
AuthorizeMap: map[bool][]hasAuthSubjects{
true: {owner, orgAdmin},
false: {setOtherOrg, memberMe, orgMemberMe, userAdmin, templateAdmin, orgTemplateAdmin, orgUserAdmin, orgAuditor},
},
},
{
Name: "ProvisionerJobs",
Actions: []policy.Action{policy.ActionRead},
Expand Down
11 changes: 5 additions & 6 deletions enterprise/coderd/roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,16 +255,15 @@ func filterInvalidPermissions(permissions []codersdk.Permission) []codersdk.Perm
// Filter out any invalid permissions
var validPermissions []codersdk.Permission
for _, permission := range permissions {
err := (&rbac.Permission{
err := rbac.Permission{
Negate: permission.Negate,
ResourceType: string(permission.ResourceType),
Action: policy.Action(permission.Action),
}).Valid()
if err == nil {
validPermissions = append(validPermissions, permission)
} else {
fmt.Println(err.Error())
}.Valid()
if err != nil {
continue
}
validPermissions = append(validPermissions, permission)
}
return validPermissions
}
Expand Down
Loading