Ignore 'NoSuchBucket' error when deleting S3 objects

Also ignore any removal errors when `-force-drop` is used.

s3/public.go

@@ -190,6 +190,12 @@ func (storage *PublishedStorage) Remove(path string) error {
 	}
 	_, err := storage.s3.DeleteObject(params)
 	if err != nil {
+		if aerr, ok := err.(awserr.Error); ok {
+			if aerr.Code() == s3.ErrCodeNoSuchBucket {
+				// ignore 'no such bucket' errors on removal
+				return nil
+			}
+		}
 		return errors.Wrap(err, fmt.Sprintf("error deleting %s from %s", path, storage))
 	}
 
@@ -206,6 +212,12 @@ func (storage *PublishedStorage) RemoveDirs(path string, progress aptly.Progress
 
 	filelist, _, err := storage.internalFilelist(path, false)
 	if err != nil {
+		if aerr, ok := errors.Cause(err).(awserr.Error); ok {
+			if aerr.Code() == s3.ErrCodeNoSuchBucket {
+				// ignore 'no such bucket' errors on removal
+				return nil
+			}
+		}
 		return err
 	}
 
@@ -356,7 +368,7 @@ func (storage *PublishedStorage) internalFilelist(prefix string, hidePlusWorkaro
 	})
 
 	if err != nil {
-		return nil, nil, fmt.Errorf("error listing under prefix %s in %s: %s", prefix, storage, err)
+		return nil, nil, errors.WithMessagef(err, "error listing under prefix %s in %s: %s", prefix, storage, err)
 	}
 
 	return paths, md5s, nil

s3/public_test.go

@@ -18,6 +18,7 @@ import (
 type PublishedStorageSuite struct {
 	srv                      *Server
 	storage, prefixedStorage *PublishedStorage
+	noSuchBucketStorage      *PublishedStorage
 }
 
 var _ = Suite(&PublishedStorageSuite{})
@@ -32,6 +33,8 @@ func (s *PublishedStorageSuite) SetUpTest(c *C) {
 	c.Assert(err, IsNil)
 	s.prefixedStorage, err = NewPublishedStorage("aa", "bb", "", "test-1", s.srv.URL(), "test", "", "lala", "", "", false, true, false, false)
 	c.Assert(err, IsNil)
+	s.noSuchBucketStorage, err = NewPublishedStorage("aa", "bb", "", "test-1", s.srv.URL(), "no-bucket", "", "", "", "", false, true, false, false)
+	c.Assert(err, IsNil)
 
 	_, err = s.storage.s3.CreateBucket(&s3.CreateBucketInput{Bucket: aws.String("test")})
 	c.Assert(err, IsNil)
@@ -170,6 +173,11 @@ func (s *PublishedStorageSuite) TestRemove(c *C) {
 	s.AssertNoFile(c, "lala/xyz")
 }
 
+func (s *PublishedStorageSuite) TestRemoveNoSuchBucket(c *C) {
+	err := s.noSuchBucketStorage.Remove("a/b")
+	c.Check(err, IsNil)
+}
+
 func (s *PublishedStorageSuite) TestRemovePlusWorkaround(c *C) {
 	s.storage.plusWorkaround = true
 
@@ -218,6 +226,11 @@ func (s *PublishedStorageSuite) TestRemoveDirsPlusWorkaround(c *C) {
 	c.Check(list, DeepEquals, []string{"a", "b", "c", "lala/a", "lala/b", "lala/c", "testa"})
 }
 
+func (s *PublishedStorageSuite) TestRemoveDirsNoSuchBucket(c *C) {
+	err := s.noSuchBucketStorage.RemoveDirs("a/b", nil)
+	c.Check(err, IsNil)
+}
+
 func (s *PublishedStorageSuite) TestRenameFile(c *C) {
 	c.Skip("copy not available in s3test")
 }