Add CODER_CONFIG_PATH

ammario · ammario · commit af2ba004bcad · 2023-02-23T21:59:41.000Z
diff --git a/cli/deployment/config.go b/cli/deployment/config.go
@@ -16,7 +16,6 @@ import (
 
 	"github.com/coder/coder/buildinfo"
 	"github.com/coder/coder/cli/cliui"
-	"github.com/coder/coder/cli/config"
 	"github.com/coder/coder/codersdk"
 )
 
@@ -161,6 +160,13 @@ func newConfig() *codersdk.DeploymentConfig {
 			Flag:    "cache-dir",
 			Default: DefaultCacheDir(),
 		},
+		ConfigPath: &codersdk.DeploymentConfigField[string]{
+			Name:      "Config file path",
+			Usage:     "If provided, coder server will use this configuration file in addition to provided flags.",
+			Flag:      "config",
+			Shorthand: "c",
+			Default:   "",
+		},
 		InMemoryDatabase: &codersdk.DeploymentConfigField[bool]{
 			Name:   "In Memory Database",
 			Usage:  "Controls whether data will be stored in an in-memory database.",
@@ -574,17 +580,13 @@ func newConfig() *codersdk.DeploymentConfig {
 }
 
 //nolint:revive
-func Config(flagset *pflag.FlagSet, vip *viper.Viper) (*codersdk.DeploymentConfig, error) {
+func Config(configPath string, vip *viper.Viper) (*codersdk.DeploymentConfig, error) {
 	dc := newConfig()
-	flg, err := flagset.GetString(config.FlagName)
-	if err != nil {
-		return nil, xerrors.Errorf("get global config from flag: %w", err)
-	}
-	vip.SetEnvPrefix("coder")
+	vip.SetEnvPrefix("CODER")
 
-	if flg != "" {
-		vip.SetConfigFile(flg + "/server.yaml")
-		err = vip.ReadInConfig()
+	if configPath != "" {
+		vip.SetConfigFile(configPath)
+		err := vip.ReadInConfig()
 		if err != nil && !xerrors.Is(err, os.ErrNotExist) {
 			return dc, xerrors.Errorf("reading deployment config: %w", err)
 		}
diff --git a/cli/deployment/config_test.go b/cli/deployment/config_test.go
@@ -256,7 +256,7 @@ func TestConfig(t *testing.T) {
 			for key, value := range tc.Env {
 				t.Setenv(key, value)
 			}
-			config, err := deployment.Config(flagSet, viper)
+			config, err := deployment.Config("", viper)
 			require.NoError(t, err)
 			tc.Valid(config)
 		})
diff --git a/cli/server.go b/cli/server.go
@@ -96,7 +96,8 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co
 
 			go dumpHandler(ctx)
 
-			cfg, err := deployment.Config(cmd.Flags(), vip)
+			configPath, _ := cmd.Flags().GetString("config")
+			cfg, err := deployment.Config(configPath, vip)
 			if err != nil {
 				return xerrors.Errorf("getting deployment config: %w", err)
 			}
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -148,6 +148,7 @@ type DeploymentConfig struct {
 	SessionDuration                 *DeploymentConfigField[time.Duration]   `json:"max_session_expiry" typescript:",notnull"`
 	DisableSessionExpiryRefresh     *DeploymentConfigField[bool]            `json:"disable_session_expiry_refresh" typescript:",notnull"`
 	DisablePasswordAuth             *DeploymentConfigField[bool]            `json:"disable_password_auth" typescript:",notnull"`
+	ConfigPath                      *DeploymentConfigField[string]          `json:"config_path" typescript:",notnull"`
 
 	// DEPRECATED: Use HTTPAddress or TLS.Address instead.
 	Address *DeploymentConfigField[string] `json:"address" typescript:",notnull"`

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ func TestConfig(t *testing.T) {`
`256`	`256`	`for key, value := range tc.Env {`
`257`	`257`	`t.Setenv(key, value)`
`258`	`258`	`}`
`259`		`- config, err := deployment.Config(flagSet, viper)`
	`259`	`+ config, err := deployment.Config("", viper)`
`260`	`260`	`require.NoError(t, err)`
`261`	`261`	`tc.Valid(config)`
`262`	`262`	`})`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,8 @@ func Server(vip viper.Viper, newAPI func(context.Context, coderd.Options) (*co`
`96`	`96`
`97`	`97`	`go dumpHandler(ctx)`
`98`	`98`
`99`		`- cfg, err := deployment.Config(cmd.Flags(), vip)`
	`99`	`+ configPath, _ := cmd.Flags().GetString("config")`
	`100`	`+ cfg, err := deployment.Config(configPath, vip)`
`100`	`101`	`if err != nil {`
`101`	`102`	`return xerrors.Errorf("getting deployment config: %w", err)`
`102`	`103`	`}`