Fix access url passing

Emyrk · Emyrk · commit 1e163d95cfe1 · 2023-04-07T10:24:05.000-05:00
diff --git a/enterprise/coderd/coderdenttest/proxytest.go b/enterprise/coderd/coderdenttest/proxytest.go
@@ -22,27 +22,20 @@ import (
 	"github.com/coder/coder/coderd/httpapi"
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/coder/coderd/coderdtest"
-
-	"github.com/coder/coder/coderd/rbac"
 	"github.com/prometheus/client_golang/prometheus"
 
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
-	"github.com/coder/coder/coderd/database"
-	"github.com/coder/coder/coderd/database/dbauthz"
-	"github.com/coder/coder/coderd/database/dbtestutil"
 )
 
 type ProxyOptions struct {
 	Name string
 
-	Database        database.Store
-	Pubsub          database.Pubsub
-	Authorizer      rbac.Authorizer
 	TLSCertificates []tls.Certificate
-	ProxyURL        *url.URL
 	AppHostname     string
+
+	// ProxyURL is optional
+	ProxyURL *url.URL
 }
 
 // NewWorkspaceProxy will configure a wsproxy.Server with the given options.
@@ -57,17 +50,6 @@ func NewWorkspaceProxy(t *testing.T, coderd *coderd.API, owner *codersdk.Client,
 		options = &ProxyOptions{}
 	}
 
-	if options.Authorizer == nil {
-		options.Authorizer = &coderdtest.RecordingAuthorizer{
-			Wrapped: rbac.NewCachingAuthorizer(prometheus.NewRegistry()),
-		}
-	}
-
-	if options.Database == nil {
-		options.Database, options.Pubsub = dbtestutil.NewDB(t)
-		options.Database = dbauthz.New(options.Database, options.Authorizer, slogtest.Make(t, nil).Leveled(slog.LevelDebug))
-	}
-
 	// HTTP Server
 	var mutex sync.RWMutex
 	var handler http.Handler
@@ -132,11 +114,12 @@ func NewWorkspaceProxy(t *testing.T, coderd *coderd.API, owner *codersdk.Client,
 		URL:              accessURL.String(),
 		WildcardHostname: options.AppHostname,
 	})
+	require.NoError(t, err, "failed to create workspace proxy")
 
 	wssrv, err := wsproxy.New(&wsproxy.Options{
 		Logger:            slogtest.Make(t, nil).Leveled(slog.LevelDebug),
 		PrimaryAccessURL:  coderd.AccessURL,
-		AccessURL:         options.ProxyURL,
+		AccessURL:         accessURL,
 		AppHostname:       options.AppHostname,
 		AppHostnameRegex:  appHostnameRegex,
 		RealIPConfig:      coderd.RealIPConfig,
diff --git a/enterprise/wsproxy/proxy.go b/enterprise/wsproxy/proxy.go
@@ -68,7 +68,6 @@ func (o *Options) Validate() error {
 	errs.Required("PrimaryAccessURL", o.PrimaryAccessURL)
 	errs.Required("AccessURL", o.AccessURL)
 	errs.Required("RealIPConfig", o.RealIPConfig)
-	errs.Required("Tracing", o.Tracing)
 	errs.Required("PrometheusRegistry", o.PrometheusRegistry)
 	errs.NotEmpty("ProxySessionToken", o.ProxySessionToken)
 	errs.NotEmpty("AppSecurityKey", o.AppSecurityKey)
diff --git a/enterprise/wsproxy/proxy_test.go b/enterprise/wsproxy/proxy_test.go
@@ -4,16 +4,13 @@ import (
 	"net"
 	"testing"
 
-	"github.com/coder/coder/enterprise/coderd/license"
-
-	"github.com/coder/coder/codersdk"
-
-	"github.com/coder/coder/enterprise/coderd/coderdenttest"
-
 	"github.com/coder/coder/cli/clibase"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/coderd/httpmw"
 	"github.com/coder/coder/coderd/workspaceapps/apptest"
+	"github.com/coder/coder/codersdk"
+	"github.com/coder/coder/enterprise/coderd/coderdenttest"
+	"github.com/coder/coder/enterprise/coderd/license"
 )
 
 func TestExternalProxyWorkspaceApps(t *testing.T) {
@@ -56,8 +53,10 @@ func TestExternalProxyWorkspaceApps(t *testing.T) {
 		})
 
 		// Create the external proxy
-		proxyAPI := coderdenttest.NewWorkspaceProxy(t, api, client, &coderdenttest.ProxyOptions{})
-		var _ = proxyAPI
+		proxyAPI := coderdenttest.NewWorkspaceProxy(t, api, client, &coderdenttest.ProxyOptions{
+			Name:        "best-proxy",
+			AppHostname: opts.AppHost,
+		})
 
 		return &apptest.Deployment{
 			Options:   opts,
