10000 chore: add edit organization role to cli by Emyrk · Pull Request #13365 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

chore: add edit organization role to cli #13365

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 9 commits into from
Jun 3, 2024
Merged

chore: add edit organization role to cli #13365

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7d69335
Add edit org role
Emyrk May 24, 2024
b005cdc
Fix imports
Emyrk May 24, 2024
677855a
add unit test
Emyrk May 24, 2024
57723a6
linting
Emyrk May 24, 2024
fbd8cf3
compile issue
Emyrk May 29, 2024
2bc99cd
Fix compile
Emyrk May 30, 2024
da0107c
Add custom role cli command
Emyrk May 30, 2024
ce841f9
fixup example
Emyrk May 30, 2024
e5082ae
Add invalid role test
Emyrk May 31, 2024
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
Fix compile
  • Loading branch information
@Emyrk
Emyrk committed May 31, 2024
commit 2bc99cdac1b7df50043bb51c032fad7334b41648
35 changes: 10 additions & 25 deletions cli/organizationroles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,16 +314,12 @@ customRoleLoop:

func applyOrgResourceActions(role *codersdk.Role, orgID uuid.UUID, resource string, actions []string) {
if role.OrganizationPermissions == nil {
role.OrganizationPermissions = map[string][]codersdk.Permission{}
}

if _, ok := role.OrganizationPermissions[orgID.String()]; !ok {
role.OrganizationPermissions[orgID.String()] = []codersdk.Permission{}
role.OrganizationPermissions = make([]codersdk.Permission, 0)
}

// Construct new site perms with only new perms for the resource
keep := make([]codersdk.Permission, 0)
for _, perm := range role.OrganizationPermissions[orgID.String()] {
for _, perm := range role.OrganizationPermissions {
perm := perm
if string(perm.ResourceType) != resource {
keep = append(keep, perm)
Expand All @@ -339,16 +335,16 @@ func applyOrgResourceActions(role *codersdk.Role, orgID uuid.UUID, resource stri
})
}

role.OrganizationPermissions[orgID.String()] = keep
role.OrganizationPermissions = keep
}

func defaultActions(role *codersdk.Role, orgID uuid.UUID, resource string) []string {
if role.OrganizationPermissions == nil {
role.OrganizationPermissions = map[string][]codersdk.Permission{}
role.OrganizationPermissions = []codersdk.Permission{}
}

defaults := make([]string, 0)
for _, perm := range role.OrganizationPermissions[orgID.String()] {
for _, perm := range role.OrganizationPermissions {
if string(perm.ResourceType) == resource {
defaults = append(defaults, string(perm.Action))
}
Expand All @@ -366,11 +362,11 @@ func permissionPreviews(role *codersdk.Role, orgID uuid.UUID, resources []coders

func permissionPreview(role *codersdk.Role, orgID uuid.UUID, resource codersdk.RBACResource) string {
if role.OrganizationPermissions == nil {
role.OrganizationPermissions = map[string][]codersdk.Permission{}
role.OrganizationPermissions = []codersdk.Permission{}
}

count := 0
for _, perm := range role.OrganizationPermissions[orgID.String()] {
for _, perm := range role.OrganizationPermissions {
if perm.ResourceType == resource {
count++
}
Expand All @@ -382,28 +378,17 @@ func roleToTableView(role codersdk.Role) roleTableRow {
return roleTableRow{
Name: role.Name,
DisplayName: role.DisplayName,
OrganizationID: role.OrganizationID,
SitePermissions: fmt.Sprintf("%d permissions", len(role.SitePermissions)),
OrganizationPermissions: orgPermissionString(role.OrganizationPermissions),
OrganizationPermissions: fmt.Sprintf("%d permissions", len(role.OrganizationPermissions)),
UserPermissions: fmt.Sprintf("%d permissions", len(role.UserPermissions)),
}
}

func orgPermissionString(perms map[string][]codersdk.Permission) string {
totalOrg := 0
for _, o := range perms {
totalOrg += len(o)
}
plural := ""
if len(perms) > 1 {
plural = "s"
}
return fmt.Sprintf("%d over %d organization%s",
totalOrg, len(perms), plural)
}

type roleTableRow struct {
Name string `table:"name,default_sort"`
DisplayName string `table:"display_name"`
OrganizationID string `table:"organization_id"`
SitePermissions string ` table:"site_permissions"`
// map[<org_id>] -> Permissions
OrganizationPermissions string `table:"org_permissions"`
Expand Down
0