coder · deansheather · Oct 5, 2022 · Sep 29, 2022 · Sep 29, 2022 · Oct 4, 2022
diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -2069,7 +2069,7 @@ func (q *fakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
 		Icon:                 arg.Icon,
 		Command:              arg.Command,
 		Url:                  arg.Url,
-		RelativePath:         arg.RelativePath,
+		Subdomain:            arg.Subdomain,
 		HealthcheckUrl:       arg.HealthcheckUrl,
 		HealthcheckInterval:  arg.HealthcheckInterval,
 		HealthcheckThreshold: arg.HealthcheckThreshold,

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000055_relative_path_to_subdomain.down.sql b/coderd/database/migrations/000055_relative_path_to_subdomain.down.sql
@@ -0,0 +1,8 @@
+-- Add column relative_path of type bool to workspace_apps
+ALTER TABLE "workspace_apps" ADD COLUMN "relative_path" bool NOT NULL DEFAULT false;
+
+-- Set column relative_path to the opposite of subdomain
+UPDATE "workspace_apps" SET "relative_path" = NOT "subdomain";
+
+-- Drop column subdomain
+ALTER TABLE "workspace_apps" DROP COLUMN "subdomain";
diff --git a/coderd/database/migrations/000055_relative_path_to_subdomain.up.sql b/coderd/database/migrations/000055_relative_path_to_subdomain.up.sql
@@ -0,0 +1,8 @@
+-- Add column subdomain of type bool to workspace_apps
+ALTER TABLE "workspace_apps" ADD COLUMN "subdomain" bool NOT NULL DEFAULT false;
+
+-- Set column subdomain to the opposite of relative_path
+UPDATE "workspace_apps" SET "subdomain" = NOT "relative_path";
+
+-- Drop column relative_path
+ALTER TABLE "workspace_apps" DROP COLUMN "relative_path";
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/workspaceapps.sql b/coderd/database/queries/workspaceapps.sql
@@ -20,7 +20,7 @@ INSERT INTO
         icon,
         command,
         url,
-        relative_path,
+        subdomain,
         healthcheck_url,
         healthcheck_interval,
         healthcheck_threshold,

diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -828,7 +828,7 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 					String: app.Url,
 					Valid:  app.Url != "",
 				},
-				RelativePath:         app.RelativePath,
+				Subdomain:            app.Subdomain,
 				HealthcheckUrl:       app.Healthcheck.Url,
 				HealthcheckInterval:  app.Healthcheck.Interval,
 				HealthcheckThreshold: app.Healthcheck.Threshold,

diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go
@@ -528,11 +528,11 @@ func ConvertWorkspaceAgent(agent database.WorkspaceAgent) WorkspaceAgent {
 // ConvertWorkspaceApp anonymizes a workspace app.
 func ConvertWorkspaceApp(app database.WorkspaceApp) WorkspaceApp {
 	return WorkspaceApp{
-		ID:           app.ID,
-		CreatedAt:    app.CreatedAt,
-		AgentID:      app.AgentID,
-		Icon:         app.Icon,
-		RelativePath: app.RelativePath,
+		ID:        app.ID,
+		CreatedAt: app.CreatedAt,
+		AgentID:   app.AgentID,
+		Icon:      app.Icon,
+		Subdomain: app.Subdomain,
 	}
 }
 
@@ -692,11 +692,11 @@ type WorkspaceAgent struct {
 }
 
 type WorkspaceApp struct {
-	ID           uuid.UUID `json:"id"`
-	CreatedAt    time.Time `json:"created_at"`
-	AgentID      uuid.UUID `json:"agent_id"`
-	Icon         string    `json:"icon"`
-	RelativePath bool      `json:"relative_path"`
+	ID        uuid.UUID `json:"id"`
+	CreatedAt time.Time `json:"created_at"`
+	AgentID   uuid.UUID `json:"agent_id"`
+	Icon      string    `json:"icon"`
+	Subdomain bool      `json:"subdomain"`
 }
 
 type WorkspaceBuild struct {

diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -494,10 +494,11 @@ func convertApps(dbApps []database.WorkspaceApp) []codersdk.WorkspaceApp {
 	apps := make([]codersdk.WorkspaceApp, 0)
 	for _, dbApp := range dbApps {
 		apps = append(apps, codersdk.WorkspaceApp{
-			ID:      dbApp.ID,
-			Name:    dbApp.Name,
-			Command: dbApp.Command.String,
-			Icon:    dbApp.Icon,
+			ID:        dbApp.ID,
+			Name:      dbApp.Name,
+			Command:   dbApp.Command.String,
+			Icon:      dbApp.Icon,
+			Subdomain: dbApp.Subdomain,
 			Healthcheck: codersdk.Healthcheck{
 				URL:       dbApp.HealthcheckUrl,
 				Interval:  dbApp.HealthcheckInterval,

diff --git a/codersdk/workspaceapps.go b/codersdk/workspaceapps.go
@@ -21,6 +21,11 @@ type WorkspaceApp struct {
 	// Icon is a relative path or external URL that specifies
 	// an icon to be displayed in the dashboard.
 	Icon string `json:"icon,omitempty"`
+	// Subdomain denotes whether the app should be accessed via a path on the
+	// `coder server` or via a hostname-based dev URL. If this is set to true
+	// and there is no app wildcard configured on the server, the app will not
+	// be accessible in the UI.
+	Subdomain bool `json:"subdomain"`
 	// Healthcheck specifies the configuration for checking app health.
 	Healthcheck Healthcheck        `json:"healthcheck"`
 	Health      WorkspaceAppHealth `json:"health"`

diff --git a/dogfood/main.tf b/dogfood/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.15"
+      version = "0.5.0"
     }
     docker = {
       source  = "kreuzwerker/docker"

diff --git a/examples/templates/aws-ecs-container/main.tf b/examples/templates/aws-ecs-container/main.tf
@@ -6,7 +6,7 @@ terraform {
     }
     coder = {
       source  = "coder/coder"
-      version = "0.4.15"
+      version = "0.5.0"
     }
   }
 }
@@ -105,11 +105,11 @@ resource "coder_agent" "coder" {
 }
 
 resource "coder_app" "code-server" {
-  agent_id      = coder_agent.coder.id
-  name          = "code-server"
-  icon          = "/icon/code.svg"
-  url           = "http://localhost:13337?folder=/home/coder"
-  relative_path = true
+  agent_id  = coder_agent.coder.id
+  name      = "code-server"
+  icon      = "/icon/code.svg"
+  url       = "http://localhost:13337?folder=/home/coder"
+  subdomain = false
 
   healthcheck {
     url       = "http://localhost:1337/healthz"

diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.15"
+      version = "0.5.0"
     }
   }
 }

diff --git a/examples/templates/aws-windows/main.tf b/examples/templates/aws-windows/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.15"
+      version = "0.5.0"
     }
   }
 }

diff --git a/examples/templates/azure-linux/main.tf b/examples/templates/azure-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.15"
+      version = "0.5.0"
     }
     azurerm = {
       source  = "hashicorp/azurerm"

diff --git a/examples/templates/do-linux/main.tf b/examples/templates/do-linux/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.15"
+      version = "0.5.0"
     }
     digitalocean = {
       source  = "digitalocean/digitalocean"

diff --git a/examples/templates/docker-code-server/main.tf b/examples/templates/docker-code-server/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.15"
+      version = "0.5.0"
     }
     docker = {
       source  = "kreuzwerker/docker"

diff --git a/examples/templates/docker-image-builds/main.tf b/examples/templates/docker-image-builds/main.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.15"
+      version = "0.5.0"
     }
     docker = {
       source  = "kreuzwerker/docker"

diff --git a/examples/templates/docker-with-dotfiles/main.tf b/examples/templates/docker-with-dotfiles/main.tf
@@ -9,7 +9,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.15"
+      version = "0.5.0"
     }
     docker = {
       source  = "kreuzwerker/docker"

diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     coder = {
       source  = "coder/coder"
-      version = "0.4.15"
+      version = "0.5.0"
     }
     docker = {
       source  = "kreuzwerker/docker"