From e7d5f665b880507bd0e44636d7339eca84a98187 Mon Sep 17 00:00:00 2001 From: Christian Provenzano <18606244+caproven@users.noreply.github.com> Date: Fri, 9 Sep 2022 19:25:28 -0400 Subject: [PATCH 1/2] Fix redundant rnode metadata parsing --- api/internal/utils/makeResIds.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/api/internal/utils/makeResIds.go b/api/internal/utils/makeResIds.go index 61fbe13142..3c6c3b6fa9 100644 --- a/api/internal/utils/makeResIds.go +++ b/api/internal/utils/makeResIds.go @@ -49,12 +49,12 @@ func PrevIds(n *yaml.RNode) ([]resid.ResId, error) { "number of previous namespaces, " + "number of previous kinds not equal") } + meta, err := n.GetMeta() + if err != nil { + return nil, err + } + group, version := resid.ParseGroupVersion(meta.APIVersion) for i := range names { - meta, err := n.GetMeta() - if err != nil { - return nil, err - } - group, version := resid.ParseGroupVersion(meta.APIVersion) gvk := resid.Gvk{ Group: group, Version: version, From ca717361404744c7e34384c73af450c8c81f066a Mon Sep 17 00:00:00 2001 From: Christian Provenzano <18606244+caproven@users.noreply.github.com> Date: Fri, 9 Sep 2022 20:27:28 -0400 Subject: [PATCH 2/2] Wrap error in exported func --- api/internal/utils/makeResIds.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/internal/utils/makeResIds.go b/api/internal/utils/makeResIds.go index 3c6c3b6fa9..f11b776927 100644 --- a/api/internal/utils/makeResIds.go +++ b/api/internal/utils/makeResIds.go @@ -51,7 +51,7 @@ func PrevIds(n *yaml.RNode) ([]resid.ResId, error) { } meta, err := n.GetMeta() if err != nil { - return nil, err + return nil, fmt.Errorf("cannot parse resource metadata: %w", err) } group, version := resid.ParseGroupVersion(meta.APIVersion) for i := range names {