Skip to content

Commit

Permalink
Merge pull request openshift#3301 from cheesesashimi/zzlotnik/fix-con…
Browse files Browse the repository at this point in the history
…fig-decompression

fixes config decompression lint issue
  • Loading branch information
openshift-merge-robot authored Aug 23, 2022
2 parents bfb5d9f + 49b591c commit f21482c
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions pkg/controller/common/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -585,21 +585,19 @@ func decompressPayload(r io.Reader) ([]byte, error) {
return nil, errConfigNotGzipped
}

out := bytes.NewBuffer([]byte{})

gz, err := gzip.NewReader(in)
if err != nil {
return nil, fmt.Errorf("initialize gzip reader failed: %w", err)
}

defer gz.Close()

// Decompress our payload.
if _, err := io.Copy(out, gz); err != nil {
data, err := ioutil.ReadAll(gz)
if err != nil {
return nil, fmt.Errorf("decompression failed: %w", err)
}

return out.Bytes(), nil
return data, nil
}

// Function to remove duplicated files/units/users from a V2 MC, since the translator
Expand Down

0 comments on commit f21482c

Please sign in to comment.