update delete logic to handle missing bucket

awss3/s3_bucket.go

@@ -240,17 +240,10 @@ func (s *S3Bucket) Delete(bucketName string, deleteObjects bool) error {
 	}
 	deleteBucketOutput, err := s.s3svc.DeleteBucket(deleteBucketInput)
 	if err != nil {
-		s.logger.Error("aws-s3-error", err)
-		if awsErr, ok := err.(awserr.Error); ok {
-			if reqErr, ok := err.(awserr.RequestFailure); ok {
-				// AWS S3 returns a 400 if Bucket is not found
-				if reqErr.StatusCode() == 400 || reqErr.StatusCode() == 404 {
-					return ErrBucketDoesNotExist
-				}
-			}
-			return errors.New(awsErr.Code() + ": " + awsErr.Message())
+		s.logger.Error("aws-s3-delete-bucket-error", err)
+		if err := s.handleDeleteError(bucketName, err); err != nil {
+			return err
 		}
-		return err
 	}
 	s.logger.Debug("delete-bucket", lager.Data{"output": deleteBucketOutput})
 
@@ -263,11 +256,10 @@ func (s *S3Bucket) deleteBucketContents(bucketName string) error {
 	})
 
 	if err := s3manager.NewBatchDeleteWithClient(s.s3svc.(*s3.S3)).Delete(aws.BackgroundContext(), iter); err != nil {
-		s.logger.Error("aws-s3-error", err)
-		if awsErr, ok := err.(awserr.Error); ok {
-			return errors.New(awsErr.Code() + ": " + awsErr.Message())
+		s.logger.Error("aws-s3-delete-bucket-contents-error", err)
+		if err := s.handleDeleteError(bucketName, err); err != nil {
+			return err
 		}
-		return err
 	}
 	return nil
 }
@@ -338,6 +330,20 @@ func (s *S3Bucket) putBucketPolicyWithRetries(
 	return err
 }
 
+func (s *S3Bucket) handleDeleteError(bucketName string, err error) error {
+	if awsErr, ok := err.(awserr.Error); ok {
+		if isNoSuchBucketError(awsErr) {
+			s.logger.Info(fmt.Sprintf("NoSuchBucket: %s", bucketName))
+			return nil
+		}
+	}
+	return err
+}
+
+func isNoSuchBucketError(awsErr awserr.Error) bool {
+	return awsErr.Code() == "NoSuchBucket"
+}
+
 func isAccessDeniedException(err error) bool {
 	if awsErr, ok := err.(awserr.Error); ok {
 		return awsErr.Code() == "AccessDenied"

awss3/s3_bucket_test.go

@@ -210,3 +210,48 @@ func TestIsAccessDeniedException(t *testing.T) {
 		t.Fatal("expected isAccessDeniedException() to return false")
 	}
 }
+
+func TestIsNoSuchBucketError(t *testing.T) {
+	isAccessDenied := isNoSuchBucketError(awserr.New("NoSuchBucket", "no such bucket", errors.New("original error")))
+	if !isAccessDenied {
+		t.Fatal("expected isNoSuchBucketError() to return true")
+	}
+	isAccessDenied = isNoSuchBucketError(awserr.New("RandomError", "access denied", errors.New("original error")))
+	if isAccessDenied {
+		t.Fatal("expected isNoSuchBucketError() to return false")
+	}
+}
+
+func TestHandleDeleteError(t *testing.T) {
+	noSuchBucketErr := awserr.New("NoSuchBucket", "no such bucket", errors.New("original error"))
+	awsOtherErr := awserr.New("OtherError", "other error", errors.New("original error"))
+	nonAwsErr := errors.New("random error")
+
+	testCases := map[string]struct {
+		inputErr    error
+		expectedErr error
+	}{
+		"NoSuchBucket error, expect nil": {
+			inputErr: noSuchBucketErr,
+		},
+		"other AWS error, expect error": {
+			inputErr:    awsOtherErr,
+			expectedErr: awsOtherErr,
+		},
+		"non-AWS error, expect error": {
+			inputErr:    nonAwsErr,
+			expectedErr: nonAwsErr,
+		},
+	}
+
+	for name, test := range testCases {
+		t.Run(name, func(t *testing.T) {
+			mocks3Client := &MockS3Client{}
+			b := NewS3Bucket(mocks3Client, lager.NewLogger("test"))
+			err := b.handleDeleteError("fake", test.inputErr)
+			if !errors.Is(err, test.expectedErr) {
+				t.Errorf("expected return error %v, got %v", test.expectedErr, err)
+			}
+		})
+	}
+}

go.work.sum

@@ -179,6 +179,7 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
 golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=