rancher/steve
1
0
Fork 0
mirror of https://github.com/rancher/steve.git synced 2025-07-31 06:23:11 +00:00
Code Issues Projects Releases Wiki Activity

Small refactor around decoding

Browse Source
This commit is contained in:
Alejandro Ruiz 2025-04-24 12:30:21 +02:00
parent e16f85944b
commit cdd4df62fd
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ func HandleHelmData(request *types.APIRequest, resource *types.RawResource) {
} }
} }
func Pod(request *types.APIRequest, resource *types.RawResource) { func Pod(_ *types.APIRequest, resource *types.RawResource) {
data := resource.APIObject.Data() data := resource.APIObject.Data()
fields := data.StringSlice("metadata", "fields") fields := data.StringSlice("metadata", "fields")
if len(fields) > 2 { if len(fields) > 2 {
@ -77,25 +77,23 @@ func decodeHelm3(data string) (*release.Release, error) {
if len(b) <= 3 { if len(b) <= 3 {
return nil, ErrNotHelmRelease return nil, ErrNotHelmRelease
} }
var r io.Reader = bytes.NewReader(b)
// For backwards compatibility with releases that were stored before // For backwards compatibility with releases that were stored before
// compression was introduced we skip decompression if the // compression was introduced we skip decompression if the
// gzip magic header is not found // gzip magic header is not found
if bytes.Equal(b[0:3], magicGzip) { if bytes.Equal(b[0:3], magicGzip) {
r, err := gzip.NewReader(bytes.NewReader(b)) gzr, err := gzip.NewReader(r)
if err != nil { if err != nil {
return nil, err return nil, err
} }
b2, err := io.ReadAll(r) defer gzr.Close()
if err != nil { r = gzr
return nil, err
}
b = b2
} }
var rls release.Release var rls release.Release
// unmarshal release object bytes // unmarshal release object bytes
if err := json.Unmarshal(b, &rls); err != nil { if err := json.NewDecoder(r).Decode(&rls); err != nil {
return nil, err return nil, err
} }
return &rls, nil return &rls, nil
@ -116,6 +114,8 @@ func decodeHelm2(data string) (*rspb.Release, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
defer r.Close()
b2, err := io.ReadAll(r) b2, err := io.ReadAll(r)
if err != nil { if err != nil {
return nil, err return nil, err