Revoming unnecessary logics and renaming the CLIValues SETValues

Author: prabdeb

cmd/apply.go

@@ -37,13 +37,7 @@ apps, mh acts on all apps in your mh config.`,
 		// Build additional configuration from environment and CLI
 		envCLIConfig := lib.MHConfig{
 			PrintRendered: viper.GetBool("printRendered"),
-		}
-
-		// Add values passed via CLI using --set
-		if viper.GetStringSlice("set") != nil {
-			envCLIConfig = lib.MHConfig{
-				CLIValues: viper.GetStringSlice("set"),
-			}
+			SETValues:     viper.GetStringSlice("set"),
 		}
 
 		// Merge configuration from file, environment and CLI into default

cmd/simulate.go

@@ -37,13 +37,7 @@ apps, mh acts on all apps in your mh config.`,
 		// Build additional configuration from environment and CLI
 		envCLIConfig := lib.MHConfig{
 			PrintRendered: viper.GetBool("printRendered"),
-		}
-
-		// Add values passed via CLI using --set
-		if viper.GetStringSlice("set") != nil {
-			envCLIConfig = lib.MHConfig{
-				CLIValues: viper.GetStringSlice("set"),
-			}
+			SETValues:     viper.GetStringSlice("set"),
 		}
 
 		// Merge configuration from file, environment and CLI into default

mhlib/app.go

@@ -230,8 +230,11 @@ func (a *App) render(configFile string) (*string, *string, *[]byte, error) {
 	}
 
 	// Add config via --set command
-	for _, value := range a.MHConfig.CLIValues {
-		strvals.ParseInto(value, config)
+	for _, value := range a.MHConfig.SETValues {
+		err := strvals.ParseInto(value, config)
+		if err != nil {
+			return nil, nil, nil, fmt.Errorf("Failed to parse values provided via --set : %v", err)
+		}
 	}
 
 	out, err := engine.New().Render(fakeChart, config)

mhlib/mhConfig.go

@@ -27,7 +27,7 @@ type MHConfig struct {
 	Simulate      bool     `yaml:"simulate"`
 	TargetContext string   `yaml:"targetContext"`
 	Team          string   `yaml:"team"`
-	CLIValues     []string `yaml:"cliValues"`
+	SETValues     []string `yaml:"setValues"`
 }
 
 // DefaultMHConfig is the default mh config and will most likely be modified
@@ -44,7 +44,7 @@ var DefaultMHConfig = MHConfig{
 	Simulate:      false,
 	TargetContext: "localhost",
 	Team:          "sre",
-	CLIValues:     []string{""},
+	SETValues:     []string{""},
 }
 
 // MergeMHConfigs merges an arbitrary number of MHConfigs with rising priority.