fix(report): prioritize env vars over config.toml (#1194)

config/azureconf.go

@@ -20,18 +20,25 @@ type AzureConf struct {
 	Enabled bool `toml:"-" json:"-"`
 }
 
+const (
+	azureAccount = "AZURE_STORAGE_ACCOUNT"
+	azureKey     = "AZURE_STORAGE_ACCESS_KEY"
+)
+
 // Validate configuration
 func (c *AzureConf) Validate() (errs []error) {
 	if !c.Enabled {
 		return
 	}
-	if c.AccountName == "" {
-		c.AccountName = os.Getenv("AZURE_STORAGE_ACCOUNT")
+
+	// overwrite if env var is not empty
+	if os.Getenv(azureAccount) != "" {
+		c.AccountName = os.Getenv(azureAccount)
+	}
+	if os.Getenv(azureKey) != "" {
+		c.AccountKey = os.Getenv(azureKey)
 	}
 
-	if c.AccountKey == "" {
-		c.AccountKey = os.Getenv("AZURE_STORAGE_ACCESS_KEY")
-	}
 	if c.ContainerName == "" {
 		errs = append(errs, xerrors.Errorf("Azure storage container name is required"))
 	}

config/config.go

@@ -134,7 +134,7 @@ func (c Config) checkSSHKeyExist() (errs []error) {
 }
 
 // ValidateOnReport validates configuration
-func (c Config) ValidateOnReport() bool {
+func (c *Config) ValidateOnReport() bool {
 	errs := []error{}
 
 	if len(c.ResultsDir) != 0 {

config/httpconf.go

@@ -12,28 +12,21 @@ type HTTPConf struct {
 	Enabled bool   `toml:"-" json:"-"`
 }
 
+const httpKey = "VULS_HTTP_URL"
+
 // Validate validates configuration
 func (c *HTTPConf) Validate() (errs []error) {
 	if !c.Enabled {
 		return nil
 	}
 
+	// overwrite if env var is not empty
+	if os.Getenv(httpKey) != "" {
+		c.URL = os.Getenv(httpKey)
+	}
+
 	if _, err := govalidator.ValidateStruct(c); err != nil {
 		errs = append(errs, err)
 	}
 	return errs
 }
-
-const httpKey = "VULS_HTTP_URL"
-
-// Init set options with the following priority.
-// 1. Environment variable
-// 2. config.toml
-func (c *HTTPConf) Init(url string) {
-	if os.Getenv(httpKey) != "" {
-		c.URL = os.Getenv(httpKey)
-	}
-	if url != "" {
-		c.URL = url
-	}
-}