use fmt and errors pkgs to replace github error pkg

Signed-off-by: James Sheppard <jgsheppa@protonmail.com>
pull/12063/head
James Sheppard 2 years ago
parent 254bddaa7a
commit d67f5fd0c6

@ -17,13 +17,13 @@ limitations under the License.
package rules // import "helm.sh/helm/v3/pkg/lint/rules" package rules // import "helm.sh/helm/v3/pkg/lint/rules"
import ( import (
"errors"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"github.com/Masterminds/semver/v3" "github.com/Masterminds/semver/v3"
"github.com/asaskevich/govalidator" "github.com/asaskevich/govalidator"
"github.com/pkg/errors"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
"helm.sh/helm/v3/pkg/chart" "helm.sh/helm/v3/pkg/chart"
@ -81,7 +81,7 @@ func isStringValue(data map[string]interface{}, key string) error {
} }
valueType := fmt.Sprintf("%T", value) valueType := fmt.Sprintf("%T", value)
if valueType != "string" { if valueType != "string" {
return errors.Errorf("%s should be of type string but it's of type %s", key, valueType) return fmt.Errorf("%s should be of type string but it's of type %s", key, valueType)
} }
return nil return nil
} }
@ -97,7 +97,7 @@ func validateChartYamlNotDirectory(chartPath string) error {
func validateChartYamlFormat(chartFileError error) error { func validateChartYamlFormat(chartFileError error) error {
if chartFileError != nil { if chartFileError != nil {
return errors.Errorf("unable to parse YAML\n\t%s", chartFileError.Error()) return fmt.Errorf("unable to parse YAML\n\t%s", chartFileError.Error())
} }
return nil return nil
} }
@ -129,7 +129,7 @@ func validateChartVersion(cf *chart.Metadata) error {
version, err := semver.NewVersion(cf.Version) version, err := semver.NewVersion(cf.Version)
if err != nil { if err != nil {
return errors.Errorf("version '%s' is not a valid SemVer", cf.Version) return fmt.Errorf("version '%s' is not a valid SemVer", cf.Version)
} }
c, err := semver.NewConstraint(">0.0.0-0") c, err := semver.NewConstraint(">0.0.0-0")
@ -139,7 +139,7 @@ func validateChartVersion(cf *chart.Metadata) error {
valid, msg := c.Validate(version) valid, msg := c.Validate(version)
if !valid && len(msg) > 0 { if !valid && len(msg) > 0 {
return errors.Errorf("version %v", msg[0]) return fmt.Errorf("version %v", msg[0])
} }
return nil return nil
@ -150,9 +150,9 @@ func validateChartMaintainer(cf *chart.Metadata) error {
if maintainer.Name == "" { if maintainer.Name == "" {
return errors.New("each maintainer requires a name") return errors.New("each maintainer requires a name")
} else if maintainer.Email != "" && !govalidator.IsEmail(maintainer.Email) { } else if maintainer.Email != "" && !govalidator.IsEmail(maintainer.Email) {
return errors.Errorf("invalid email '%s' for maintainer '%s'", maintainer.Email, maintainer.Name) return fmt.Errorf("invalid email '%s' for maintainer '%s'", maintainer.Email, maintainer.Name)
} else if maintainer.URL != "" && !govalidator.IsURL(maintainer.URL) { } else if maintainer.URL != "" && !govalidator.IsURL(maintainer.URL) {
return errors.Errorf("invalid url '%s' for maintainer '%s'", maintainer.URL, maintainer.Name) return fmt.Errorf("invalid url '%s' for maintainer '%s'", maintainer.URL, maintainer.Name)
} }
} }
return nil return nil
@ -161,7 +161,7 @@ func validateChartMaintainer(cf *chart.Metadata) error {
func validateChartSources(cf *chart.Metadata) error { func validateChartSources(cf *chart.Metadata) error {
for _, source := range cf.Sources { for _, source := range cf.Sources {
if source == "" || !govalidator.IsRequestURL(source) { if source == "" || !govalidator.IsRequestURL(source) {
return errors.Errorf("invalid source URL '%s'", source) return fmt.Errorf("invalid source URL '%s'", source)
} }
} }
return nil return nil
@ -176,7 +176,7 @@ func validateChartIconPresence(cf *chart.Metadata) error {
func validateChartIconURL(cf *chart.Metadata) error { func validateChartIconURL(cf *chart.Metadata) error {
if cf.Icon != "" && !govalidator.IsRequestURL(cf.Icon) { if cf.Icon != "" && !govalidator.IsRequestURL(cf.Icon) {
return errors.Errorf("invalid icon URL '%s'", cf.Icon) return fmt.Errorf("invalid icon URL '%s'", cf.Icon)
} }
return nil return nil
} }

Loading…
Cancel
Save