wildcard hostname vs url

coder · Emyrk · Apr 4, 2023 · Mar 30, 2023 · Mar 31, 2023 · Mar 31, 2023
commit cce8a7da2a0b1851aee5d52c3e6cb691f2fb5dc8
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
@@ -4988,15 +4988,15 @@ func (q *fakeQuerier) InsertWorkspaceProxy(_ context.Context, arg database.Inser
 	}
 
 	p := database.WorkspaceProxy{
-		ID:             arg.ID,
-		OrganizationID: arg.OrganizationID,
-		Name:           arg.Name,
-		Icon:           arg.Icon,
-		Url:            arg.Url,
-		WildcardUrl:    arg.WildcardUrl,
-		CreatedAt:      arg.CreatedAt,
-		UpdatedAt:      arg.UpdatedAt,
-		Deleted:        false,
+		ID:               arg.ID,
+		OrganizationID:   arg.OrganizationID,
+		Name:             arg.Name,
+		Icon:             arg.Icon,
+		Url:              arg.Url,
+		WildcardHostname: arg.WildcardHostname,
+		CreatedAt:        arg.CreatedAt,
+		UpdatedAt:        arg.UpdatedAt,
+		Deleted:          false,
 	}
 	q.workspaceProxies = append(q.workspaceProxies, p)
 	return p, nil
@@ -5011,7 +5011,7 @@ func (q *fakeQuerier) UpdateWorkspaceProxy(_ context.Context, arg database.Updat
 			p.Name = arg.Name
 			p.Icon = arg.Icon
 			p.Url = arg.Url
-			p.WildcardUrl = arg.WildcardUrl
+			p.WildcardHostname = arg.WildcardHostname
 			p.UpdatedAt = database.Now()
 			q.workspaceProxies[i] = p
 			return p, nil

diff --git a/coderd/database/dbgen/generator.go b/coderd/database/dbgen/generator.go
@@ -328,15 +328,15 @@ func WorkspaceResourceMetadatums(t testing.TB, db database.Store, seed database.
 
 func WorkspaceProxy(t testing.TB, db database.Store, orig database.WorkspaceProxy) database.WorkspaceProxy {
 	resource, err := db.InsertWorkspaceProxy(context.Background(), database.InsertWorkspaceProxyParams{
-		ID:             takeFirst(orig.ID, uuid.New()),
-		OrganizationID: takeFirst(orig.OrganizationID, uuid.New()),
-		Name:           takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
-		DisplayName:    takeFirst(orig.DisplayName, namesgenerator.GetRandomName(1)),
-		Icon:           takeFirst(orig.Icon, namesgenerator.GetRandomName(1)),
-		Url:            takeFirst(orig.Url, fmt.Sprintf("https://%s.com", namesgenerator.GetRandomName(1))),
-		WildcardUrl:    takeFirst(orig.WildcardUrl, fmt.Sprintf("https://*.%s.com", namesgenerator.GetRandomName(1))),
-		CreatedAt:      takeFirst(orig.CreatedAt, database.Now()),
-		UpdatedAt:      takeFirst(orig.UpdatedAt, database.Now()),
+		ID:               takeFirst(orig.ID, uuid.New()),
+		OrganizationID:   takeFirst(orig.OrganizationID, uuid.New()),
+		Name:             takeFirst(orig.Name, namesgenerator.GetRandomName(1)),
+		DisplayName:      takeFirst(orig.DisplayName, namesgenerator.GetRandomName(1)),
+		Icon:             takeFirst(orig.Icon, namesgenerator.GetRandomName(1)),
+		Url:              takeFirst(orig.Url, fmt.Sprintf("https://%s.com", namesgenerator.GetRandomName(1))),
+		WildcardHostname: takeFirst(orig.WildcardHostname, fmt.Sprintf(".%s.com", namesgenerator.GetRandomName(1))),
+		CreatedAt:        takeFirst(orig.CreatedAt, database.Now()),
+		UpdatedAt:        takeFirst(orig.UpdatedAt, database.Now()),
 	})
 	require.NoError(t, err, "insert app")
 	return resource

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000113_workspace_proxy.up.sql b/coderd/database/migrations/000113_workspace_proxy.up.sql
@@ -6,7 +6,7 @@ CREATE TABLE workspace_proxies (
     display_name text NOT NULL,
     icon text NOT NULL,
     url text NOT NULL,
-    wildcard_url text NOT NULL,
+	wildcard_hostname text NOT NULL,
 	created_at timestamp with time zone NOT NULL,
 	updated_at timestamp with time zone NOT NULL,
 	deleted boolean NOT NULL,
@@ -15,7 +15,7 @@ CREATE TABLE workspace_proxies (
 );
 
 COMMENT ON COLUMN workspace_proxies.url IS 'Full url including scheme of the proxy api url: https://us.example.com';
-COMMENT ON COLUMN workspace_proxies.wildcard_url IS 'URL with the wildcard for subdomain based app hosting: https://*.us.example.com';
+COMMENT ON COLUMN workspace_proxies.wildcard_hostname IS 'Hostname with the wildcard for subdomain based app hosting: *.us.example.com';
 
 
 -- Enforces no active proxies have the same name.

diff --git a/coderd/database/migrations/testdata/fixtures/000113_workspace_proxy.up.sql b/coderd/database/migrations/testdata/fixtures/000113_workspace_proxy.up.sql
@@ -1,5 +1,5 @@
 INSERT INTO workspace_proxies
-	(id, organization_id, name, display_name, icon, url, wildcard_url, created_at, updated_at, deleted)
+	(id, organization_id, name, display_name, icon, url, wildcard_hostname, created_at, updated_at, deleted)
 VALUES
 	(
 		 'cf8ede8c-ff47-441f-a738-d92e4e34a657',
@@ -8,7 +8,7 @@ VALUES
 	 	 'United States',
 		 '/emojis/us.png',
 		 'https://us.coder.com',
-		 'https://*.us.coder.com',
+		 '*.us.coder.com',
 		'2023-03-30 12:00:00.000+02',
 		'2023-03-30 12:00:00.000+02',
 		 false

diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go