From 50e06b14474b1acc204b7c05e85696cf69415f49 Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Tue, 14 May 2019 16:14:52 -0400 Subject: [PATCH] Adding apiVersion guidance to the linting Signed-off-by: Matt Farina --- pkg/lint/lint_test.go | 2 +- pkg/lint/rules/chartfile.go | 2 +- pkg/lint/rules/chartfile_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go index 326a02e69..962a9ca41 100644 --- a/pkg/lint/lint_test.go +++ b/pkg/lint/lint_test.go @@ -63,7 +63,7 @@ func TestBadChart(t *testing.T) { e3 = true } - if strings.Contains(msg.Err.Error(), "apiVersion is required") { + if strings.Contains(msg.Err.Error(), "apiVersion is required. The value must be either \"v1\" or \"v2\"") { e4 = true } } diff --git a/pkg/lint/rules/chartfile.go b/pkg/lint/rules/chartfile.go index 24c8a6f44..da0675868 100644 --- a/pkg/lint/rules/chartfile.go +++ b/pkg/lint/rules/chartfile.go @@ -89,7 +89,7 @@ func validateChartNameDirMatch(chartDir string, cf *chart.Metadata) error { func validateChartAPIVersion(cf *chart.Metadata) error { if cf.APIVersion == "" { - return errors.New("apiVersion is required") + return errors.New("apiVersion is required. The value must be either \"v1\" or \"v2\"") } if cf.APIVersion != "v1" && cf.APIVersion != "v2" { diff --git a/pkg/lint/rules/chartfile_test.go b/pkg/lint/rules/chartfile_test.go index 461616034..4e71b860a 100644 --- a/pkg/lint/rules/chartfile_test.go +++ b/pkg/lint/rules/chartfile_test.go @@ -221,7 +221,7 @@ func TestChartfile(t *testing.T) { t.Errorf("Unexpected message 1: %s", msgs[1].Err) } - if !strings.Contains(msgs[2].Err.Error(), "apiVersion is required") { + if !strings.Contains(msgs[2].Err.Error(), "apiVersion is required. The value must be either \"v1\" or \"v2\"") { t.Errorf("Unexpected message 2: %s", msgs[2].Err) }