From f273510c978d36c5f8139be31dbc7388a93c7706 Mon Sep 17 00:00:00 2001 From: Adnan Abdulhussein Date: Fri, 1 Jul 2016 15:20:13 -0700 Subject: [PATCH] fix(lint): fix golint errors --- cmd/helm/lint.go | 4 ++-- pkg/lint/rules/template_test.go | 4 ++-- pkg/lint/support/message.go | 1 + pkg/lint/support/message_test.go | 16 ++++++++-------- pkg/repo/repo.go | 1 + 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/cmd/helm/lint.go b/cmd/helm/lint.go index 660973183..3d173790c 100644 --- a/cmd/helm/lint.go +++ b/cmd/helm/lint.go @@ -73,10 +73,10 @@ func lintCmd(cmd *cobra.Command, args []string) error { msg := fmt.Sprintf("%d chart(s) linted", len(paths)) if failures > 0 { - return fmt.Errorf("%s. %d chart(s) failed.", msg, failures) + return fmt.Errorf("%s, %d chart(s) failed", msg, failures) } - fmt.Printf("%s. No failures.\n", msg) + fmt.Printf("%s, no failures\n", msg) return nil } diff --git a/pkg/lint/rules/template_test.go b/pkg/lint/rules/template_test.go index dbd792774..c60152794 100644 --- a/pkg/lint/rules/template_test.go +++ b/pkg/lint/rules/template_test.go @@ -90,8 +90,8 @@ func TestTemplateParsing(t *testing.T) { } } -var wrongTemplatePath string = filepath.Join(templateTestBasedir, "templates", "fail.yaml") -var ignoredTemplatePath string = filepath.Join(templateTestBasedir, "fail.yaml.ignored") +var wrongTemplatePath = filepath.Join(templateTestBasedir, "templates", "fail.yaml") +var ignoredTemplatePath = filepath.Join(templateTestBasedir, "fail.yaml.ignored") // Test a template with all the existing features: // namespaces, partial templates diff --git a/pkg/lint/support/message.go b/pkg/lint/support/message.go index 05de920e6..6a878031a 100644 --- a/pkg/lint/support/message.go +++ b/pkg/lint/support/message.go @@ -53,6 +53,7 @@ func (m Message) Error() string { return fmt.Sprintf("[%s] %s: %s", sev[m.Severity], m.Path, m.Err.Error()) } +// NewMessage creates a new Message struct func NewMessage(severity int, path string, err error) Message { return Message{Severity: severity, Path: path, Err: err} } diff --git a/pkg/lint/support/message_test.go b/pkg/lint/support/message_test.go index b2a4d4d98..4a9c33c34 100644 --- a/pkg/lint/support/message_test.go +++ b/pkg/lint/support/message_test.go @@ -22,7 +22,7 @@ import ( ) var linter = Linter{} -var lintError = errors.New("lint failed") +var errLint = errors.New("lint failed") func TestRunLinterRule(t *testing.T) { var tests = []struct { @@ -32,17 +32,17 @@ func TestRunLinterRule(t *testing.T) { ExpectedReturn bool ExpectedHighestSeverity int }{ - {InfoSev, lintError, 1, false, InfoSev}, - {WarningSev, lintError, 2, false, WarningSev}, - {ErrorSev, lintError, 3, false, ErrorSev}, + {InfoSev, errLint, 1, false, InfoSev}, + {WarningSev, errLint, 2, false, WarningSev}, + {ErrorSev, errLint, 3, false, ErrorSev}, // No error so it returns true {ErrorSev, nil, 3, true, ErrorSev}, // Retains highest severity - {InfoSev, lintError, 4, false, ErrorSev}, + {InfoSev, errLint, 4, false, ErrorSev}, // Invalid severity values - {4, lintError, 4, false, ErrorSev}, - {22, lintError, 4, false, ErrorSev}, - {-1, lintError, 4, false, ErrorSev}, + {4, errLint, 4, false, ErrorSev}, + {22, errLint, 4, false, ErrorSev}, + {-1, errLint, 4, false, ErrorSev}, } for _, test := range tests { diff --git a/pkg/repo/repo.go b/pkg/repo/repo.go index b9f8fda44..b113629f2 100644 --- a/pkg/repo/repo.go +++ b/pkg/repo/repo.go @@ -118,6 +118,7 @@ func (r *ChartRepository) saveIndexFile() error { return ioutil.WriteFile(filepath.Join(r.RootPath, indexPath), index, 0644) } +// Index generates an index for the chart repository and writes an index.yaml file func (r *ChartRepository) Index() error { if r.IndexFile == nil { r.IndexFile = &IndexFile{Entries: make(map[string]*ChartRef)}