Prefer command argument over configuration

dyng · dyng · commit 12af46c519bb · 2023-01-29T19:50:48.000+08:00
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -55,14 +55,14 @@ func ParseConfig(config *Config) error {
 		return err
 	}
 
-	// overwrite configurations
-	if configJson.Provider != nil {
+	// overwrite configurations only when the default value is used
+	if configJson.Provider != nil && config.Provider == DefaultProvider {
 		config.Provider = *configJson.Provider
 	}
-	if configJson.ApiKey != nil {
+	if configJson.ApiKey != nil && config.ApiKey == "" {
 		config.ApiKey = *configJson.ApiKey
 	}
-	if configJson.EtherscanApiKey != nil {
+	if configJson.EtherscanApiKey != nil && config.EtherscanApiKey == "" {
 		config.EtherscanApiKey = *configJson.EtherscanApiKey
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -55,14 +55,14 @@ func ParseConfig(config *Config) error {`
`55`	`55`	`return err`
`56`	`56`	`}`
`57`	`57`
`58`		`- // overwrite configurations`
`59`		`- if configJson.Provider != nil {`
	`58`	`+ // overwrite configurations only when the default value is used`
	`59`	`+ if configJson.Provider != nil && config.Provider == DefaultProvider {`
`60`	`60`	`config.Provider = *configJson.Provider`
`61`	`61`	`}`
`62`		`- if configJson.ApiKey != nil {`
	`62`	`+ if configJson.ApiKey != nil && config.ApiKey == "" {`
`63`	`63`	`config.ApiKey = *configJson.ApiKey`
`64`	`64`	`}`
`65`		`- if configJson.EtherscanApiKey != nil {`
	`65`	`+ if configJson.EtherscanApiKey != nil && config.EtherscanApiKey == "" {`
`66`	`66`	`config.EtherscanApiKey = *configJson.EtherscanApiKey`
`67`	`67`	`}`
`68`	`68`