Jul 26, 2023 · Apr 27, 2023 · May 1, 2023 · May 2, 2023 · May 3, 2023 · May 4, 2023
diff --git a/coderd/coderd.go b/coderd/coderd.go
 v := schedule.NewAGPLTemplateScheduleStore()
 options.TemplateScheduleStore.Store(&v)
 }
 if options.HealthcheckTimeout == 0 {
 options.HealthcheckTimeout = 30 * time.Second
 }
 if options.HealthcheckRefresh == 0 {
 options.HealthcheckRefresh = 10 * time.Minute
 }

 siteCacheDir := options.CacheDir
 if siteCacheDir != "" {
 healthCheckGroup:      &singleflight.Group[string, *healthcheck.Report]{},
 }
 if options.HealthcheckFunc == nil {
 options.HealthcheckFunc = func(ctx context.Context) (*healthcheck.Report, error) {
 options.HealthcheckFunc = func(ctx context.Context, apiKey string) (*healthcheck.Report, error) {
 return healthcheck.Run(ctx, &healthcheck.ReportOptions{
 AccessURL: options.AccessURL,
 DERPMap:   api.DERPMap().Clone(),
 APIKey:    apiKey,
 })
 }
 }
 if options.HealthcheckTimeout == 0 {
 options.HealthcheckTimeout = 30 * time.Second
 }
 if options.HealthcheckRefresh == 0 {
 options.HealthcheckRefresh = 10 * time.Minute
 }
 if options.UpdateCheckOptions != nil {
 api.updateChecker = updatecheck.New(
 options.Database,
diff --git a/enterprise/coderd/workspaceproxy_test.go b/enterprise/coderd/workspaceproxy_test.go
 require.Error(t, err)
 require.Empty(t, regions)
 })

 t.Run("GoingAway", func(t *testing.T) {
 t.Skip("This is flakey in CI because it relies on internal go routine timing. Should refactor.")
 t.Parallel()

 dv := coderdtest.DeploymentValues(t)
 dv.Experiments = []string{
 string(codersdk.ExperimentMoons),
 "*",
 }

 db, pubsub := dbtestutil.NewDB(t)

 ctx := testutil.Context(t, testutil.WaitLong)

 client, closer, api := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
 Options: &coderdtest.Options{
 AppHostname:      appHostname,
 Database:         db,
 Pubsub:           pubsub,
 DeploymentValues: dv,
 },
 // The interval is set to 1 hour so the proxy health
 // check will never happen manually. All checks will be
 // forced updates.
 ProxyHealthInterval: time.Hour,
 })
 t.Cleanup(func() {
 _ = closer.Close()
 })
 _ = coderdtest.CreateFirstUser(t, client)
 _ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
 Features: license.Features{
 codersdk.FeatureWorkspaceProxy: 1,
 },
 })

 const proxyName = "testproxy"
 proxy := coderdenttest.NewWorkspaceProxy(t, api, client, &coderdenttest.ProxyOptions{
 Name: proxyName,
 })
 _ = proxy

 require.Eventuallyf(t, func() bool {
 proxy, err := client.WorkspaceProxyByName(ctx, proxyName)
 if err != nil {
 // We are testing the going away, not the initial healthy.
 // Just force an update to change this to healthy.
 _ = api.ProxyHealth.ForceUpdate(ctx)
 return false
 }
 return proxy.Status.Status == codersdk.ProxyHealthy
 }, testutil.WaitShort, testutil.IntervalFast, "proxy never became healthy")

 _ = proxy.Close()
 // The proxy should tell the primary on close that is is no longer healthy.
 require.Eventuallyf(t, func() bool {
 proxy, err := client.WorkspaceProxyByName(ctx, proxyName)
 if err != nil {
 return false
 }
 return proxy.Status.Status == codersdk.ProxyUnhealthy
 }, testutil.WaitShort, testutil.IntervalFast, "proxy never became unhealthy after close")
 })
 }

 func TestWorkspaceProxyCRUD(t *testing.T) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -254,12 +254,6 @@ func New(options Options) API {
		v := schedule.NewAGPLTemplateScheduleStore()
		options.TemplateScheduleStore.Store(&v)
		}
		if options.HealthcheckTimeout == 0 {
		options.HealthcheckTimeout = 30 * time.Second
		}
		if options.HealthcheckRefresh == 0 {
		options.HealthcheckRefresh = 10 * time.Minute
		}

		siteCacheDir := options.CacheDir
		if siteCacheDir != "" {
Expand DownExpand Up		@@ -321,13 +315,20 @@ func New(options Options) API {
		healthCheckGroup: &singleflight.Group[string, *healthcheck.Report]{},
		}
		if options.HealthcheckFunc == nil {
		options.HealthcheckFunc = func(ctx context.Context) (*healthcheck.Report, error) {
		options.HealthcheckFunc = func(ctx context.Context, apiKey string) (*healthcheck.Report, error) {
		return healthcheck.Run(ctx, &healthcheck.ReportOptions{
		AccessURL: options.AccessURL,
		DERPMap: api.DERPMap().Clone(),
deansheather marked this conversation as resolved. OutdatedShow resolvedHide resolved
		APIKey: apiKey,
		})
		}
		}
		if options.HealthcheckTimeout == 0 {
		options.HealthcheckTimeout = 30 * time.Second
		}
		if options.HealthcheckRefresh == 0 {
		options.HealthcheckRefresh = 10 * time.Minute
		}
		if options.UpdateCheckOptions != nil {
		api.updateChecker = updatecheck.New(
		options.Database,
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -175,70 +175,6 @@ func TestRegions(t *testing.T) {
		require.Error(t, err)
		require.Empty(t, regions)
		})

		t.Run("GoingAway", func(t *testing.T) {
		t.Skip("This is flakey in CI because it relies on internal go routine timing. Should refactor.")
		t.Parallel()

		dv := coderdtest.DeploymentValues(t)
		dv.Experiments = []string{
		string(codersdk.ExperimentMoons),
		"*",
		}

		db, pubsub := dbtestutil.NewDB(t)

		ctx := testutil.Context(t, testutil.WaitLong)

		client, closer, api := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
		Options: &coderdtest.Options{
		AppHostname: appHostname,
		Database: db,
		Pubsub: pubsub,
		DeploymentValues: dv,
		},
		// The interval is set to 1 hour so the proxy health
		// check will never happen manually. All checks will be
		// forced updates.
		ProxyHealthInterval: time.Hour,
		})
		t.Cleanup(func() {
		_ = closer.Close()
		})
		_ = coderdtest.CreateFirstUser(t, client)
		_ = coderdenttest.AddLicense(t, client, coderdenttest.LicenseOptions{
		Features: license.Features{
		codersdk.FeatureWorkspaceProxy: 1,
		},
		})

		const proxyName = "testproxy"
		proxy := coderdenttest.NewWorkspaceProxy(t, api, client, &coderdenttest.ProxyOptions{
		Name: proxyName,
		})
		_ = proxy

		require.Eventuallyf(t, func() bool {
		proxy, err := client.WorkspaceProxyByName(ctx, proxyName)
		if err != nil {
		// We are testing the going away, not the initial healthy.
		// Just force an update to change this to healthy.
		_ = api.ProxyHealth.ForceUpdate(ctx)
		return false
		}
		return proxy.Status.Status == codersdk.ProxyHealthy
		}, testutil.WaitShort, testutil.IntervalFast, "proxy never became healthy")

		_ = proxy.Close()
		// The proxy should tell the primary on close that is is no longer healthy.
		require.Eventuallyf(t, func() bool {
		proxy, err := client.WorkspaceProxyByName(ctx, proxyName)
		if err != nil {
		return false
		}
		return proxy.Status.Status == codersdk.ProxyUnhealthy
		}, testutil.WaitShort, testutil.IntervalFast, "proxy never became unhealthy after close")
		})
		}

		func TestWorkspaceProxyCRUD(t *testing.T) {
Expand Down