progress

coder · deansheather · Jul 26, 2023 · Apr 27, 2023 · May 1, 2023 · May 2, 2023
commit ac995253b0139c5845b4aa7daf9b64b38e1fbe0b
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/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go
@@ -5206,6 +5206,7 @@ func (q *fakeQuerier) InsertWorkspaceProxy(_ context.Context, arg database.Inser
 		Name:              arg.Name,
 		DisplayName:       arg.DisplayName,
 		Icon:              arg.Icon,
+		DerpEnabled:       arg.DerpEnabled,
 		TokenHashedSecret: arg.TokenHashedSecret,
 		CreatedAt:         arg.CreatedAt,
 		UpdatedAt:         arg.UpdatedAt,
@@ -5223,6 +5224,7 @@ func (q *fakeQuerier) RegisterWorkspaceProxy(_ context.Context, arg database.Reg
 		if p.ID == arg.ID {
 			p.Url = arg.Url
 			p.WildcardHostname = arg.WildcardHostname
+			p.DerpEnabled = arg.DerpEnabled
 			p.UpdatedAt = database.Now()
 			q.workspaceProxies[i] = p
 			return p, nil

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000121_workspace_proxy_region_id.down.sql b/coderd/database/migrations/000121_workspace_proxy_region_id.down.sql
@@ -0,0 +1,4 @@
+ALTER TABLE workspace_proxies
+	DROP CONSTRAINT workspace_proxies_region_id_unique,
+	DROP COLUMN region_id,
+	DROP COLUMN derp_enabled;
diff --git a/coderd/database/migrations/000121_workspace_proxy_region_id.up.sql b/coderd/database/migrations/000121_workspace_proxy_region_id.up.sql
@@ -0,0 +1,6 @@
+ALTER TABLE workspace_proxies
+	-- adding a serial to a table without a default value will be filled as you
+	-- would expect
+	ADD COLUMN region_id serial NOT NULL,
+	ADD COLUMN derp_enabled boolean NOT NULL DEFAULT true,
+	ADD CONSTRAINT workspace_proxies_region_id_unique UNIQUE (region_id);
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/proxies.sql b/coderd/database/queries/proxies.sql
@@ -7,20 +7,22 @@ INSERT INTO
 		name,
 		display_name,
 		icon,
+		derp_enabled,
 		token_hashed_secret,
 		created_at,
 		updated_at,
 		deleted
 	)
 VALUES
-	($1, '', '', $2, $3, $4, $5, $6, $7, false) RETURNING *;
+	($1, '', '', $2, $3, $4, $5, $6, $7, $8, false) RETURNING *;
 
 -- name: RegisterWorkspaceProxy :one
 UPDATE
 	workspace_proxies
 SET
-	url = @url,
-	wildcard_hostname = @wildcard_hostname,
+	url = @url :: text,
+	wildcard_hostname = @wildcard_hostname :: text,
+	derp_enabled = @derp_enabled :: boolean,
 	updated_at = Now()
 WHERE
 	id = @id

diff --git a/coderd/database/unique_constraint.go b/coderd/database/unique_constraint.go
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -657,6 +657,7 @@ when required by your organization's security policy.`,
 			Value:       &c.DERP.Server.Enable,
 			Group:       &deploymentGroupNetworkingDERP,
 			YAML:        "enable",
+			Annotations: clibase.Annotations{}.Mark(annotationExternalProxies, "true"),
 		},
 		{
 			Name:        "DERP Server Region ID",
@@ -667,6 +668,7 @@ when required by your organization's security policy.`,
 			Value:       &c.DERP.Server.RegionID,
 			Group:       &deploymentGroupNetworkingDERP,
 			YAML:        "regionID",
+			// Does not apply to external proxies as this value is generated.
 		},
 		{
 			Name:        "DERP Server Region Code",
@@ -677,6 +679,7 @@ when required by your organization's security policy.`,
 			Value:       &c.DERP.Server.RegionCode,
 			Group:       &deploymentGroupNetworkingDERP,
 			YAML:        "regionCode",
+			// Does not apply to external proxies as we use the proxy name.
 		},
 		{
 			Name:        "DERP Server Region Name",
@@ -687,6 +690,7 @@ when required by your organization's security policy.`,
 			Value:       &c.DERP.Server.RegionName,
 			Group:       &deploymentGroupNetworkingDERP,
 			YAML:        "regionName",
+			// Does not apply to external proxies as we use the proxy name.
 		},
 		{
 			Name:        "DERP Server STUN Addresses",
@@ -703,10 +707,12 @@ when required by your organization's security policy.`,
 			Description: "An HTTP URL that is accessible by other replicas to relay DERP traffic. Required for high availability.",
 			Flag:        "derp-server-relay-url",
 			Env:         "CODER_DERP_SERVER_RELAY_URL",
-			Annotations: clibase.Annotations{}.Mark(annotationEnterpriseKey, "true"),
 			Value:       &c.DERP.Server.RelayURL,
 			Group:       &deploymentGroupNetworkingDERP,
 			YAML:        "relayURL",
+			Annotations: clibase.Annotations{}.
+				Mark(annotationEnterpriseKey, "true").
+				Mark(annotationExternalProxies, "true"),
 		},
 		{
 			Name:        "DERP Config URL",

diff --git a/codersdk/workspaceproxy.go b/codersdk/workspaceproxy.go
@@ -46,13 +46,15 @@ type ProxyHealthReport struct {
 }
 
 type WorkspaceProxy struct {
-	ID   uuid.UUID `json:"id" format:"uuid" table:"id"`
-	Name string    `json:"name" table:"name,default_sort"`
-	Icon string    `json:"icon" table:"icon"`
+	ID          uuid.UUID `json:"id" format:"uuid" table:"id"`
+	Name        string    `json:"name" table:"name,default_sort"`
+	DisplayName string    `json:"display_name" table:"display_name"`
+	Icon        string    `json:"icon" table:"icon"`
 	// Full url including scheme of the proxy api url: https://us.example.com
 	URL string `json:"url" table:"url"`
 	// WildcardHostname with the wildcard for subdomain based app hosting: *.us.example.com
 	WildcardHostname string    `json:"wildcard_hostname" table:"wildcard_hostname"`
+	DerpEnabled      bool      `json:"derp_enabled" table:"derp_enabled"`
 	CreatedAt        time.Time `json:"created_at" format:"date-time" table:"created_at"`
 	UpdatedAt        time.Time `json:"updated_at" format:"date-time" table:"updated_at"`
 	Deleted          bool      `json:"deleted" table:"deleted"`