Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve error handling for batch delete errors #86

Merged
merged 1 commit into from
Jun 27, 2024
Merged

improve error handling for batch delete errors #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions awss3/s3_bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ func (s *S3Bucket) Modify(bucketName string, bucketDetails BucketDetails) error
}

func (s *S3Bucket) Delete(bucketName string, deleteObjects bool) error {

deleteBucketInput := &s3.DeleteBucketInput{
Bucket: aws.String(bucketName),
}
Expand Down Expand Up @@ -340,10 +339,12 @@ func handleDeleteError(err error) error {
func isBatchDeleteNoBucketError(batchErr awserr.Error) bool {
origErr := batchErr.OrigErr()
if origBatchErrs, origAwsOk := origErr.(s3manager.Errors); origAwsOk {
for _, origBatchErr := range origBatchErrs {
if origBatchErr.OrigErr != nil {
return isNoSuchBucketError(origBatchErr.OrigErr)
}
if len(origBatchErrs) > 1 {
return false
}
origBatchErr := origBatchErrs[0]
if origBatchErr.OrigErr != nil {
return isNoSuchBucketError(origBatchErr.OrigErr)
}
}
return false
Expand Down
22 changes: 21 additions & 1 deletion awss3/s3_bucket_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,22 @@ func TestIsBatchDeleteNoBucketError(t *testing.T) {
},
},
)
batchDeleteNoSuchBucketErr2 := s3manager.NewBatchError(
"BatchedDeleteIncomplete",
"some objects have failed to be deleted.",
[]s3manager.Error{
{
OrigErr: awserr.NewRequestFailure(awserr.New("OtherError", "this is a random error", nil), 500, "req-1"),
Bucket: aws.String("bucket"),
Key: aws.String("key"),
},
{
OrigErr: awserr.NewRequestFailure(awserr.New("NoSuchBucket", "specified bucket does not exist", nil), 404, "req-1"),
Bucket: aws.String("bucket"),
Key: aws.String("key"),
},
},
)
batchDeleteOtherErr := s3manager.NewBatchError(
"BatchedDeleteIncomplete",
"some objects have failed to be deleted.",
Expand All @@ -277,10 +293,14 @@ func TestIsBatchDeleteNoBucketError(t *testing.T) {
inputErr awserr.Error
expectIsNoSuchBucketErr bool
}{
"batch delete NoSuchBucket error, expect true": {
"batch delete NoSuchBucket first error, expect true": {
inputErr: batchDeleteNoSuchBucketErr,
expectIsNoSuchBucketErr: true,
},
"batch delete NoSuchBucket second error, expect false": {
inputErr: batchDeleteNoSuchBucketErr2,
expectIsNoSuchBucketErr: false,
},
"batch delete other error, expect error": {
inputErr: batchDeleteOtherErr,
expectIsNoSuchBucketErr: false,
Expand Down