Merge pull request #208 from gitpod-io/aledbf/s3-error

Do not return errors uploading to S3

Author: aledbf

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/config v1.29.6
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.59
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.75.4
+	github.com/aws/smithy-go v1.22.2
 	github.com/creack/pty v1.1.23
 	github.com/disiqueira/gotree v1.0.0
 	github.com/dop251/goja v0.0.0-20241024094426-79f3a7efcdbd
@@ -47,7 +48,6 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sso v1.24.15 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.14 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.33.14 // indirect
-	github.com/aws/smithy-go v1.22.2 // indirect
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/cyphar/filepath-securejoin v0.2.3 // indirect

pkg/leeway/cache/remote/s3.go

@@ -16,6 +16,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
+	"github.com/aws/smithy-go"
 	log "github.com/sirupsen/logrus"
 
 	"github.com/gitpod-io/leeway/pkg/leeway/cache"
@@ -480,7 +481,6 @@ func (s *S3Storage) UploadObject(ctx context.Context, key string, src string) er
 		u.PartSize = defaultS3PartSize
 	})
 
-	// For multipart uploads, we use a different approach with checksums
 	input := &s3.PutObjectInput{
 		Bucket: aws.String(s.bucketName),
 		Key:    aws.String(key),
@@ -489,6 +489,11 @@ func (s *S3Storage) UploadObject(ctx context.Context, key string, src string) er
 
 	_, err = uploader.Upload(ctx, input)
 	if err != nil {
+		var apiErr smithy.APIError
+		if errors.As(err, &apiErr) && apiErr.ErrorCode() == "Forbidden" {
+			log.WithError(err).Warnf("permission denied while uploading object %s to S3 - continuing", key)
+			return nil
+		}
 		return fmt.Errorf("failed to upload object: %w", err)
 	}
 

pkg/leeway/cache/remote/s3_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
+	"github.com/aws/smithy-go"
 	"github.com/gitpod-io/leeway/pkg/leeway/cache"
 	"github.com/google/go-cmp/cmp"
 )
@@ -377,6 +378,24 @@ func TestS3Cache_Upload(t *testing.T) {
 			},
 			expectError: true,
 		},
+		{
+			name: "403 forbidden error should not fail",
+			packages: []cache.Package{
+				&mockPackage{version: "v1"},
+			},
+			mockPutObject: func(key string) error {
+				return &smithy.GenericAPIError{
+					Code:    "Forbidden",
+					Message: "Access Denied",
+				}
+			},
+			localCache: &mockLocalCache{
+				locations: map[string]string{
+					"v1": filepath.Join(tmpDir, "pkg1.tar.gz"),
+				},
+			},
+			expectError: false,
+		},
 	}
 
 	for _, tt := range tests {