coder · Emyrk · Feb 15, 2024 · Feb 14, 2024 · Feb 14, 2024 · Feb 14, 2024
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/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -5285,6 +5285,7 @@ func (q *FakeQuerier) InsertOrganization(_ context.Context, arg database.InsertO
 		Name:      arg.Name,
 		CreatedAt: arg.CreatedAt,
 		UpdatedAt: arg.UpdatedAt,
+		IsDefault: len(q.organizations) == 0,
 	}
 	q.organizations = append(q.organizations, organization)
 	return organization, nil

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000193_default_organization.down.sql b/coderd/database/migrations/000193_default_organization.down.sql
@@ -0,0 +1,2 @@
+DROP INDEX organizations_single_default_org;
+ALTER TABLE organizations DROP COLUMN is_default;
diff --git a/coderd/database/migrations/000193_default_organization.up.sql b/coderd/database/migrations/000193_default_organization.up.sql
@@ -0,0 +1,16 @@
+-- This migration is intended to maintain the existing behavior of single org
+-- deployments, while allowing for multi-org deployments. By default, this organization
+-- will be used when no organization is specified.
+ALTER TABLE organizations ADD COLUMN is_default BOOLEAN NOT NULL DEFAULT FALSE;
+
+-- Only 1 org should ever be set to is_default.
+create unique index organizations_single_default_org on organizations (is_default)
+	where is_default = true;
+
+UPDATE
+	organizations
+SET
+	is_default = true
+WHERE
+	-- The first organization created will be the default.
+	id = (SELECT id FROM organizations ORDER BY organizations.created_at ASC LIMIT 1 );
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go
@@ -494,6 +494,34 @@ func TestUserChangeLoginType(t *testing.T) {
 	require.Equal(t, bobExpPass, bob.HashedPassword, "hashed password should not change")
 }
 
+func TestDefaultOrg(t *testing.T) {
+	t.Parallel()
+	if testing.Short() {
+		t.SkipNow()
+	}
+
+	sqlDB := testSQLDB(t)
+	err := migrations.Up(sqlDB)
+	require.NoError(t, err)
+	db := database.New(sqlDB)
+	ctx := context.Background()
+
+	// Should start with 0 orgs
+	all, err := db.GetOrganizations(ctx)
+	require.NoError(t, err)
+	require.Len(t, all, 0)
+
+	org, err := db.InsertOrganization(ctx, database.InsertOrganizationParams{
+		ID:          uuid.New(),
+		Name:        "default",
+		Description: "",
+		CreatedAt:   dbtime.Now(),
+		UpdatedAt:   dbtime.Now(),
+	})
+	require.NoError(t, err)
+	require.True(t, org.IsDefault, "first org should always be default")
+}
+
 type tvArgs struct {
 	Status database.ProvisionerJobStatus
 	// CreateWorkspace is true if we should create a workspace for the template version

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
@@ -39,6 +39,7 @@ WHERE
 
 -- name: InsertOrganization :one
 INSERT INTO
-	organizations (id, "name", description, created_at, updated_at)
+	organizations (id, "name", description, created_at, updated_at, is_default)
 VALUES
-	($1, $2, $3, $4, $5) RETURNING *;
+	-- If no organizations exist, and this is the first, make it the default.
+	($1, $2, $3, $4, $5, (SELECT TRUE FROM organizations LIMIT 1) IS NULL) RETURNING *;
diff --git a/coderd/database/unique_constraint.go b/coderd/database/unique_constraint.go
diff --git a/coderd/organizations.go b/coderd/organizations.go
@@ -118,5 +118,6 @@ func convertOrganization(organization database.Organization) codersdk.Organizati
 		Name:      organization.Name,
 		CreatedAt: organization.CreatedAt,
 		UpdatedAt: organization.UpdatedAt,
+		IsDefault: organization.IsDefault,
 	}
 }
diff --git a/coderd/organizations_test.go b/coderd/organizations_test.go
@@ -24,6 +24,14 @@ func TestOrganizationsByUser(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, orgs)
 	require.Len(t, orgs, 1)
+	require.True(t, orgs[0].IsDefault, "first org is always default")
+
+	// Make an extra org, and it should not be defaulted.
+	notDefault, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
+		Name: "another",
+	})
+	require.NoError(t, err)
+	require.False(t, notDefault.IsDefault, "only 1 default org allowed")
 }
 
 func TestOrganizationByUserAndName(t *testing.T) {

diff --git a/codersdk/organizations.go b/codersdk/organizations.go
@@ -30,6 +30,7 @@ type Organization struct {
 	Name      string    `json:"name" validate:"required"`
 	CreatedAt time.Time `json:"created_at" validate:"required" format:"date-time"`
 	UpdatedAt time.Time `json:"updated_at" validate:"required" format:"date-time"`
+	IsDefault bool      `json:"is_default" validate:"required"`
 }
 
 type OrganizationMember struct {

diff --git a/docs/api/organizations.md b/docs/api/organizations.md
diff --git a/docs/api/schemas.md b/docs/api/schemas.md
diff --git a/docs/api/users.md b/docs/api/users.md
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -16,6 +16,7 @@ export const MockOrganization: TypesGen.Organization = {
   name: "Test Organization",
   created_at: "",
   updated_at: "",
+  is_default: true,
 };
 
 export const MockTemplateDAUResponse: TypesGen.DAUsResponse = {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		DROP INDEX organizations_single_default_org;
		ALTER TABLE organizations DROP COLUMN is_default;