diff --git a/api/internal/localizer/localizer.go b/api/internal/localizer/localizer.go index d975a48d8..5f654749b 100644 --- a/api/internal/localizer/localizer.go +++ b/api/internal/localizer/localizer.go @@ -105,7 +105,7 @@ func (lc *localizer) load() (*types.Kustomization, string, error) { var kust types.Kustomization err = (&kust).Unmarshal(content) if err != nil { - return nil, "", errors.WrapPrefixf(err, "invalid kustomization") + return nil, "", errors.Wrap(err) } // Localize intentionally does not replace legacy fields to return a localized kustomization diff --git a/api/internal/localizer/localizer_test.go b/api/internal/localizer/localizer_test.go index 198260b73..ae0ea3ec5 100644 --- a/api/internal/localizer/localizer_test.go +++ b/api/internal/localizer/localizer_test.go @@ -228,7 +228,7 @@ suffix: invalid`, err := Run("/a", "", "", fSysTest) require.EqualError(t, err, - `unable to localize target "/a": invalid kustomization: kustomization unmarshal error: error unmarshaling JSON: while decoding JSON: json: unknown field "suffix"`) + `unable to localize target "/a": invalid Kustomization: error unmarshaling JSON: while decoding JSON: json: unknown field "suffix"`) checkFSys(t, fSysExpected, fSysTest) } diff --git a/api/krusty/configmaps_test.go b/api/krusty/configmaps_test.go index 643015c91..251d6d825 100644 --- a/api/krusty/configmaps_test.go +++ b/api/krusty/configmaps_test.go @@ -266,7 +266,7 @@ radon t.Fatalf("expected an error") } assert.Contains(t, err.Error(), - "kustomization unmarshal error: error converting YAML to JSON: yaml: unmarshal errors:\n"+ + "invalid Kustomization: error converting YAML to JSON: yaml: unmarshal errors:\n"+ " line 13: key \"literals\" already set in map\n line 18: key \"files\" already set in map") } diff --git a/api/types/kustomization.go b/api/types/kustomization.go index 87d2e6dc3..055b94c3c 100644 --- a/api/types/kustomization.go +++ b/api/types/kustomization.go @@ -6,6 +6,7 @@ package types import ( "fmt" + "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/yaml" ) @@ -317,7 +318,7 @@ func (k *Kustomization) EnforceFields() []string { // Unmarshal replace k with the content in YAML input y func (k *Kustomization) Unmarshal(y []byte) error { if err := yaml.UnmarshalStrict(y, &k); err != nil { - return fmt.Errorf("kustomization unmarshal error: %w", err) + return errors.WrapPrefixf(err, "invalid Kustomization") } return nil } diff --git a/api/types/kustomization_test.go b/api/types/kustomization_test.go index 24b1fa3aa..ff6e9a685 100644 --- a/api/types/kustomization_test.go +++ b/api/types/kustomization_test.go @@ -278,7 +278,7 @@ unknown: foo`) if err == nil { t.Fatalf("expect an error") } - expect := "kustomization unmarshal error: error unmarshaling JSON: while decoding JSON: json: unknown field \"unknown\"" + expect := "invalid Kustomization: error unmarshaling JSON: while decoding JSON: json: unknown field \"unknown\"" if err.Error() != expect { t.Fatalf("expect %v but got: %v", expect, err.Error()) } diff --git a/kustomize/commands/internal/kustfile/kustomizationfile_test.go b/kustomize/commands/internal/kustfile/kustomizationfile_test.go index 1cc404a32..bf0a8be4a 100644 --- a/kustomize/commands/internal/kustfile/kustomizationfile_test.go +++ b/kustomize/commands/internal/kustfile/kustomizationfile_test.go @@ -383,7 +383,7 @@ foo: } _, err = mf.Read() - if err == nil || err.Error() != "kustomization unmarshal error: error unmarshaling JSON: while decoding JSON: json: unknown field \"foo\"" { + if err == nil || err.Error() != "invalid Kustomization: error unmarshaling JSON: while decoding JSON: json: unknown field \"foo\"" { t.Fatalf("Expect an unknown field error but got: %v", err) } }