more convert

f0ssel · f0ssel · commit 91195181974a · 2022-10-18T21:02:59.000Z
diff --git a/cli/deployment/config.go b/cli/deployment/config.go
@@ -265,9 +265,31 @@ func newConfig() codersdk.DeploymentConfig {
 	}
 }
 
-func Config(vip *viper.Viper) (codersdk.DeploymentConfig, error) {
-	cfg := codersdk.DeploymentConfig{}
-	return cfg, vip.Unmarshal(&cfg)
+func Config(vip *viper.Viper) codersdk.DeploymentConfig {
+	dc := newConfig()
+	dcv := reflect.ValueOf(dc).Elem()
+	t := dcv.Type()
+	for i := 0; i < t.NumField(); i++ {
+		fv := dcv.Field(i)
+		fve := fv.Elem()
+		key := fve.FieldByName("Key").String()
+		value := fve.FieldByName("Value").Interface()
+
+		switch value.(type) {
+		case string:
+			fve.FieldByName("Value").SetString(vip.GetString(key))
+		case bool:
+			fve.FieldByName("Value").SetBool(vip.GetBool(key))
+		case int:
+			fve.FieldByName("Value").SetInt(int64(vip.GetInt(key)))
+		case time.Duration:
+			fve.FieldByName("Value").SetInt(int64(vip.GetDuration(key)))
+		case []string:
+			fve.FieldByName("Value").Set(reflect.ValueOf(vip.GetStringSlice(key)))
+		}
+	}
+
+	return dc
 }
 
 func NewViper() *viper.Viper {
diff --git a/cli/server.go b/cli/server.go
@@ -76,10 +76,7 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co
 		Use:   "server",
 		Short: "Start a Coder server",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			cfg, err := deployment.Config(vip)
-			if err != nil {
-				return xerrors.Errorf("failed to read config: %w", err)
-			}
+			cfg := deployment.Config(vip)
 			printLogo(cmd)
 			logger := slog.Make(sloghuman.Sink(cmd.ErrOrStderr()))
 			if cfg.Verbose {
@@ -726,10 +723,7 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co
 		Use:   "postgres-builtin-serve",
 		Short: "Run the built-in PostgreSQL deployment.",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			dcfg, err := deployment.Config(vip)
-			if err != nil {
-				return xerrors.Errorf("failed to read config: %w", err)
-			}
+			dcfg := deployment.Config(vip)
 			cfg := createConfig(cmd)
 			logger := slog.Make(sloghuman.Sink(cmd.ErrOrStderr()))
 			if dcfg.Verbose {
@@ -753,7 +747,7 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co
 		},
 	})
 
-	deployment.AttachFlags(root.Flags(), vip)
+	deployment.AttachFlags(root.Flags(), vip, false)
 
 	return root
 }
diff --git a/enterprise/cli/server.go b/enterprise/cli/server.go
@@ -71,7 +71,7 @@ func server() *cobra.Command {
 		return api.AGPL, api, nil
 	})
 
-	deployment.AttachEnterpriseFlags(cmd.Flags(), vip)
+	deployment.AttachFlags(cmd.Flags(), vip, true)
 
 	return cmd
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func server() *cobra.Command {`
`71`	`71`	`return api.AGPL, api, nil`
`72`	`72`	`})`
`73`	`73`
`74`		`- deployment.AttachEnterpriseFlags(cmd.Flags(), vip)`
	`74`	`+ deployment.AttachFlags(cmd.Flags(), vip, true)`
`75`	`75`
`76`	`76`	`return cmd`
`77`	`77`	`}`