Add custom role cli command

Emyrk · Emyrk · commit a2fcab86dfbd · 2024-05-30T10:27:11.000-05:00
diff --git a/cli/organizationroles.go b/cli/organizationroles.go
@@ -280,7 +280,7 @@ customRoleLoop:
 	for {
 		selected, err := cliui.Select(inv, cliui.SelectOptions{
 			Message: "Select which resources to edit permissions",
-			Options: append(permissionPreviews(role, orgID, allowedResources), done, abort),
+			Options: append(permissionPreviews(role, allowedResources), done, abort),
 		})
 		if err != nil {
 			return role, xerrors.Errorf("selecting resource: %w", err)
@@ -297,12 +297,12 @@ customRoleLoop:
 			actions, err := cliui.MultiSelect(inv, cliui.MultiSelectOptions{
 				Message:  fmt.Sprintf("Select actions to allow across the whole deployment for resources=%q", resource),
 				Options:  slice.ToStrings(codersdk.RBACResourceActions[codersdk.RBACResource(resource)]),
-				Defaults: defaultActions(role, orgID, resource),
+				Defaults: defaultActions(role, resource),
 			})
 			if err != nil {
 				return role, xerrors.Errorf("selecting actions for resource %q: %w", resource, err)
 			}
-			applyOrgResourceActions(role, orgID, resource, actions)
+			applyOrgResourceActions(role, resource, actions)
 			// back to resources!
 		}
 	}
@@ -312,7 +312,7 @@ customRoleLoop:
 	return role, nil
 }
 
-func applyOrgResourceActions(role *codersdk.Role, orgID uuid.UUID, resource string, actions []string) {
+func applyOrgResourceActions(role *codersdk.Role, resource string, actions []string) {
 	if role.OrganizationPermissions == nil {
 		role.OrganizationPermissions = make([]codersdk.Permission, 0)
 	}
@@ -338,7 +338,7 @@ func applyOrgResourceActions(role *codersdk.Role, orgID uuid.UUID, resource stri
 	role.OrganizationPermissions = keep
 }
 
-func defaultActions(role *codersdk.Role, orgID uuid.UUID, resource string) []string {
+func defaultActions(role *codersdk.Role, resource string) []string {
 	if role.OrganizationPermissions == nil {
 		role.OrganizationPermissions = []codersdk.Permission{}
 	}
@@ -352,15 +352,15 @@ func defaultActions(role *codersdk.Role, orgID uuid.UUID, resource string) []str
 	return defaults
 }
 
-func permissionPreviews(role *codersdk.Role, orgID uuid.UUID, resources []codersdk.RBACResource) []string {
+func permissionPreviews(role *codersdk.Role, resources []codersdk.RBACResource) []string {
 	previews := make([]string, 0, len(resources))
 	for _, resource := range resources {
-		previews = append(previews, permissionPreview(role, orgID, resource))
+		previews = append(previews, permissionPreview(role, resource))
 	}
 	return previews
 }
 
-func permissionPreview(role *codersdk.Role, orgID uuid.UUID, resource codersdk.RBACResource) string {
+func permissionPreview(role *codersdk.Role, resource codersdk.RBACResource) string {
 	if role.OrganizationPermissions == nil {
 		role.OrganizationPermissions = []codersdk.Permission{}
 	}
diff --git a/enterprise/cli/organization_test.go b/enterprise/cli/organization_test.go
@@ -39,17 +39,15 @@ func TestEditOrganizationRoles(t *testing.T) {
 		// Use json input, as interactive mode would be challenging to control
 		inv.Stdin = bytes.NewBufferString(fmt.Sprintf(`{
     "name": "new-role",
-    "organization_id": "%[1]s",
+    "organization_id": "%s",
     "display_name": "",
     "site_permissions": [],
-    "organization_permissions": {
-      "%[1]s": [
-        {
-          "resource_type": "workspace",
-          "action": "read"
-        }
-      ]
-    },
+    "organization_permissions": [
+		{
+		  "resource_type": "workspace",
+		  "action": "read"
+		}
+    ],
     "user_permissions": [],
     "assignable": false,
     "built_in": false

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ customRoleLoop:`
`280`	`280`	`for {`
`281`	`281`	`selected, err := cliui.Select(inv, cliui.SelectOptions{`
`282`	`282`	`Message: "Select which resources to edit permissions",`
`283`		`- Options: append(permissionPreviews(role, orgID, allowedResources), done, abort),`
	`283`	`+ Options: append(permissionPreviews(role, allowedResources), done, abort),`
`284`	`284`	`})`
`285`	`285`	`if err != nil {`
`286`	`286`	`return role, xerrors.Errorf("selecting resource: %w", err)`
`@@ -297,12 +297,12 @@ customRoleLoop:`
`297`	`297`	`actions, err := cliui.MultiSelect(inv, cliui.MultiSelectOptions{`
`298`	`298`	`Message: fmt.Sprintf("Select actions to allow across the whole deployment for resources=%q", resource),`
`299`	`299`	`Options: slice.ToStrings(codersdk.RBACResourceActions[codersdk.RBACResource(resource)]),`
`300`		`- Defaults: defaultActions(role, orgID, resource),`
	`300`	`+ Defaults: defaultActions(role, resource),`
`301`	`301`	`})`
`302`	`302`	`if err != nil {`
`303`	`303`	`return role, xerrors.Errorf("selecting actions for resource %q: %w", resource, err)`
`304`	`304`	`}`
`305`		`- applyOrgResourceActions(role, orgID, resource, actions)`
	`305`	`+ applyOrgResourceActions(role, resource, actions)`
`306`	`306`	`// back to resources!`
`307`	`307`	`}`
`308`	`308`	`}`
`@@ -312,7 +312,7 @@ customRoleLoop:`
`312`	`312`	`return role, nil`
`313`	`313`	`}`
`314`	`314`
`315`		`-func applyOrgResourceActions(role *codersdk.Role, orgID uuid.UUID, resource string, actions []string) {`
	`315`	`+func applyOrgResourceActions(role *codersdk.Role, resource string, actions []string) {`
`316`	`316`	`if role.OrganizationPermissions == nil {`
`317`	`317`	`role.OrganizationPermissions = make([]codersdk.Permission, 0)`
`318`	`318`	`}`
`@@ -338,7 +338,7 @@ func applyOrgResourceActions(role *codersdk.Role, orgID uuid.UUID, resource stri`
`338`	`338`	`role.OrganizationPermissions = keep`
`339`	`339`	`}`
`340`	`340`
`341`		`-func defaultActions(role *codersdk.Role, orgID uuid.UUID, resource string) []string {`
	`341`	`+func defaultActions(role *codersdk.Role, resource string) []string {`
`342`	`342`	`if role.OrganizationPermissions == nil {`
`343`	`343`	`role.OrganizationPermissions = []codersdk.Permission{}`
`344`	`344`	`}`
`@@ -352,15 +352,15 @@ func defaultActions(role *codersdk.Role, orgID uuid.UUID, resource string) []str`
`352`	`352`	`return defaults`
`353`	`353`	`}`
`354`	`354`
`355`		`-func permissionPreviews(role *codersdk.Role, orgID uuid.UUID, resources []codersdk.RBACResource) []string {`
	`355`	`+func permissionPreviews(role *codersdk.Role, resources []codersdk.RBACResource) []string {`
`356`	`356`	`previews := make([]string, 0, len(resources))`
`357`	`357`	`for _, resource := range resources {`
`358`		`- previews = append(previews, permissionPreview(role, orgID, resource))`
	`358`	`+ previews = append(previews, permissionPreview(role, resource))`
`359`	`359`	`}`
`360`	`360`	`return previews`
`361`	`361`	`}`
`362`	`362`
`363`		`-func permissionPreview(role *codersdk.Role, orgID uuid.UUID, resource codersdk.RBACResource) string {`
	`363`	`+func permissionPreview(role *codersdk.Role, resource codersdk.RBACResource) string {`
`364`	`364`	`if role.OrganizationPermissions == nil {`
`365`	`365`	`role.OrganizationPermissions = []codersdk.Permission{}`
`366`	`366`	`}`