wire it up

johnstcn · johnstcn · commit 11597b679933 · 2023-11-23T15:11:43.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -135,7 +135,13 @@ type Options struct {
 	AccessControlStore          *atomic.Pointer[dbauthz.AccessControlStore]
 	// AppSecurityKey is the crypto key used to sign and encrypt tokens related to
 	// workspace applications. It consists of both a signing and encryption key.
-	AppSecurityKey     workspaceapps.SecurityKey
+	AppSecurityKey workspaceapps.SecurityKey
+
+	// The following two functions are dependencies of HealthcheckFunc but are only implemented
+	// in enterprise. Stubbing them out here.
+	FetchWorkspaceProxiesFunc *atomic.Pointer[func(context.Context) (codersdk.RegionsResponse[codersdk.WorkspaceProxy], error)]
+	UpdateProxyHealthFunc     *atomic.Pointer[func(context.Context) error]
+
 	HealthcheckFunc    func(ctx context.Context, apiKey string) *healthcheck.Report
 	HealthcheckTimeout time.Duration
 	HealthcheckRefresh time.Duration
@@ -396,6 +402,15 @@ func New(options *Options) *API {
 			*options.UpdateCheckOptions,
 		)
 	}
+
+	if options.FetchWorkspaceProxiesFunc == nil {
+		options.FetchWorkspaceProxiesFunc = &atomic.Pointer[func(context.Context) (codersdk.RegionsResponse[codersdk.WorkspaceProxy], error)]{}
+	}
+
+	if options.UpdateProxyHealthFunc == nil {
+		options.UpdateProxyHealthFunc = &atomic.Pointer[func(context.Context) error]{}
+	}
+
 	if options.HealthcheckFunc == nil {
 		options.HealthcheckFunc = func(ctx context.Context, apiKey string) *healthcheck.Report {
 			return healthcheck.Run(ctx, &healthcheck.ReportOptions{
@@ -413,9 +428,15 @@ func New(options *Options) *API {
 				DerpHealth: derphealth.ReportOptions{
 					DERPMap: api.DERPMap(),
 				},
+				WorkspaceProxy: healthcheck.WorkspaceProxyReportOptions{
+					CurrentVersion:        buildinfo.Version(),
+					FetchWorkspaceProxies: *options.FetchWorkspaceProxiesFunc.Load(),
+					UpdateProxyHealth:     *options.UpdateProxyHealthFunc.Load(),
+				},
 			})
 		}
 	}
+
 	if options.HealthcheckTimeout == 0 {
 		options.HealthcheckTimeout = 30 * time.Second
 	}
diff --git a/coderd/healthcheck/workspaceproxy.go b/coderd/healthcheck/workspaceproxy.go
@@ -10,16 +10,16 @@ import (
 )
 
 type WorkspaceProxyReportOptions struct {
+	// CurrentVersion is the current server version.
+	// We pass this in to make it easier to test.
+	CurrentVersion string
+	// FetchWorkspaceProxies is a function that returns the available workspace proxies.
+	FetchWorkspaceProxies func(context.Context) (codersdk.RegionsResponse[codersdk.WorkspaceProxy], error)
 	// UpdateProxyHealth is a function called when healthcheck is run.
 	// This would normally be ProxyHealth.ForceUpdate().
 	// We do this because if someone mashes the healthcheck refresh button
 	// they would expect up-to-date data.
 	UpdateProxyHealth func(context.Context) error
-	// FetchWorkspaceProxies is a function that returns the available workspace proxies.
-	FetchWorkspaceProxies func(context.Context) (codersdk.RegionsResponse[codersdk.WorkspaceProxy], error)
-	// CurrentVersion is the current server version.
-	// We pass this in to make it easier to test.
-	CurrentVersion string
 }
 
 // @typescript-generate Report
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -29,6 +29,7 @@ import (
 	"github.com/coder/coder/v2/coderd/httpmw"
 	"github.com/coder/coder/v2/coderd/rbac"
 	agplschedule "github.com/coder/coder/v2/coderd/schedule"
+	"github.com/coder/coder/v2/coderd/util/ptr"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/enterprise/coderd/dbauthz"
 	"github.com/coder/coder/v2/enterprise/coderd/license"
@@ -374,6 +375,10 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
 		// Use proxy health to return the healthy workspace proxy hostnames.
 		f := api.ProxyHealth.ProxyHosts
 		api.AGPL.WorkspaceProxyHostsFn.Store(&f)
+
+		// Wire this up to healthcheck.
+		api.AGPL.FetchWorkspaceProxiesFunc.Store(ptr.Ref(api.fetchWorkspaceProxies))
+		api.AGPL.UpdateProxyHealthFunc.Store(ptr.Ref(api.ProxyHealth.ForceUpdate))
 	}
 
 	err = api.PrometheusRegistry.Register(&api.licenseMetricsCollector)
