fix: don't close zip too early

Author: 0x416e746f6e

server/docker.go

@@ -91,29 +91,19 @@ func (s *Server) prepareIndexManifestForDestination(
 func (s *Server) prepareImageForUpload(
 	ctx context.Context,
 	j job.UploadableContainer,
-	zname string,
+	stream *zip.ReadCloser,
 	dst *config.Destination,
 ) (
 	crname.Reference, cr.Image, cr.ImageIndex, error,
 ) {
 	l := logutils.LoggerFromContext(ctx)
 
-	var z *zip.ReadCloser
-	{ // open archive
-		_z, err := zip.OpenReader(zname)
-		if err != nil {
-			return nil, nil, nil, fmt.Errorf("failed to open zip file: %w", err)
-		}
-		defer _z.Close()
-		z = _z
-	}
-
 	errs := make([]error, 0)
 
 	var containers = make(map[string]*container, 0)
 	var indexManifest *cr.IndexManifest
 	{ // get index and images
-		for _, f := range z.File {
+		for _, f := range stream.File {
 			if f.FileInfo().IsDir() {
 				continue
 			}
@@ -203,7 +193,7 @@ func (s *Server) prepareImageForUpload(
 		}
 	}
 	if len(containers) == 0 {
-		l.Debug("No matching platforms, skipping...")
+		l.Info("No matching platforms, skipping...")
 		return nil, nil, nil, utils.FlattenErrors(errs)
 	}
 

server/upload_gcp_docker.go

@@ -4,6 +4,7 @@ import (
 	"archive/zip"
 	"context"
 	"errors"
+	"fmt"
 	"io"
 	"time"
 
@@ -28,9 +29,21 @@ func (s *Server) uploadFromZipToGcpArtifactRegistryDocker(
 ) error {
 	l := logutils.LoggerFromContext(ctx)
 
-	ref, image, index, err := s.prepareImageForUpload(ctx, j, zname, dst)
+	var z *zip.ReadCloser
+	{ // open archive
+		_z, err := zip.OpenReader(zname)
+		if err != nil {
+			return fmt.Errorf("failed to open zip file: %w", err)
+		}
+		defer _z.Close()
+		z = _z
+	}
+
+	ref, image, index, err := s.prepareImageForUpload(ctx, j, z, dst)
 	if ref == nil || (image == nil && index == nil) {
-		l.Error("Failed to prepare image for upload", zap.Error(err))
+		if err != nil {
+			l.Error("Failed to prepare image for upload", zap.Error(err))
+		}
 		return err
 	} else if err != nil {
 		l.Warn("There were issues while preparing image for upload", zap.Error(err))