Skip to content

Commit 8584c8c

Browse files
author
alexander-demicev
committed
Fix close() error override
Signed-off-by: alexander-demicev <alexandr.demicev@suse.com>
1 parent 8bff9b7 commit 8584c8c

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

internal/controller/manifests_downloader.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ const (
4141
configMapSourceLabel = "provider.cluster.x-k8s.io/source"
4242
configMapSourceAnnotation = "provider.cluster.x-k8s.io/source"
4343
operatorManagedLabel = "managed-by.operator.cluster.x-k8s.io"
44-
operatorCacheLabel = "cached-by.operator.cluster.x-k8s.io"
4544

4645
maxConfigMapSize = 1 * 1024 * 1024
4746
ociSource = "oci"
@@ -220,12 +219,14 @@ func TemplateManifestsConfigMap(provider operatorv1.GenericProvider, labels map[
220219
func compressData(componentsBuf *bytes.Buffer, data []byte) (err error) {
221220
zw := gzip.NewWriter(componentsBuf)
222221

223-
_, err = zw.Write(data)
224222
defer func() {
225-
err = zw.Close()
223+
closeErr := zw.Close()
224+
if err == nil {
225+
err = closeErr
226+
}
226227
}()
227228

228-
if err != nil {
229+
if _, err = zw.Write(data); err != nil {
229230
return fmt.Errorf("cannot compress data: %w", err)
230231
}
231232

@@ -240,7 +241,10 @@ func decompressData(compressedData []byte) (data []byte, err error) {
240241
}
241242

242243
defer func() {
243-
err = zr.Close()
244+
closeErr := zr.Close()
245+
if err == nil {
246+
err = closeErr
247+
}
244248
}()
245249

246250
decompressedData, err := io.ReadAll(zr)

0 commit comments

Comments
 (0)