coder · aslilac · Jun 12, 2024 · Jun 11, 2024 · Jun 11, 2024 · Jun 12, 2024
diff --git a/clock/mock.go b/clock/mock.go
@@ -2,12 +2,13 @@ package clock
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"slices"
 	"sync"
 	"testing"
 	"time"
+
+	"golang.org/x/xerrors"
 )
 
 // Mock is the testing implementation of Clock.  It tracks a time that monotonically increases
@@ -571,7 +572,7 @@ func (t *Trap) Close() {
 	close(t.done)
 }
 
-var ErrTrapClosed = errors.New("trap closed")
+var ErrTrapClosed = xerrors.New("trap closed")
 
 func (t *Trap) Wait(ctx context.Context) (*Call, error) {
 	select {

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/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
@@ -338,6 +338,7 @@ func Organization(t testing.TB, db database.Store, orig database.Organization) d
 		Name:        takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
 		DisplayName: takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
 		Description: takeFirst(orig.Description, namesgenerator.GetRandomName(1)),
+		Icon:        takeFirst(orig.Icon, ""),
 		CreatedAt:   takeFirst(orig.CreatedAt, dbtime.Now()),
 		UpdatedAt:   takeFirst(orig.UpdatedAt, dbtime.Now()),
 	})

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -88,6 +88,7 @@ func New() database.Store {
 		Name:        "first-organization",
 		DisplayName: "first-organization",
 		Description: "Builtin default organization.",
+		Icon:        "",
 		CreatedAt:   dbtime.Now(),
 		UpdatedAt:   dbtime.Now(),
 	})
@@ -6189,6 +6190,7 @@ func (q *FakeQuerier) InsertOrganization(_ context.Context, arg database.InsertO
 		Name:        arg.Name,
 		DisplayName: arg.DisplayName,
 		Description: arg.Description,
+		Icon:        arg.Icon,
 		CreatedAt:   arg.CreatedAt,
 		UpdatedAt:   arg.UpdatedAt,
 		IsDefault:   len(q.organizations) == 0,
@@ -7334,6 +7336,7 @@ func (q *FakeQuerier) UpdateOrganization(_ context.Context, arg database.UpdateO
 			org.Name = arg.Name
 			org.DisplayName = arg.DisplayName
 			org.Description = arg.Description
+			org.Icon = arg.Icon
 			q.organizations[i] = org
 			return org, nil
 		}

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000219_organization_icon.down.sql b/coderd/database/migrations/000219_organization_icon.down.sql
@@ -0,0 +1,2 @@
+alter table organizations
+	drop column icon;
diff --git a/coderd/database/migrations/000219_organization_icon.up.sql b/coderd/database/migrations/000219_organization_icon.up.sql
@@ -0,0 +1,2 @@
+alter table organizations
+	add column icon text not null default '';
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/organizations.sql b/coderd/database/queries/organizations.sql
@@ -49,10 +49,10 @@ WHERE
 
 -- name: InsertOrganization :one
 INSERT INTO
-	organizations (id, "name", display_name, description, created_at, updated_at, is_default)
+	organizations (id, "name", display_name, description, icon, created_at, updated_at, is_default)
 VALUES
 	-- If no organizations exist, and this is the first, make it the default.
-	(@id, @name, @display_name, @description, @created_at, @updated_at, (SELECT TRUE FROM organizations LIMIT 1) IS NULL) RETURNING *;
+	(@id, @name, @display_name, @description, @icon, @created_at, @updated_at, (SELECT TRUE FROM organizations LIMIT 1) IS NULL) RETURNING *;
 
 -- name: UpdateOrganization :one
 UPDATE
@@ -61,7 +61,8 @@ SET
 	updated_at = @updated_at,
 	name = @name,
 	display_name = @display_name,
-	description = @description
+	description = @description,
+	icon = @icon
 WHERE
 	id = @id
 RETURNING *;

diff --git a/coderd/organizations.go b/coderd/organizations.go
@@ -83,6 +83,7 @@ func (api *API) postOrganizations(rw http.ResponseWriter, r *http.Request) {
 			Name:        req.Name,
 			DisplayName: req.DisplayName,
 			Description: req.Description,
+			Icon:        req.Icon,
 			CreatedAt:   dbtime.Now(),
 			UpdatedAt:   dbtime.Now(),
 		})
@@ -164,6 +165,7 @@ func (api *API) patchOrganization(rw http.ResponseWriter, r *http.Request) {
 			Name:        organization.Name,
 			DisplayName: organization.DisplayName,
 			Description: organization.Description,
+			Icon:        organization.Icon,
 		}
 
 		if req.Name != "" {
@@ -172,8 +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 != nil {
+			updateOrgParams.Icon = *req.Icon
 		}
 
 		organization, err = tx.UpdateOrganization(ctx, updateOrgParams)
@@ -248,6 +253,7 @@ func convertOrganization(organization database.Organization) codersdk.Organizati
 		Name:        organization.Name,
 		DisplayName: organization.DisplayName,
 		Description: organization.Description,
+		Icon:        organization.Icon,
 		CreatedAt:   organization.CreatedAt,
 		UpdatedAt:   organization.UpdatedAt,
 		IsDefault:   organization.IsDefault,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		alter table organizations
		add column icon text not null default '';