fix: handle errors in image push functions and increase timeout

Author: kamushadenes

internal/sync/images.go

@@ -2,6 +2,7 @@ package sync
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"slices"
 	"strings"
@@ -31,11 +32,23 @@ func checkRateLimit(err error) error {
 func push(ctx context.Context, image *structs.Image, desc *remote.Descriptor, dst string, tag string) error {
 	return backoff.RetryNotify(func() error {
 		if strings.HasPrefix(dst, "r2:") {
-			return pushR2(ctx, image, desc, dst, tag)
+			if err := pushR2(ctx, image, desc, dst, tag); err != nil {
+				if errors.Is(err, remote.ErrSchema1) {
+					return backoff.Permanent(err)
+				}
+				return err
+			}
+			return nil
 		}
 
 		if strings.HasPrefix(dst, "s3:") {
-			return pushS3(ctx, image, desc, dst, tag)
+			if err := pushS3(ctx, image, desc, dst, tag); err != nil {
+				if errors.Is(err, remote.ErrSchema1) {
+					return backoff.Permanent(err)
+				}
+				return err
+			}
+			return nil
 		}
 
 		pushAuth, _ := getAuth(image.GetRegistry(dst), image.GetRepository(dst))

internal/sync/s3.go

@@ -41,7 +41,7 @@ func getS3Session(url string) (*s3.S3, *string, error) {
 		Region:           region,
 		S3ForcePathStyle: aws.Bool(true),
 		HTTPClient: &http.Client{
-			Timeout: 60 * time.Second,
+			Timeout: 300 * time.Second, // Some blobs are huge
 		},
 	})
 	if err != nil {
@@ -141,7 +141,6 @@ func pushS3WithSession(ctx context.Context, s3Session *s3.S3, bucket *string, im
 			if _, err := io.Copy(tmpFile, r); err != nil {
 				return err
 			}
-			tmpFile.Seek(0, io.SeekStart)
 
 			if err := syncObject(
 				ctx,