fix import missing

Signed-off-by: Danilo Patrucco <danilo.patrucco@gmail.com>
pull/13205/head
Danilo Patrucco 1 year ago
parent 8cf9e82063
commit cf7eb83155

@ -1,129 +1,99 @@
/*
Copyright The Helm Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package action package action
import ( import (
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/pkg/errors" "github.com/pkg/errors"
"helm.sh/helm/v3/pkg/chartutil" "helm.sh/helm/v3/pkg/chartutil"
"helm.sh/helm/v3/pkg/lint" "helm.sh/helm/v3/pkg/lint"
"helm.sh/helm/v3/pkg/lint/support" "helm.sh/helm/v3/pkg/lint/rules"
"helm.sh/helm/v3/pkg/lint/support"
) )
// Lint is the action for checking that the semantics of a chart are well-formed. // Lint is the action for checking that the semantics of a chart are well-formed.
//
// It provides the implementation of 'helm lint'.
type Lint struct { type Lint struct {
Strict bool Strict bool
Namespace string Namespace string
WithSubcharts bool WithSubcharts bool
Quiet bool Quiet bool
KubeVersion *chartutil.KubeVersion KubeVersion *chartutil.KubeVersion
IgnoreFilePath string IgnoreFilePath string
} }
// LintResult is the result of Lint
type LintResult struct { type LintResult struct {
TotalChartsLinted int TotalChartsLinted int
Messages []support.Message Messages []support.Message
Errors []error Errors []error
} }
// NewLint creates a new Lint object with the given configuration.
func NewLint() *Lint { func NewLint() *Lint {
return &Lint{} return &Lint{}
} }
func (l *Lint) Run(paths []string, vals map[string]interface{}) *LintResult { func (l *Lint) Run(paths []string, vals map[string]interface{}) *LintResult {
lowestTolerance := support.ErrorSev lowestTolerance := support.ErrorSev
if l.Strict { if l.Strict {
lowestTolerance = support.WarningSev lowestTolerance = support.WarningSev
} }
result := &LintResult{}
for _, path := range paths { result := &LintResult{}
linter, err := lintChart(path, vals, l.Namespace, l.KubeVersion, l.IgnoreFilePath) for _, path := range paths {
if err != nil { linter, err := lintChart(path, vals, l.Namespace, l.KubeVersion, l.IgnoreFilePath)
result.Errors = append(result.Errors, err) if err != nil {
continue result.Errors = append(result.Errors, err)
} continue
}
result.Messages = append(result.Messages, linter.Messages...)
result.TotalChartsLinted++ result.Messages = append(result.Messages, linter.Messages...)
for _, msg := range linter.Messages { result.TotalChartsLinted++
if msg.Severity >= lowestTolerance { for _, msg := range linter.Messages {
result.Errors = append(result.Errors, msg.Err) if msg.Severity >= lowestTolerance {
} result.Errors = append(result.Errors, msg.Err)
} }
} }
return result }
return result
} }
func HasWarningsOrErrors(result *LintResult) bool {
for _, msg := range result.Messages {
if msg.Severity > support.InfoSev {
return true
}
}
return len(result.Errors) > 0
}
func lintChart(path string, vals map[string]interface{}, namespace string, kubeVersion *chartutil.KubeVersion, ignoreFilePath string) (support.Linter, error) { func lintChart(path string, vals map[string]interface{}, namespace string, kubeVersion *chartutil.KubeVersion, ignoreFilePath string) (support.Linter, error) {
var chartPath string var chartPath string
linter := support.Linter{} linter := support.Linter{}
if strings.HasSuffix(path, ".tgz") || strings.HasSuffix(path, ".tar.gz") { if strings.HasSuffix(path, ".tgz") || strings.HasSuffix(path, ".tar.gz") {
tempDir, err := os.MkdirTemp("", "helm-lint") tempDir, err := os.MkdirTemp("", "helm-lint")
if err != nil { if err != nil {
return linter, errors.Wrap(err, "unable to create temp dir to extract tarball") return linter, errors.Wrap(err, "unable to create temp dir to extract tarball")
} }
defer os.RemoveAll(tempDir) defer os.RemoveAll(tempDir)
file, err := os.Open(path) file, err := os.Open(path)
if err != nil { if err != nil {
return linter, errors.Wrap(err, "unable to open tarball") return linter, errors.Wrap(err, "unable to open tarball")
} }
defer file.Close() defer file.Close()
if err = chartutil.Expand(tempDir, file); err != nil { if err = chartutil.Expand(tempDir, file); err != nil {
return linter, errors.Wrap(err, "unable to extract tarball") return linter, errors.Wrap(err, "unable to extract tarball")
} }
files, err := os.ReadDir(tempDir) files, err := os.ReadDir(tempDir)
if err != nil { if err != nil {
return linter, errors.Wrapf(err, "unable to read temporary output directory %s", tempDir) return linter, errors.Wrapf(err, "unable to read temporary output directory %s", tempDir)
} }
if !files[0].IsDir() { if !files[0].IsDir() {
return linter, errors.Errorf("unexpected file %s in temporary output directory %s", files[0].Name(), tempDir) return linter, errors.Errorf("unexpected file %s in temporary output directory %s", files[0].Name(), tempDir)
} }
chartPath = filepath.Join(tempDir, files[0].Name()) chartPath = filepath.Join(tempDir, files[0].Name())
} else { } else {
chartPath = path chartPath = path
} }
// Guard: Error out if this is not a chart. if _, err := os.Stat(filepath.Join(chartPath, "Chart.yaml")); err != nil {
if _, err := os.Stat(filepath.Join(chartPath, "Chart.yaml")); err != nil { return linter, errors.Wrap(err, "Chart.yaml file not found in chart")
return linter, errors.Wrap(err, "unable to check Chart.yaml file in chart") }
} ignorePatterns, err := rules.ParseIgnoreFile(ignoreFilePath)
if err != nil {
return lint.AllWithKubeVersion(chartPath, vals, namespace, kubeVersion, ignoreFilePath), nil return linter, errors.Wrap(err, "failed to parse .helmlintignore file")
}
return lint.AllWithKubeVersion(chartPath, vals, namespace, kubeVersion, ignorePatterns), nil
} }

@ -3,6 +3,7 @@ package rules
import ( import (
"path/filepath" "path/filepath"
"strings" "strings"
"fmt"
) )
func IsIgnored(path string, patterns []string) bool { func IsIgnored(path string, patterns []string) bool {
@ -10,6 +11,7 @@ func IsIgnored(path string, patterns []string) bool {
cleanedPath := filepath.Clean(path) cleanedPath := filepath.Clean(path)
cleanedPattern := filepath.Clean(pattern) cleanedPattern := filepath.Clean(pattern)
if match, err := filepath.Match(cleanedPattern, cleanedPath); err == nil && match { if match, err := filepath.Match(cleanedPattern, cleanedPath); err == nil && match {
fmt.Printf("Ignoring path: %s due to pattern: %s\n", path, pattern)
return true return true
} }
if strings.HasSuffix(cleanedPattern, "/") || strings.HasSuffix(cleanedPattern, "\\") { if strings.HasSuffix(cleanedPattern, "/") || strings.HasSuffix(cleanedPattern, "\\") {

Loading…
Cancel
Save