Merge branch 'master' into values-arent-global

internal/helm/config.go

@@ -42,6 +42,7 @@ type Config struct {
 	Chart              string   ``                                   // Chart argument to use in applicable helm commands
 	Release            string   ``                                   // Release argument to use in applicable helm commands
 	Force              bool     ``                                   // Pass --force to applicable helm commands
+	LintStrictly       bool     `split_words:"true"`                 // Pass --strict to `helm lint`
 
 	Stdout io.Writer `ignored:"true"`
 	Stderr io.Writer `ignored:"true"`

internal/helm/plan.go

@@ -137,6 +137,7 @@ var lint = func(cfg Config) []Step {
 		Values:       cfg.Values,
 		StringValues: cfg.StringValues,
 		ValuesFiles:  cfg.ValuesFiles,
+		Strict:       cfg.LintStrictly,
 	})
 
 	return steps

internal/helm/plan_test.go

@@ -303,6 +303,7 @@ func (suite *PlanTestSuite) TestLint() {
 		Values:       "steadfastness,forthrightness",
 		StringValues: "tensile_strength,flexibility",
 		ValuesFiles:  []string{"/root/price_inventory.yml"},
+		LintStrictly: true,
 	}
 
 	steps := lint(cfg)
@@ -313,6 +314,7 @@ func (suite *PlanTestSuite) TestLint() {
 		Values:       "steadfastness,forthrightness",
 		StringValues: "tensile_strength,flexibility",
 		ValuesFiles:  []string{"/root/price_inventory.yml"},
+		Strict:       true,
 	}
 	suite.Equal(want, steps[0])
 }

internal/run/lint.go

@@ -10,6 +10,7 @@ type Lint struct {
 	Values       string
 	StringValues string
 	ValuesFiles  []string
+	Strict       bool
 	cmd          cmd
 }
 
@@ -44,6 +45,9 @@ func (l *Lint) Prepare(cfg Config) error {
 	for _, vFile := range l.ValuesFiles {
 		args = append(args, "--values", vFile)
 	}
+	if l.Strict {
+		args = append(args, "--strict")
+	}
 
 	args = append(args, l.Chart)
 

internal/run/lint_test.go

@@ -87,6 +87,7 @@ func (suite *LintTestSuite) TestPrepareWithLintFlags() {
 		Values:       "width=5",
 		StringValues: "version=2.0",
 		ValuesFiles:  []string{"/usr/local/underrides", "/usr/local/overrides"},
+		Strict:       true,
 	}
 
 	command = func(path string, args ...string) cmd {
@@ -96,6 +97,7 @@ func (suite *LintTestSuite) TestPrepareWithLintFlags() {
 			"--set-string", "version=2.0",
 			"--values", "/usr/local/underrides",
 			"--values", "/usr/local/overrides",
+			"--strict",
 			"./uk/top_40"}, args)
 
 		return suite.mockCmd