rancher/steve
1
0
Fork 0
mirror of https://github.com/rancher/steve.git synced 2025-10-21 15:28:52 +00:00
Code Issues Projects Releases Wiki Activity

Refactor decodeHelm3 so we can drop the helm dependency

Browse Source
This commit is contained in:
Alejandro Ruiz
2025-04-24 16:24:08 +02:00
parent cdd4df62fd
commit 45171a5280
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/resources/formatters/formatter.go
View File

@@ -13,7 +13,6 @@ import (
"github.com/rancher/norman/types/convert" "github.com/rancher/norman/types/convert"
"github.com/rancher/wrangler/v3/pkg/data" "github.com/rancher/wrangler/v3/pkg/data"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"helm.sh/helm/v3/pkg/release"
rspb "k8s.io/helm/pkg/proto/hapi/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 // 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. // 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) b, err := base64.StdEncoding.DecodeString(data)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -91,8 +90,8 @@ func decodeHelm3(data string) (*release.Release, error) {
r = gzr r = gzr
} }
var rls release.Release var rls json.RawMessage
// unmarshal release object bytes // unmarshal JSON release payload
if err := json.NewDecoder(r).Decode(&rls); err != nil { if err := json.NewDecoder(r).Decode(&rls); err != nil {
return nil, err return nil, err
} }