🧹

coder · aslilac · May 21, 2024 · May 15, 2024 · May 15, 2024 · May 15, 2024
commit 6686bb365f85a18b3408ea6fb2ff215e177ff739
diff --git a/coderd/organizations.go b/coderd/organizations.go
@@ -137,8 +137,9 @@ func (api *API) patchOrganization(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Can't rename to the default org name, unless you are the default org
-	if req.Name != organization.Name && req.Name == codersdk.DefaultOrganization && !organization.IsDefault {
+	// "default" is a reserved name that always refers to the default org (much like the way we
+	// use "me" for users).
+	if req.Name == codersdk.DefaultOrganization {
 		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 			Message: fmt.Sprintf("Organization name %q is reserved.", codersdk.DefaultOrganization),
 		})

diff --git a/enterprise/coderd/roles_test.go b/enterprise/coderd/roles_test.go
@@ -64,7 +64,7 @@ func TestCustomRole(t *testing.T) {
 
 		// Verify the role exists in the list
 		// TODO: Turn this assertion back on when the cli api experience is created.
-		//allRoles, err := tmplAdmin.ListSiteRoles(ctx)
+		// allRoles, err := tmplAdmin.ListSiteRoles(ctx)
 		//require.NoError(t, err)
 		//
 		//require.True(t, slices.ContainsFunc(allRoles, func(selected codersdk.AssignableRoles) bool {