fixup tests

Emyrk · Emyrk · commit e8d675a46225 · 2024-01-17T11:10:17.000-06:00
diff --git a/coderd/workspaceapps/apptest/apptest.go b/coderd/workspaceapps/apptest/apptest.go
@@ -968,7 +968,9 @@ func Run(t *testing.T, appHostIsPrimary bool, factory DeploymentFactory) {
 			// Manually specifying a port should override the access url port on
 			// the app host.
 			appDetails := setupProxyTest(t, &DeploymentOptions{
-				AppHost: "*.test.coder.com:4444",
+				// Just throw both the wsproxy and primary to same url.
+				AppHost:        "*.test.coder.com:4444",
+				PrimaryAppHost: "*.test.coder.com:4444",
 			})
 
 			ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
diff --git a/coderd/workspaceapps/apptest/setup.go b/coderd/workspaceapps/apptest/setup.go
@@ -47,6 +47,7 @@ const (
 // DeploymentOptions are the options for creating a *Deployment with a
 // DeploymentFactory.
 type DeploymentOptions struct {
+	PrimaryAppHost                       string
 	AppHost                              string
 	DisablePathApps                      bool
 	DisableSubdomainApps                 bool
diff --git a/coderd/workspaceproxies.go b/coderd/workspaceproxies.go
@@ -11,6 +11,7 @@ import (
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
 	"github.com/coder/coder/v2/coderd/httpapi"
+	"github.com/coder/coder/v2/coderd/workspaceapps/appurl"
 	"github.com/coder/coder/v2/codersdk"
 )
 
@@ -43,7 +44,7 @@ func (api *API) PrimaryRegion(ctx context.Context) (codersdk.Region, error) {
 		IconURL:          proxy.IconUrl,
 		Healthy:          true,
 		PathAppURL:       api.AccessURL.String(),
-		WildcardHostname: api.AppHostname,
+		WildcardHostname: appurl.SubdomainAppHost(api.AppHostname, api.AccessURL),
 	}, nil
 }
 
diff --git a/enterprise/wsproxy/wsproxy_test.go b/enterprise/wsproxy/wsproxy_test.go
@@ -449,10 +449,13 @@ func TestWorkspaceProxyWorkspaceApps(t *testing.T) {
 			<-proxyStatsCollectorFlushDone
 		}
 
+		if opts.PrimaryAppHost == "" {
+			opts.PrimaryAppHost = "*.primary.test.coder.com"
+		}
 		client, closer, api, user := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 			Options: &coderdtest.Options{
 				DeploymentValues:         deploymentValues,
-				AppHostname:              "*.primary.test.coder.com",
+				AppHostname:              opts.PrimaryAppHost,
 				IncludeProvisionerDaemon: true,
 				RealIPConfig: &httpmw.RealIPConfig{
 					TrustedOrigins: []*net.IPNet{{

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import (`
`11`	`11`	`"github.com/coder/coder/v2/coderd/database"`
`12`	`12`	`"github.com/coder/coder/v2/coderd/database/dbauthz"`
`13`	`13`	`"github.com/coder/coder/v2/coderd/httpapi"`
	`14`	`+ "github.com/coder/coder/v2/coderd/workspaceapps/appurl"`
`14`	`15`	`"github.com/coder/coder/v2/codersdk"`
`15`	`16`	`)`
`16`	`17`
`@@ -43,7 +44,7 @@ func (api *API) PrimaryRegion(ctx context.Context) (codersdk.Region, error) {`
`43`	`44`	`IconURL: proxy.IconUrl,`
`44`	`45`	`Healthy: true,`
`45`	`46`	`PathAppURL: api.AccessURL.String(),`
`46`		`- WildcardHostname: api.AppHostname,`
	`47`	`+ WildcardHostname: appurl.SubdomainAppHost(api.AppHostname, api.AccessURL),`
`47`	`48`	`}, nil`
`48`	`49`	`}`
`49`	`50`