add tests

Signed-off-by: cpanato <[email protected]>

Author: cpanato

pkg/chart/chart.go

@@ -280,19 +280,23 @@ func (t *Testing) LintChart(chart string, valuesFiles []string) TestResult {
 	chartYaml := path.Join(chart, "Chart.yaml")
 	valuesYaml := path.Join(chart, "values.yaml")
 
-	if err := t.linter.Yamale(chartYaml, t.config.ChartYamlSchema); err != nil {
-		result.Error = err
-		return result
-	}
-
-	yamlFiles := append([]string{chartYaml, valuesYaml}, valuesFiles...)
-	for _, yamlFile := range yamlFiles {
-		if err := t.linter.YamlLint(yamlFile, t.config.LintConf); err != nil {
+	if !t.config.NoChartSchemaValidation {
+		if err := t.linter.Yamale(chartYaml, t.config.ChartYamlSchema); err != nil {
 			result.Error = err
 			return result
 		}
 	}
 
+	if !t.config.NoYamlLint {
+		yamlFiles := append([]string{chartYaml, valuesYaml}, valuesFiles...)
+		for _, yamlFile := range yamlFiles {
+			if err := t.linter.YamlLint(yamlFile, t.config.LintConf); err != nil {
+				result.Error = err
+				return result
+			}
+		}
+	}
+
 	if t.config.ValidateMaintainers {
 		if err := t.ValidateMaintainers(chart); err != nil {
 			result.Error = err

pkg/chart/chart_test.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/helm/chart-testing/pkg/config"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 )
 
 type fakeGit struct{}
@@ -99,6 +100,19 @@ type fakeLinter struct{}
 func (l fakeLinter) YamlLint(yamlFile, configFile string) error { return nil }
 func (l fakeLinter) Yamale(yamlFile, schemaFile string) error   { return nil }
 
+type fakeLinter2 struct {
+	mock.Mock
+}
+
+func (l *fakeLinter2) YamlLint(yamlFile, configFile string) error {
+	l.Called(yamlFile, configFile)
+	return nil
+}
+func (l *fakeLinter2) Yamale(yamlFile, schemaFile string) error {
+	l.Called(yamlFile, schemaFile)
+	return nil
+}
+
 type fakeHelm struct{}
 
 func (h fakeHelm) Init() error                                          { return nil }
@@ -200,3 +214,95 @@ func TestLintChartMaintainerValidation(t *testing.T) {
 	runTests(true)
 	runTests(false)
 }
+
+func TestLintNoChartSchemaValidation(t *testing.T) {
+	type testData struct {
+		name     string
+		chartDir string
+		expected bool
+	}
+
+	runTests := func(noValidation bool, callsYamlLint, callsYamale int) {
+		var fakeMockLinter = new(fakeLinter2)
+
+		fakeMockLinter.On("Yamale", mock.Anything, mock.Anything).Return(true)
+		fakeMockLinter.On("YamlLint", mock.Anything, mock.Anything).Return(true)
+
+		ct.linter = fakeMockLinter
+		ct.config.NoChartSchemaValidation = noValidation
+		ct.config.ValidateMaintainers = false
+		ct.config.NoYamlLint = false
+
+		var suffix string
+		if noValidation {
+			suffix = "without-validation"
+		} else {
+			suffix = "with-validation"
+		}
+
+		testCases := []testData{
+			{fmt.Sprintf("schema-%s", suffix), "testdata/test_lints", true},
+		}
+
+		for _, testData := range testCases {
+			t.Run(testData.name, func(t *testing.T) {
+				result := ct.LintChart(testData.chartDir, []string{})
+				assert.Equal(t, testData.expected, result.Error == nil)
+				fakeMockLinter.AssertNumberOfCalls(t, "Yamale", callsYamale)
+				fakeMockLinter.AssertNumberOfCalls(t, "YamlLint", callsYamlLint)
+			})
+		}
+	}
+
+	// will run the schema validation
+	runTests(false, 2, 1)
+	// will not run the schema validation
+	runTests(true, 2, 0)
+
+}
+
+func TestLintNoYamlLintValidation(t *testing.T) {
+	type testData struct {
+		name     string
+		chartDir string
+		expected bool
+	}
+
+	runTests := func(noValidation bool, callsYamlLint, callsYamale int) {
+
+		var fakeMockLinter = new(fakeLinter2)
+
+		fakeMockLinter.On("Yamale", mock.Anything, mock.Anything).Return(true)
+		fakeMockLinter.On("YamlLint", mock.Anything, mock.Anything).Return(true)
+
+		ct.linter = fakeMockLinter
+		ct.config.NoYamlLint = noValidation
+		ct.config.NoChartSchemaValidation = false
+		ct.config.ValidateMaintainers = false
+
+		var suffix string
+		if noValidation {
+			suffix = "without-yaml-validation"
+		} else {
+			suffix = "with-yaml-validation"
+		}
+
+		testCases := []testData{
+			{fmt.Sprintf("lint-%s", suffix), "testdata/test_lints", true},
+		}
+
+		for _, testData := range testCases {
+			t.Run(testData.name, func(t *testing.T) {
+				result := ct.LintChart(testData.chartDir, []string{})
+				assert.Equal(t, testData.expected, result.Error == nil)
+				fakeMockLinter.AssertNumberOfCalls(t, "Yamale", callsYamale)
+				fakeMockLinter.AssertNumberOfCalls(t, "YamlLint", callsYamlLint)
+			})
+		}
+	}
+
+	// will run the lint validation
+	runTests(false, 2, 1)
+	// will not run the lint validation
+	runTests(true, 0, 1)
+}

pkg/chart/testdata/test_lints/Chart.yaml

@@ -0,0 +1,10 @@
+apiVersion: v1
+appVersion: xoxo
+description: A Helm chart for testing
+name: invalid
+version: 1.2.3
+home: https://github.com/helm/chart-testing
+maintainers:
+  - name: invalid
+  - email: [email protected]
+

pkg/chart/testdata/test_lints/values.yaml

@@ -0,0 +1,3 @@
+test: abc
+list:
+  - abc

pkg/config/config_test.go

@@ -38,6 +38,8 @@ func loadAndAssertConfigFromFile(t *testing.T, configFile string) {
 	require.Equal(t, "my-lint-conf.yaml", cfg.LintConf)
 	require.Equal(t, "my-chart-yaml-schema.yaml", cfg.ChartYamlSchema)
 	require.Equal(t, true, cfg.ValidateMaintainers)
+	require.Equal(t, false, cfg.NoChartSchemaValidation)
+	require.Equal(t, false, cfg.NoYamlLint)
 	require.Equal(t, true, cfg.CheckVersionIncrement)
 	require.Equal(t, false, cfg.ProcessAllCharts)
 	require.Equal(t, []string{"incubator=https://incubator"}, cfg.ChartRepos)

pkg/config/test_config.json

@@ -6,6 +6,8 @@
     "chart-yaml-schema": "my-chart-yaml-schema.yaml",
     "github-instance": "https://github.com",
     "validate-maintainers": true,
+    "no-chart-schema-validation": false,
+    "no-yaml-lint": false,
     "check-version-increment": true,
     "all": false,
     "chart-repos": [

pkg/config/test_config.yaml

@@ -5,6 +5,8 @@ lint-conf: my-lint-conf.yaml
 chart-yaml-schema: my-chart-yaml-schema.yaml
 github-instance: https://github.com
 validate-maintainers: true
+no-chart-schema-validation: false
+no-yaml-lint: false
 check-version-increment: true
 all: false
 chart-repos: