allow setting Description and Icon to ""

aslilac · aslilac · commit 418d3caf63b1 · 2024-06-12T17:39:46.000Z
diff --git a/coderd/organizations.go b/coderd/organizations.go
@@ -174,11 +174,11 @@ func (api *API) patchOrganization(rw http.ResponseWriter, r *http.Request) {
 		if req.DisplayName != "" {
 			updateOrgParams.DisplayName = req.DisplayName
 		}
-		if req.Description != "" {
-			updateOrgParams.Description = req.Description
+		if req.Description != nil {
+			updateOrgParams.Description = *req.Description
 		}
-		if req.Icon != "" {
-			updateOrgParams.Icon = req.Icon
+		if req.Icon != nil {
+			updateOrgParams.Icon = *req.Icon
 		}
 
 		organization, err = tx.UpdateOrganization(ctx, updateOrgParams)
diff --git a/coderd/organizations_test.go b/coderd/organizations_test.go
@@ -7,6 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/v2/coderd/coderdtest"
+	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/testutil"
 )
@@ -302,7 +303,7 @@ func TestPatchOrganizationsByUser(t *testing.T) {
 		require.NoError(t, err)
 
 		o, err = client.UpdateOrganization(ctx, o.Name, codersdk.UpdateOrganizationRequest{
-			Description: "wow, this organization description is so updated!",
+			Description: ptr.Ref("wow, this organization description is so updated!"),
 		})
 
 		require.NoError(t, err)
@@ -324,7 +325,7 @@ func TestPatchOrganizationsByUser(t *testing.T) {
 		require.NoError(t, err)
 
 		o, err = client.UpdateOrganization(ctx, o.Name, codersdk.UpdateOrganizationRequest{
-			Icon: "/emojis/1f48f-1f3ff.png",
+			Icon: ptr.Ref("/emojis/1f48f-1f3ff.png"),
 		})
 
 		require.NoError(t, err)
diff --git a/codersdk/organizations.go b/codersdk/organizations.go
@@ -67,10 +67,10 @@ type CreateOrganizationRequest struct {
 }
 
 type UpdateOrganizationRequest struct {
-	Name        string `json:"name,omitempty" validate:"omitempty,organization_name"`
-	DisplayName string `json:"display_name,omitempty" validate:"omitempty,organization_display_name"`
-	Description string `json:"description,omitempty"`
-	Icon        string `json:"icon,omitempty"`
+	Name        string  `json:"name,omitempty" validate:"omitempty,organization_name"`
+	DisplayName string  `json:"display_name,omitempty" validate:"omitempty,organization_display_name"`
+	Description *string `json:"description,omitempty"`
+	Icon        *string `json:"icon,omitempty"`
 }
 
 // CreateTemplateVersionRequest enables callers to create a new Template Version.

Original file line number	Diff line number	Diff line change
`@@ -174,11 +174,11 @@ func (api API) patchOrganization(rw http.ResponseWriter, r http.Request) {`
`174`	`174`	`if req.DisplayName != "" {`
`175`	`175`	`updateOrgParams.DisplayName = req.DisplayName`
`176`	`176`	`}`
`177`		`- if req.Description != "" {`
`178`		`- updateOrgParams.Description = req.Description`
	`177`	`+ if req.Description != nil {`
	`178`	`+ updateOrgParams.Description = *req.Description`
`179`	`179`	`}`
`180`		`- if req.Icon != "" {`
`181`		`- updateOrgParams.Icon = req.Icon`
	`180`	`+ if req.Icon != nil {`
	`181`	`+ updateOrgParams.Icon = *req.Icon`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`organization, err = tx.UpdateOrganization(ctx, updateOrgParams)`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,10 @@ type CreateOrganizationRequest struct {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`type UpdateOrganizationRequest struct {`
`70`		- Name string `json:"name,omitempty" validate:"omitempty,organization_name"`
`71`		- DisplayName string `json:"display_name,omitempty" validate:"omitempty,organization_display_name"`
`72`		- Description string `json:"description,omitempty"`
`73`		- Icon string `json:"icon,omitempty"`
	`70`	+ Name string `json:"name,omitempty" validate:"omitempty,organization_name"`
	`71`	+ DisplayName string `json:"display_name,omitempty" validate:"omitempty,organization_display_name"`
	`72`	+ Description *string `json:"description,omitempty"`
	`73`	+ Icon *string `json:"icon,omitempty"`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`// CreateTemplateVersionRequest enables callers to create a new Template Version.`