Fix local settings command (#4200)

treeverse · Sep 19, 2022 · 6b0bbb5 · 6b0bbb5
1 parent 84e231e
commit 6b0bbb5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/cmd/lakefs/cmd/root.go b/cmd/lakefs/cmd/root.go
@@ -59,7 +59,7 @@ func useLocal() bool {
 
 func newConfig() (*config.Config, error) {
 	if useLocal() {
-		config.SetDefaultLocalConfig()
+		return config.NewLocalConfig()
 	}
 
 	return config.NewConfig()

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -44,6 +44,14 @@ type Config struct {
 }
 
 func NewConfig() (*Config, error) {
+	return newConfig(false)
+}
+
+func NewLocalConfig() (*Config, error) {
+	return newConfig(true)
+}
+
+func newConfig(local bool) (*Config, error) {
 	c := &Config{}
 
 	// Inform viper of all expected fields.  Otherwise, it fails to deserialize from the
@@ -53,7 +61,7 @@ func NewConfig() (*Config, error) {
 		viper.SetDefault(key, nil)
 	}
 
-	setDefaults()
+	setDefaults(local)
 	setupLogger()
 
 	err := viper.UnmarshalExact(&c.values, viper.DecodeHook(

diff --git a/pkg/config/defaults.go b/pkg/config/defaults.go
@@ -132,15 +132,19 @@ const (
 	UIEnabledKey = "ui.enabled"
 )
 
-func SetDefaultLocalConfig() {
+func setDefaultLocalConfig() {
 	viper.SetDefault(DatabaseTypeKey, DefaultDatabaseType)
 	viper.SetDefault(DatabaseKVLocalPath, DefaultDatabaseLocalKVPath)
 	viper.SetDefault(BlockstoreLocalPathKey, DefaultBlockstoreLocalPath)
 	viper.SetDefault(AuthEncryptSecretKey, DefaultAuthEncryptSecretKey)
 	viper.SetDefault(BlockstoreTypeKey, DefaultBlockstoreType)
 }
 
-func setDefaults() {
+func setDefaults(local bool) {
+	if local {
+		setDefaultLocalConfig()
+	}
+
 	viper.SetDefault(ListenAddressKey, DefaultListenAddr)
 
 	viper.SetDefault(LoggingFormatKey, DefaultLoggingFormat)