feat: add external property to coder_app

This allows exposing applications that open an external URL.
coder · kylecarbs · Dec 14, 2022 · Dec 14, 2022 · Dec 14, 2022 · Dec 14, 2022
commit 6a965307822aff098648b9e1ce51f49b5d69df29
diff --git a/agent/apphealth.go b/agent/apphealth.go
@@ -34,10 +34,11 @@ func NewWorkspaceAppHealthReporter(logger slog.Logger, apps []codersdk.Workspace
 		hasHealthchecksEnabled := false
 		health := make(map[uuid.UUID]codersdk.WorkspaceAppHealth, 0)
 		for _, app := range apps {
-			health[app.ID] = app.Health
-			if !hasHealthchecksEnabled && app.Health != codersdk.WorkspaceAppHealthDisabled {
-				hasHealthchecksEnabled = true
+			if app.Health == codersdk.WorkspaceAppHealthDisabled {
+				continue
 			}
+			health[app.ID] = app.Health
+			hasHealthchecksEnabled = true
 		}
 
 		// no need to run this loop if no health checks are configured.
@@ -77,7 +78,7 @@ func NewWorkspaceAppHealthReporter(logger slog.Logger, apps []codersdk.Workspace
 							return err
 						}
 						// successful healthcheck is a non-5XX status code
-						res.Body.Close()
+						_ = res.Body.Close()
 						if res.StatusCode >= http.StatusInternalServerError {
 							return xerrors.Errorf("error status code: %d", res.StatusCode)
 						}

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -2743,6 +2743,7 @@ func (q *fakeQuerier) InsertWorkspaceApp(_ context.Context, arg database.InsertW
 		Icon:                 arg.Icon,
 		Command:              arg.Command,
 		Url:                  arg.Url,
+		External:             arg.External,
 		Subdomain:            arg.Subdomain,
 		SharingLevel:         arg.SharingLevel,
 		HealthcheckUrl:       arg.HealthcheckUrl,

diff --git a/coderd/database/migrations/000087_external_app_url.down.sql b/coderd/database/migrations/000087_external_app_url.down.sql
@@ -0,0 +1 @@
+ALTER TABLE workspace_apps DROP COLUMN external;
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
@@ -21,6 +21,7 @@ INSERT INTO
         icon,
         command,
         url,
+        external,
         subdomain,
         sharing_level,
         healthcheck_url,
@@ -29,7 +30,7 @@ INSERT INTO
         health
     )
 VALUES
-    ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14) RETURNING *;
+    ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15) RETURNING *;
 
 -- name: UpdateWorkspaceAppHealthByID :exec
 UPDATE

diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -952,6 +952,7 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
 					String: app.Url,
 					Valid:  app.Url != "",
 				},
+				External:             app.External,
 				Subdomain:            app.Subdomain,
 				SharingLevel:         sharingLevel,
 				HealthcheckUrl:       app.Healthcheck.Url,

diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -645,6 +645,7 @@ func convertApps(dbApps []database.WorkspaceApp) []codersdk.WorkspaceApp {
 		apps = append(apps, codersdk.WorkspaceApp{
 			ID:           dbApp.ID,
 			URL:          dbApp.Url.String,
+			External:     dbApp.External,
 			Slug:         dbApp.Slug,
 			DisplayName:  dbApp.DisplayName,
 			Command:      dbApp.Command.String,

diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -38,6 +38,7 @@ type agentAppAttributes struct {
 	Name        string                     `mapstructure:"name"`
 	Icon        string                     `mapstructure:"icon"`
 	URL         string                     `mapstructure:"url"`
+	External    bool                       `mapstructure:"external"`
 	Command     string                     `mapstructure:"command"`
 	Share       string                     `mapstructure:"share"`
 	Subdomain   bool                       `mapstructure:"subdomain"`
@@ -297,6 +298,7 @@ func ConvertResources(module *tfjson.StateModule, rawGraph string) ([]*proto.Res
 					Slug:         attrs.Slug,
 					DisplayName:  attrs.DisplayName,
 					Command:      attrs.Command,
+					External:     attrs.External,
 					Url:          attrs.URL,
 					Icon:         attrs.Icon,
 					Subdomain:    attrs.Subdomain,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ALTER TABLE workspace_apps DROP COLUMN external;