coder · deansheather · Oct 28, 2022 · Oct 16, 2022 · Oct 16, 2022 · Oct 17, 2022
diff --git a/agent/apphealth.go b/agent/apphealth.go
@@ -33,7 +33,7 @@ func NewWorkspaceAppHealthReporter(logger slog.Logger, apps []codersdk.Workspace
 		hasHealthchecksEnabled := false
 		health := make(map[string]codersdk.WorkspaceAppHealth, 0)
 		for _, app := range apps {
-			health[app.Name] = app.Health
+			health[app.DisplayName] = app.Health
 			if !hasHealthchecksEnabled && app.Health != codersdk.WorkspaceAppHealthDisabled {
 				hasHealthchecksEnabled = true
 			}
@@ -85,21 +85,21 @@ func NewWorkspaceAppHealthReporter(logger slog.Logger, apps []codersdk.Workspace
 					}()
 					if err != nil {
 						mu.Lock()
-						if failures[app.Name] < int(app.Healthcheck.Threshold) {
+						if failures[app.DisplayName] < int(app.Healthcheck.Threshold) {
 							// increment the failure count and keep status the same.
 							// we will change it when we hit the threshold.
-							failures[app.Name]++
+							failures[app.DisplayName]++
 						} else {
 							// set to unhealthy if we hit the failure threshold.
 							// we stop incrementing at the threshold to prevent the failure value from increasing forever.
-							health[app.Name] = codersdk.WorkspaceAppHealthUnhealthy
+							health[app.DisplayName] = codersdk.WorkspaceAppHealthUnhealthy
 						}
 						mu.Unlock()
 					} else {
 						mu.Lock()
 						// we only need one successful health check to be considered healthy.
-						health[app.Name] = codersdk.WorkspaceAppHealthHealthy
-						failures[app.Name] = 0
+						health[app.DisplayName] = codersdk.WorkspaceAppHealthHealthy
+						failures[app.DisplayName] = 0
 						mu.Unlock()
 					}
 

diff --git a/agent/apphealth_test.go b/agent/apphealth_test.go
@@ -27,12 +27,12 @@ func TestAppHealth(t *testing.T) {
 		defer cancel()
 		apps := []codersdk.WorkspaceApp{
 			{
-				Name:        "app1",
+				DisplayName: "app1",
 				Healthcheck: codersdk.Healthcheck{},
 				Health:      codersdk.WorkspaceAppHealthDisabled,
 			},
 			{
-				Name: "app2",
+				DisplayName: "app2",
 				Healthcheck: codersdk.Healthcheck{
 					// URL: We don't set the URL for this test because the setup will
 					// create a httptest server for us and set it for us.
@@ -69,7 +69,7 @@ func TestAppHealth(t *testing.T) {
 		defer cancel()
 		apps := []codersdk.WorkspaceApp{
 			{
-				Name: "app2",
+				DisplayName: "app2",
 				Healthcheck: codersdk.Healthcheck{
 					// URL: We don't set the URL for this test because the setup will
 					// create a httptest server for us and set it for us.
@@ -102,7 +102,7 @@ func TestAppHealth(t *testing.T) {
 		defer cancel()
 		apps := []codersdk.WorkspaceApp{
 			{
-				Name: "app2",
+				DisplayName: "app2",
 				Healthcheck: codersdk.Healthcheck{
 					// URL: We don't set the URL for this test because the setup will
 					// create a httptest server for us and set it for us.
@@ -137,7 +137,7 @@ func TestAppHealth(t *testing.T) {
 		defer cancel()
 		apps := []codersdk.WorkspaceApp{
 			{
-				Name: "app2",
+				DisplayName: "app2",
 				Healthcheck: codersdk.Healthcheck{
 					// URL: We don't set the URL for this test because the setup will
 					// create a httptest server for us and set it for us.
@@ -187,7 +187,7 @@ func setupAppReporter(ctx context.Context, t *testing.T, apps []codersdk.Workspa
 		mu.Lock()
 		for name, health := range req.Healths {
 			for i, app := range apps {
-				if app.Name != name {
+				if app.DisplayName != name {
 					continue
 				}
 				app.Health = health

diff --git a/cli/schedule_test.go b/cli/schedule_test.go
@@ -51,7 +51,11 @@ func TestScheduleShow(t *testing.T) {
 		lines := strings.Split(strings.TrimSpace(stdoutBuf.String()), "\n")
 		if assert.Len(t, lines, 4) {
 			assert.Contains(t, lines[0], "Starts at    7:30AM Mon-Fri (Europe/Dublin)")
-			assert.Contains(t, lines[1], "Starts next  7:30AM IST on ")
+			assert.Contains(t, lines[1], "Starts next  7:30AM")
+			// it should have either IST or GMT
+			if !strings.Contains(lines[1], "IST") && !strings.Contains(lines[1], "GMT") {
+				t.Error("expected either IST or GMT")
+			}
 			assert.Contains(t, lines[2], "Stops at     8h after start")
 			assert.NotContains(t, lines[3], "Stops next   -")
 		}
@@ -137,7 +141,11 @@ func TestScheduleStart(t *testing.T) {
 	lines := strings.Split(strings.TrimSpace(stdoutBuf.String()), "\n")
 	if assert.Len(t, lines, 4) {
 		assert.Contains(t, lines[0], "Starts at    9:30AM Mon-Fri (Europe/Dublin)")
-		assert.Contains(t, lines[1], "Starts next  9:30AM IST on")
+		assert.Contains(t, lines[1], "Starts next  9:30AM")
+		// it should have either IST or GMT
+		if !strings.Contains(lines[1], "IST") && !strings.Contains(lines[1], "GMT") {
+			t.Error("expected either IST or GMT")
+		}
 	}
 
 	// Ensure autostart schedule updated

diff --git a/coderd/coderdtest/authorize.go b/coderd/coderdtest/authorize.go
@@ -331,8 +331,9 @@ func NewAuthTester(ctx context.Context, t *testing.T, client *codersdk.Client, a
 							Id:   "something",
 							Auth: &proto.Agent_Token{},
 							Apps: []*proto.App{{
-								Name: "testapp",
-								Url:  "http://localhost:3000",
+								Slug:        "testapp",
+								DisplayName: "testapp",
+								Url:         "http://localhost:3000",
 							}},
 						}},
 					}},
@@ -372,7 +373,7 @@ func NewAuthTester(ctx context.Context, t *testing.T, client *codersdk.Client, a
 		"{template}":            template.ID.String(),
 		"{fileID}":              file.ID.String(),
 		"{workspaceresource}":   workspace.LatestBuild.Resources[0].ID.String(),
-		"{workspaceapp}":        workspace.LatestBuild.Resources[0].Agents[0].Apps[0].Name,
+		"{workspaceapp}":        workspace.LatestBuild.Resources[0].Agents[0].Apps[0].Slug,
 		"{templateversion}":     version.ID.String(),
 		"{jobID}":               templateVersionDryRun.ID.String(),
 		"{templatename}":        template.Name,

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -1861,15 +1861,15 @@ func (q *fakeQuerier) GetWorkspaceAgentsCreatedAfter(_ context.Context, after ti
 	return workspaceAgents, nil
 }
 
-func (q *fakeQuerier) GetWorkspaceAppByAgentIDAndName(_ context.Context, arg database.GetWorkspaceAppByAgentIDAndNameParams) (database.WorkspaceApp, error) {
+func (q *fakeQuerier) GetWorkspaceAppByAgentIDAndSlug(_ context.Context, arg database.GetWorkspaceAppByAgentIDAndSlugParams) (database.WorkspaceApp, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
 
 	for _, app := range q.workspaceApps {
 		if app.AgentID != arg.AgentID {
 			continue
 		}
-		if app.Name != arg.Name {
+		if app.Slug != arg.Slug {
 			continue
 		}
 		return app, nil
@@ -2522,7 +2522,8 @@ func (q *fakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
 		ID:                   arg.ID,
 		AgentID:              arg.AgentID,
 		CreatedAt:            arg.CreatedAt,
-		Name:                 arg.Name,
+		Slug:                 arg.Slug,
+		DisplayName:          arg.DisplayName,
 		Icon:                 arg.Icon,
 		Command:              arg.Command,
 		Url:                  arg.Url,

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000066_app_slug.down.sql b/coderd/database/migrations/000066_app_slug.down.sql
@@ -0,0 +1,5 @@
+-- drop unique index on "slug" column
+ALTER TABLE "workspace_apps" DROP CONSTRAINT IF EXISTS "workspace_apps_agent_id_slug_idx";
+
+-- drop "slug" column from "workspace_apps" table
+ALTER TABLE "workspace_apps" DROP COLUMN "slug";
diff --git a/coderd/database/migrations/000066_app_slug.up.sql b/coderd/database/migrations/000066_app_slug.up.sql
@@ -0,0 +1,16 @@
+BEGIN;
+
+-- add "slug" column to "workspace_apps" table
+ALTER TABLE "workspace_apps" ADD COLUMN "slug" text DEFAULT '';
+
+-- copy the "name" column for each workspace app to the "slug" column
+UPDATE "workspace_apps" SET "slug" = "name";
+
+-- make "slug" column not nullable and remove default
+ALTER TABLE "workspace_apps" ALTER COLUMN "slug" SET NOT NULL;
+ALTER TABLE "workspace_apps" ALTER COLUMN "slug" DROP DEFAULT;
+
+-- add unique index on "slug" column
+ALTER TABLE "workspace_apps" ADD CONSTRAINT "workspace_apps_agent_id_slug_idx" UNIQUE ("agent_id", "slug");
+
+COMMIT;
diff --git a/coderd/database/migrations/000067_app_display_name.down.sql b/coderd/database/migrations/000067_app_display_name.down.sql
@@ -0,0 +1,34 @@
+BEGIN;
+
+-- Select all apps with an extra "row_number" column that determines the "rank"
+-- of the display name against other display names in the same agent.
+WITH row_numbers AS (
+    SELECT
+        *,
+        row_number() OVER (PARTITION BY agent_id, display_name ORDER BY display_name ASC) AS row_number
+    FROM
+        workspace_apps
+)
+
+-- Update any app with a "row_number" greater than 1 to have the row number
+-- appended to the display name. This effectively means that all lowercase
+-- display names remain untouched, while non-unique mixed case usernames are
+-- appended with a unique number. If you had three apps called all called asdf,
+-- they would then be renamed to e.g. asdf, asdf1234, and asdf5678.
+UPDATE
+    workspace_apps
+SET
+    display_name = workspace_apps.display_name || floor(random() * 10000)::text
+FROM
+    row_numbers
+WHERE
+    workspace_apps.id = row_numbers.id AND
+    row_numbers.row_number > 1;
+
+-- rename column "display_name" to "name" on "workspace_apps"
+ALTER TABLE "workspace_apps" RENAME COLUMN "display_name" TO "name";
+
+-- restore unique index on "workspace_apps" table
+ALTER TABLE workspace_apps ADD CONSTRAINT workspace_apps_agent_id_name_key UNIQUE ("agent_id", "name");
+
+COMMIT;
diff --git a/coderd/database/migrations/000067_app_display_name.up.sql b/coderd/database/migrations/000067_app_display_name.up.sql
@@ -0,0 +1,9 @@
+BEGIN;
+
+-- rename column "name" to "display_name" on "workspace_apps"
+ALTER TABLE "workspace_apps" RENAME COLUMN "name" TO "display_name";
+
+-- drop constraint "workspace_apps_agent_id_name_key" on "workspace_apps".
+ALTER TABLE ONLY workspace_apps DROP CONSTRAINT IF EXISTS workspace_apps_agent_id_name_key;
+
+COMMIT;
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go