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,19 +1,3 @@
/*
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
import (
@ -25,12 +9,11 @@ import (
"helm.sh/helm/v3/pkg/chartutil"
"helm.sh/helm/v3/pkg/lint"
"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.
//
// It provides the implementation of 'helm lint'.
type Lint struct {
Strict bool
Namespace string
@ -39,25 +22,20 @@ type Lint struct {
KubeVersion *chartutil.KubeVersion
IgnoreFilePath string
}
// LintResult is the result of Lint
type LintResult struct {
TotalChartsLinted int
Messages []support.Message
Errors []error
}
// NewLint creates a new Lint object with the given configuration.
func NewLint() *Lint {
return &Lint{}
}
func (l *Lint) Run(paths []string, vals map[string]interface{}) *LintResult {
lowestTolerance := support.ErrorSev
if l.Strict {
lowestTolerance = support.WarningSev
}
result := &LintResult{}
for _, path := range paths {
linter, err := lintChart(path, vals, l.Namespace, l.KubeVersion, l.IgnoreFilePath)
@ -76,16 +54,6 @@ func (l *Lint) Run(paths []string, vals map[string]interface{}) *LintResult {
}
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) {
var chartPath string
linter := support.Linter{}
@ -120,10 +88,12 @@ func lintChart(path string, vals map[string]interface{}, namespace string, kubeV
chartPath = path
}
// Guard: Error out if this is not a chart.
if _, err := os.Stat(filepath.Join(chartPath, "Chart.yaml")); err != nil {
return linter, errors.Wrap(err, "unable to check Chart.yaml file in chart")
return linter, errors.Wrap(err, "Chart.yaml file not found in chart")
}
return lint.AllWithKubeVersion(chartPath, vals, namespace, kubeVersion, ignoreFilePath), nil
ignorePatterns, err := rules.ParseIgnoreFile(ignoreFilePath)
if err != 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 (
"path/filepath"
"strings"
"fmt"
)
func IsIgnored(path string, patterns []string) bool {
@ -10,6 +11,7 @@ func IsIgnored(path string, patterns []string) bool {
cleanedPath := filepath.Clean(path)
cleanedPattern := filepath.Clean(pattern)
if match, err := filepath.Match(cleanedPattern, cleanedPath); err == nil && match {
fmt.Printf("Ignoring path: %s due to pattern: %s\n", path, pattern)
return true
}
if strings.HasSuffix(cleanedPattern, "/") || strings.HasSuffix(cleanedPattern, "\\") {

Loading…
Cancel
Save