Merge branch 'main' into dean/proxy-derp-map

coder · deansheather · Jul 26, 2023 · Apr 27, 2023 · May 1, 2023 · May 2, 2023
commit d22026604b471f53a7975c5bd1cb442736d3d722
diff --git a/agent/agenttest/client.go b/agent/agenttest/client.go
@@ -31,6 +31,7 @@ func NewClient(t testing.TB,
 	}
 	return &Client{
 		t:              t,
+		logger:         logger.Named("client"),
 		agentID:        agentID,
 		manifest:       manifest,
 		statsChan:      statsChan,

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/coderd.go b/coderd/coderd.go
@@ -265,6 +265,13 @@ func New(options *Options) *API {
 		v := schedule.NewAGPLTemplateScheduleStore()
 		options.TemplateScheduleStore.Store(&v)
 	}
+	if options.UserQuietHoursScheduleStore == nil {
+		options.UserQuietHoursScheduleStore = &atomic.Pointer[schedule.UserQuietHoursScheduleStore]{}
+	}
+	if options.UserQuietHoursScheduleStore.Load() == nil {
+		v := schedule.NewAGPLUserQuietHoursScheduleStore()
+		options.UserQuietHoursScheduleStore.Store(&v)
+	}
 
 	siteCacheDir := options.CacheDir
 	if siteCacheDir != "" {
@@ -353,13 +360,6 @@ func New(options *Options) *API {
 	if options.HealthcheckRefresh == 0 {
 		options.HealthcheckRefresh = 10 * time.Minute
 	}
-	if options.UpdateCheckOptions != nil {
-		api.updateChecker = updatecheck.New(
-			options.Database,
-			options.Logger.Named("update_checker"),
-			*options.UpdateCheckOptions,
-		)
-	}
 
 	var oidcAuthURLParams map[string]string
 	if options.OIDCConfig != nil {
@@ -938,6 +938,9 @@ type API struct {
 	// TemplateScheduleStore is a pointer to an atomic pointer because this is
 	// passed to another struct, and we want them all to be the same reference.
 	TemplateScheduleStore *atomic.Pointer[schedule.TemplateScheduleStore]
+	// UserQuietHoursScheduleStore is a pointer to an atomic pointer for the
+	// same reason as TemplateScheduleStore.
+	UserQuietHoursScheduleStore *atomic.Pointer[schedule.UserQuietHoursScheduleStore]
 	// DERPMapper mutates the DERPMap to include workspace proxies.
 	DERPMapper atomic.Pointer[func(derpMap *tailcfg.DERPMap) *tailcfg.DERPMap]
 

diff --git a/docs/admin/audit-logs.md b/docs/admin/audit-logs.md
diff --git a/docs/api/schemas.md b/docs/api/schemas.md
diff --git a/enterprise/cli/proxyserver.go b/enterprise/cli/proxyserver.go
@@ -221,6 +221,7 @@ func (*RootCmd) proxyServer() *clibase.Cmd {
 
 			proxy, err := wsproxy.New(ctx, &wsproxy.Options{
 				Logger:                 logger,
+				Experiments:            coderd.ReadExperiments(logger, cfg.Experiments.Value()),
 				HTTPClient:             httpClient,
 				DashboardURL:           primaryAccessURL.Value(),
 				AccessURL:              cfg.AccessURL.Value(),

diff --git a/enterprise/wsproxy/wsproxy.go b/enterprise/wsproxy/wsproxy.go
@@ -232,6 +232,31 @@ func New(ctx context.Context, opts *Options) (*Server, error) {
 	if err != nil {
 		return nil, xerrors.Errorf("parse app security key: %w", err)
 	}
+
+	connInfo, err := client.SDKClient.WorkspaceAgentConnectionInfoGeneric(ctx)
+	if err != nil {
+		return nil, xerrors.Errorf("get derpmap: %w", err)
+	}
+
+	var agentProvider workspaceapps.AgentProvider
+	if opts.Experiments.Enabled(codersdk.ExperimentSingleTailnet) {
+		stn, err := coderd.NewServerTailnet(ctx,
+			s.Logger,
+			nil,
+			connInfo.DERPMap,
+			s.DialCoordinator,
+			wsconncache.New(s.DialWorkspaceAgent, 0),
+		)
+		if err != nil {
+			return nil, xerrors.Errorf("create server tailnet: %w", err)
+		}
+		agentProvider = stn
+	} else {
+		agentProvider = &wsconncache.AgentProvider{
+			Cache: wsconncache.New(s.DialWorkspaceAgent, 0),
+		}
+	}
+
 	s.AppServer = &workspaceapps.Server{
 		Logger:        opts.Logger.Named("workspaceapps"),
 		DashboardURL:  opts.DashboardURL,
@@ -393,6 +418,10 @@ func (s *Server) handleRegisterFailure(err error) {
 	)
 }
 
+func (s *Server) DialCoordinator(ctx context.Context) (tailnet.MultiAgentConn, error) {
+	return s.SDKClient.DialCoordinator(ctx)
+}
+
 func (s *Server) buildInfo(rw http.ResponseWriter, r *http.Request) {
 	httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.BuildInfoResponse{
 		ExternalURL:    buildinfo.ExternalURL(),

diff --git a/enterprise/wsproxy/wsproxy_test.go b/enterprise/wsproxy/wsproxy_test.go
@@ -371,7 +371,7 @@ resourceLoop:
 	require.False(t, p2p)
 }
 
-func TestWorkspaceProxyWorkspaceApps(t *testing.T) {
+func TestWorkspaceProxyWorkspaceApps_Wsconncache(t *testing.T) {
 	t.Parallel()
 
 	apptest.Run(t, false, func(t *testing.T, opts *apptest.DeploymentOptions) *apptest.Deployment {