Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions packages/shared/pkg/storage/storage_aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,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"
"go.uber.org/zap"
)

const (
Expand Down Expand Up @@ -70,17 +71,33 @@ func (a *AWSBucketStorageProvider) DeleteObjectsWithPrefix(ctx context.Context,

// AWS S3 delete operation requires at least one object to delete.
if len(objects) == 0 {
zap.L().Warn("No objects found to delete with the given prefix", zap.String("prefix", prefix), zap.String("bucket", a.bucketName))
return nil
}

_, err = a.client.DeleteObjects(
output, err := a.client.DeleteObjects(
ctx, &s3.DeleteObjectsInput{
Bucket: aws.String(a.bucketName),
Delete: &types.Delete{Objects: objects},
},
)
if err != nil {
return err
}

return err
if len(output.Errors) > 0 {
var errStr string
for _, delErr := range output.Errors {
errStr += fmt.Sprintf("Key: %s, Code: %s, Message: %s; ", aws.ToString(delErr.Key), aws.ToString(delErr.Code), aws.ToString(delErr.Message))
}
return errors.New("errors occurred during deletion: " + errStr)
}

if len(output.Deleted) != len(objects) {
return errors.New("not all objects listed were deleted")
}

return nil
}

func (a *AWSBucketStorageProvider) GetDetails() string {
Expand Down
1 change: 0 additions & 1 deletion tests/integration/internal/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ func TestCacheTemplate(t *testing.T) {
t.Logf("Response error: %d %v", sbx.StatusCode(), string(sbx.Body))
default:
utils.TeardownSandbox(t, c, sbx.JSON201.SandboxID)

}
})
}
Loading