From 45171a52805bed43de649c345808c834d0600467 Mon Sep 17 00:00:00 2001 From: Alejandro Ruiz Date: Thu, 24 Apr 2025 16:24:08 +0200 Subject: [PATCH] Refactor decodeHelm3 so we can drop the helm dependency --- pkg/resources/formatters/formatter.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/resources/formatters/formatter.go b/pkg/resources/formatters/formatter.go index 1d4dbcfe..2d4846df 100644 --- a/pkg/resources/formatters/formatter.go +++ b/pkg/resources/formatters/formatter.go @@ -13,7 +13,6 @@ import ( "github.com/rancher/norman/types/convert" "github.com/rancher/wrangler/v3/pkg/data" "github.com/sirupsen/logrus" - "helm.sh/helm/v3/pkg/release" rspb "k8s.io/helm/pkg/proto/hapi/release" ) @@ -67,7 +66,7 @@ func Pod(_ *types.APIRequest, resource *types.RawResource) { // decodeHelm3 receives a helm3 release data string, decodes the string data using the standard base64 library // and unmarshals the data into release.Release struct to return it. -func decodeHelm3(data string) (*release.Release, error) { +func decodeHelm3(data string) (any, error) { b, err := base64.StdEncoding.DecodeString(data) if err != nil { return nil, err @@ -91,8 +90,8 @@ func decodeHelm3(data string) (*release.Release, error) { r = gzr } - var rls release.Release - // unmarshal release object bytes + var rls json.RawMessage + // unmarshal JSON release payload if err := json.NewDecoder(r).Decode(&rls); err != nil { return nil, err }