From 14d8e97d2a3c016d806c977a9cf0acbb4f13df8d Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Mon, 18 Mar 2019 12:45:20 -0700 Subject: [PATCH] fix(*): resolve new govet issues Signed-off-by: Adam Reese --- pkg/kube/client.go | 12 +++--------- pkg/lint/rules/template.go | 2 +- pkg/releaseutil/manifest_sorter_test.go | 7 +++---- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/pkg/kube/client.go b/pkg/kube/client.go index f520f743d..5ae72c1a9 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -409,19 +409,13 @@ func createPatch(target *resource.Info, current runtime.Object) ([]byte, types.P // returned from ConvertToVersion. Anything that's unstructured should // use the jsonpatch.CreateMergePatch. Strategic Merge Patch is not supported // on objects like CRDs. - _, isUnstructured := versionedObject.(runtime.Unstructured) - - switch { - case runtime.IsNotRegisteredError(err), isUnstructured: + if _, ok := versionedObject.(runtime.Unstructured); ok { // fall back to generic JSON merge patch patch, err := jsonpatch.CreateMergePatch(oldData, newData) return patch, types.MergePatchType, err - case err != nil: - return nil, types.StrategicMergePatchType, goerrors.Wrap(err, "failed to get versionedObject") - default: - patch, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, versionedObject) - return patch, types.StrategicMergePatchType, err } + patch, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, versionedObject) + return patch, types.StrategicMergePatchType, err } func updateResource(c *Client, target *resource.Info, currentObj runtime.Object, force, recreate bool) error { diff --git a/pkg/lint/rules/template.go b/pkg/lint/rules/template.go index e69b9e0fb..41a3c7438 100644 --- a/pkg/lint/rules/template.go +++ b/pkg/lint/rules/template.go @@ -117,7 +117,7 @@ func Templates(linter *support.Linter, values map[string]interface{}, namespace func validateTemplatesDir(templatesPath string) error { if fi, err := os.Stat(templatesPath); err != nil { return errors.New("directory not found") - } else if err == nil && !fi.IsDir() { + } else if !fi.IsDir() { return errors.New("not a directory") } return nil diff --git a/pkg/releaseutil/manifest_sorter_test.go b/pkg/releaseutil/manifest_sorter_test.go index c76b80406..fad8caf9f 100644 --- a/pkg/releaseutil/manifest_sorter_test.go +++ b/pkg/releaseutil/manifest_sorter_test.go @@ -199,8 +199,7 @@ metadata: for _, m := range manifests { var sh SimpleHead - err := yaml.Unmarshal([]byte(m), &sh) - if err != nil { + if err := yaml.Unmarshal([]byte(m), &sh); err != nil { // This is expected for manifests that are corrupt or empty. t.Log(err) continue @@ -208,8 +207,8 @@ metadata: name := sh.Metadata.Name - //only keep track of non-hook manifests - if err == nil && s.hooks[name] == nil { + // only keep track of non-hook manifests + if s.hooks[name] == nil { another := Manifest{ Content: m, Name: name,