chore: Return populated options vs a blank

Emyrk · Emyrk · commit ac997a9cddfd · 2023-09-28T15:49:11.000-05:00
diff --git a/cli/server.go b/cli/server.go
@@ -617,6 +617,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 				MetricsCacheRefreshInterval: vals.MetricsCacheRefreshInterval.Value(),
 				AgentStatsRefreshInterval:   vals.AgentStatRefreshInterval.Value(),
 				DeploymentValues:            vals,
+				DeploymentOptions:           opts,
 				PrometheusRegistry:          prometheus.NewRegistry(),
 				APIRateLimit:                int(vals.RateLimit.API.Value()),
 				LoginRateLimit:              loginRateLimit,
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -40,6 +40,7 @@ import (
 
 	"cdr.dev/slog"
 	"github.com/coder/coder/v2/buildinfo"
+	"github.com/coder/coder/v2/cli/clibase"
 	"github.com/coder/coder/v2/coderd/audit"
 	"github.com/coder/coder/v2/coderd/awsidentity"
 	"github.com/coder/coder/v2/coderd/batchstats"
@@ -152,7 +153,11 @@ type Options struct {
 	MetricsCacheRefreshInterval time.Duration
 	AgentStatsRefreshInterval   time.Duration
 	DeploymentValues            *codersdk.DeploymentValues
-	UpdateCheckOptions          *updatecheck.Options // Set non-nil to enable update checking.
+	// DeploymentOptions do contain the copy of DeploymentValues, but contain
+	// contextual information about how the values were set.
+	// Do not use DeploymentOptions to retrieve values, use DeploymentValues instead.
+	DeploymentOptions  clibase.OptionSet
+	UpdateCheckOptions *updatecheck.Options // Set non-nil to enable update checking.
 
 	// SSHConfig is the response clients use to configure config-ssh locally.
 	SSHConfig codersdk.SSHConfigResponse
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -394,29 +394,31 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
 			Pubsub:                         options.Pubsub,
 			GitAuthConfigs:                 options.GitAuthConfigs,
 
-			Auditor:                            options.Auditor,
-			AWSCertificates:                    options.AWSCertificates,
-			AzureCertificates:                  options.AzureCertificates,
-			GithubOAuth2Config:                 options.GithubOAuth2Config,
-			RealIPConfig:                       options.RealIPConfig,
-			OIDCConfig:                         options.OIDCConfig,
-			GoogleTokenValidator:               options.GoogleTokenValidator,
-			SSHKeygenAlgorithm:                 options.SSHKeygenAlgorithm,
-			DERPServer:                         derpServer,
-			APIRateLimit:                       options.APIRateLimit,
-			LoginRateLimit:                     options.LoginRateLimit,
-			FilesRateLimit:                     options.FilesRateLimit,
-			Authorizer:                         options.Authorizer,
-			Telemetry:                          telemetry.NewNoop(),
-			TemplateScheduleStore:              &templateScheduleStore,
-			TLSCertificates:                    options.TLSCertificates,
-			TrialGenerator:                     options.TrialGenerator,
-			TailnetCoordinator:                 options.Coordinator,
-			BaseDERPMap:                        derpMap,
-			DERPMapUpdateFrequency:             150 * time.Millisecond,
-			MetricsCacheRefreshInterval:        options.MetricsCacheRefreshInterval,
-			AgentStatsRefreshInterval:          options.AgentStatsRefreshInterval,
-			DeploymentValues:                   options.DeploymentValues,
+			Auditor:                     options.Auditor,
+			AWSCertificates:             options.AWSCertificates,
+			AzureCertificates:           options.AzureCertificates,
+			GithubOAuth2Config:          options.GithubOAuth2Config,
+			RealIPConfig:                options.RealIPConfig,
+			OIDCConfig:                  options.OIDCConfig,
+			GoogleTokenValidator:        options.GoogleTokenValidator,
+			SSHKeygenAlgorithm:          options.SSHKeygenAlgorithm,
+			DERPServer:                  derpServer,
+			APIRateLimit:                options.APIRateLimit,
+			LoginRateLimit:              options.LoginRateLimit,
+			FilesRateLimit:              options.FilesRateLimit,
+			Authorizer:                  options.Authorizer,
+			Telemetry:                   telemetry.NewNoop(),
+			TemplateScheduleStore:       &templateScheduleStore,
+			TLSCertificates:             options.TLSCertificates,
+			TrialGenerator:              options.TrialGenerator,
+			TailnetCoordinator:          options.Coordinator,
+			BaseDERPMap:                 derpMap,
+			DERPMapUpdateFrequency:      150 * time.Millisecond,
+			MetricsCacheRefreshInterval: options.MetricsCacheRefreshInterval,
+			AgentStatsRefreshInterval:   options.AgentStatsRefreshInterval,
+			DeploymentValues:            options.DeploymentValues,
+			// For tests, we don't have any `value_source` fields set.
+			DeploymentOptions:                  options.DeploymentValues.Options(),
 			UpdateCheckOptions:                 options.UpdateCheckOptions,
 			SwaggerEndpoint:                    options.SwaggerEndpoint,
 			AppSecurityKey:                     AppSecurityKey,
diff --git a/coderd/deployment.go b/coderd/deployment.go
@@ -33,7 +33,7 @@ func (api *API) deploymentValues(rw http.ResponseWriter, r *http.Request) {
 		r.Context(), rw, http.StatusOK,
 		codersdk.DeploymentConfig{
 			Values:  values,
-			Options: values.Options(),
+			Options: api.DeploymentOptions,
 		},
 	)
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func (api API) deploymentValues(rw http.ResponseWriter, r http.Request) {`
`33`	`33`	`r.Context(), rw, http.StatusOK,`
`34`	`34`	`codersdk.DeploymentConfig{`
`35`	`35`	`Values: values,`
`36`		`- Options: values.Options(),`
	`36`	`+ Options: api.DeploymentOptions,`
`37`	`37`	`},`
`38`	`38`	`)`
`39`	`39`	`}`