Enable config dir setting via env variable (#611)

Thanks to @kampka!
giantswarm · Mar 4, 2021 · d479e54 · d479e54
1 parent 82bfcd4
commit d479e54
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/commands/info/command.go b/commands/info/command.go
@@ -261,6 +261,7 @@ func getEnvironmentVariables() map[string]string {
 	vars := []string{
 		"GSCTL_CAFILE",
 		"GSCTL_CAPATH",
+		"GSCTL_CONFIG_DIR",
 		"GSCTL_DISABLE_CMDLINE_TRACKING",
 		"GSCTL_DISABLE_COLORS",
 		"GSCTL_ENDPOINT",

diff --git a/commands/root.go b/commands/root.go
@@ -56,8 +56,14 @@ func init() {
 	// if it exists.
 	tokenFromEnv := os.Getenv("GSCTL_AUTH_TOKEN")
 
+	defaultConfigDir := config.DefaultConfigDirPath
+	configDirFromEnv := os.Getenv("GSCTL_CONFIG_DIR")
+	if (configDirFromEnv != "") {
+		defaultConfigDir = configDirFromEnv
+	}
+
 	RootCommand.PersistentFlags().StringVarP(&flags.Token, "auth-token", "", tokenFromEnv, "Authorization token to use")
-	RootCommand.PersistentFlags().StringVarP(&flags.ConfigDirPath, "config-dir", "", config.DefaultConfigDirPath, "Configuration directory path to use")
+	RootCommand.PersistentFlags().StringVarP(&flags.ConfigDirPath, "config-dir", "", defaultConfigDir, "Configuration directory path to use")
 	RootCommand.PersistentFlags().BoolVarP(&flags.Verbose, "verbose", "v", false, "Print more information")
 	RootCommand.PersistentFlags().BoolVarP(&flags.SilenceHTTPEndpointWarning, "silence-http-endpoint-warning", "", false, "Dont't print warnings when deliberately using an insecure HTTP endpoint")
 	RootCommand.Flags().Bool("version", false, version.Command.Short)