make gen

coder · Emyrk · Aug 13, 2024 · Aug 8, 2024 · Aug 8, 2024 · Aug 8, 2024
commit e53fabdf2b58d66890179abd0742ac5d1e96f0ee
diff --git a/cli/organizationroles.go b/cli/organizationroles.go
@@ -153,7 +153,7 @@ func (r *RootCmd) editOrganizationRole(orgContext *OrganizationContext) *serpent
 				return err
 			}
 
-			createNewRole := false
+			createNewRole := true
 			var customRole codersdk.Role
 			if jsonInput {
 				// JSON Upload mode
@@ -175,6 +175,18 @@ func (r *RootCmd) editOrganizationRole(orgContext *OrganizationContext) *serpent
 					}
 					return xerrors.Errorf("json input does not appear to be a valid role")
 				}
+
+				existingRoles, err := client.ListOrganizationRoles(ctx, org.ID)
+				if err != nil {
+					return xerrors.Errorf("listing existing roles: %w", err)
+				}
+				for _, existingRole := range existingRoles {
+					if strings.EqualFold(customRole.Name, existingRole.Name) {
+						// Editing an existing role
+						createNewRole = false
+						break
+					}
+				}
 			} else {
 				if len(inv.Args) == 0 {
 					return xerrors.Errorf("missing role name argument, usage: \"coder organizations roles edit <role_name>\"")

diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/docs/reference/api/members.md b/docs/reference/api/members.md
diff --git a/enterprise/coderd/roles.go b/enterprise/coderd/roles.go
@@ -93,7 +93,7 @@ func (api *API) postOrgRoles(rw http.ResponseWriter, r *http.Request) {
 // @Param request body codersdk.CustomRoleRequest true "Upsert role request"
 // @Tags Members
 // @Success 200 {array} codersdk.Role
-// @Router /organizations/{organization}/members/roles [patch]
+// @Router /organizations/{organization}/members/roles [put]
 func (api *API) putOrgRoles(rw http.ResponseWriter, r *http.Request) {
 	var (
 		ctx               = r.Context()