Use proper config

Emyrk · Emyrk · commit 7fc66d6b8f56 · 2023-04-18T09:15:29.000-05:00
diff --git a/cli/server.go b/cli/server.go
@@ -163,21 +163,6 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 	var (
 		cfg  = new(codersdk.DeploymentValues)
 		opts = cfg.Options()
-		// For the develop.sh script, it is helpful to make this key deterministic.
-		devAppSecurityKey string
-	)
-	opts.Add(
-		// This should be temporary until we support sending this over to the
-		// proxy via some authenticated api call.
-		clibase.Option{
-			Name:        "App Security Key (Development Only)",
-			Description: "Used to override the app security key stored in the database. This should never be used in production.",
-			Flag:        "dangerous-dev-app-security-key",
-			Default:     "",
-			Value:       clibase.StringOf(&devAppSecurityKey),
-			Annotations: clibase.Annotations{}.Mark("secret", "true"),
-			Hidden:      true,
-		},
 	)
 	serverCmd := &clibase.Cmd{
 		Use:     "server",
@@ -636,12 +621,12 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 					}
 				}
 
-				if devAppSecurityKey != "" {
-					_, err := workspaceapps.KeyFromString(devAppSecurityKey)
+				if cfg.Dangerous.DevAppSecurityKey.Value() != "" {
+					_, err := workspaceapps.KeyFromString(cfg.Dangerous.DevAppSecurityKey.Value())
 					if err != nil {
 						return xerrors.Errorf("invalid dev app security key: %w", err)
 					}
-					err = tx.UpsertAppSecurityKey(ctx, devAppSecurityKey)
+					err = tx.UpsertAppSecurityKey(ctx, cfg.Dangerous.DevAppSecurityKey.Value())
 					if err != nil {
 						return xerrors.Errorf("Insert dev app security key: %w", err)
 					}
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -328,8 +328,9 @@ type LoggingConfig struct {
 }
 
 type DangerousConfig struct {
-	AllowPathAppSharing         clibase.Bool `json:"allow_path_app_sharing" typescript:",notnull"`
-	AllowPathAppSiteOwnerAccess clibase.Bool `json:"allow_path_app_site_owner_access" typescript:",notnull"`
+	AllowPathAppSharing         clibase.Bool   `json:"allow_path_app_sharing" typescript:",notnull"`
+	AllowPathAppSiteOwnerAccess clibase.Bool   `json:"allow_path_app_site_owner_access" typescript:",notnull"`
+	DevAppSecurityKey           clibase.String `json:"dev_app_security_key" typescript:",notnull"`
 }
 
 const (
@@ -1182,6 +1183,15 @@ when required by your organization's security policy.`,
 			Value: &c.Dangerous.AllowPathAppSiteOwnerAccess,
 			Group: &deploymentGroupDangerous,
 		},
+		{
+			Name:        "App Security Key (Development Only)",
+			Description: "Used to override the app security key stored in the database. This should never be used in production.",
+			Flag:        "dangerous-dev-app-security-key",
+			Default:     "",
+			Value:       &c.Dangerous.DevAppSecurityKey,
+			Annotations: clibase.Annotations{}.Mark("secret", "true"),
+			Hidden:      true,
+		},
 		// Misc. settings
 		{
 			Name:        "Experiments",
