Fixed an issue where IAmazonS3.EnsureBucketExists(Async) was throwing an exception if S3 bucket already exists in the executing account.

Author: ashishdhingra

generator/.DevConfigs/ed078ac7-c659-4cce-ad66-d313e8f48ffb.json

@@ -0,0 +1,9 @@
+{
+  "services": [
+    {
+      "serviceName": "S3",
+      "type": "patch",
+      "changeLogMessages": [ "Fixed an issue where IAmazonS3.EnsureBucketExists(Async) was throwing an exception if S3 bucket already exists in the executing account." ]
+    }
+  ]
+}

sdk/src/Services/S3/Custom/_async/AmazonS3Client.Extensions.cs

@@ -143,9 +143,15 @@ Task ICoreAmazonS3.MakeObjectPublicAsync(string bucket, string objectKey, bool e
             return this.PutACLAsync(request);
         }
 
-        Task ICoreAmazonS3.EnsureBucketExistsAsync(string bucketName)
+        async Task ICoreAmazonS3.EnsureBucketExistsAsync(string bucketName)
         {
-            return this.PutBucketAsync(bucketName);
+            try
+            {
+                await this.PutBucketAsync(bucketName).ConfigureAwait(false);
+            }
+            catch (BucketAlreadyOwnedByYouException)
+            {
+            }
         }
 
         [Obsolete("This method is deprecated: its behavior is inconsistent and always uses HTTP. Please use Amazon.S3.Util.AmazonS3Util.DoesS3BucketExistV2Async instead.")]

sdk/src/Services/S3/Custom/_bcl/AmazonS3Client.Extensions.cs

@@ -141,7 +141,11 @@ void ICoreAmazonS3.MakeObjectPublic(string bucket, string objectKey, bool enable
 
         void ICoreAmazonS3.EnsureBucketExists(string bucketName)
         {
-            this.PutBucket(bucketName);
+            try
+            {
+                this.PutBucket(bucketName);
+            }
+            catch (BucketAlreadyOwnedByYouException) { }
         }
 
         [Obsolete("This method is obsolete: its behavior is inconsistent and always uses HTTP.")]

sdk/test/Services/S3/IntegrationTests/S3ExtensionsTests.cs

@@ -0,0 +1,50 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+using Amazon;
+
+using Amazon.SecurityToken;
+using Amazon.SecurityToken.Model;
+
+using Amazon.S3;
+using Amazon.S3.Model;
+using Amazon.S3.Transfer;
+
+using Amazon.S3Control;
+using Amazon.S3Control.Model;
+using Amazon.Runtime.SharedInterfaces;
+
+
+
+namespace AWSSDK_DotNet.IntegrationTests.Tests.S3
+{
+    [TestClass]
+    public class S3ExtensionsTests : TestBase<AmazonS3Client>
+    {
+        static string _bucketName;
+
+        [ClassInitialize]
+        public static void Setup(TestContext context)
+        {
+            _bucketName = S3TestUtils.CreateBucketWithWait(Client);
+        }
+
+        [ClassCleanup]
+        public static void ClassCleanup()
+        {
+            Amazon.S3.Util.AmazonS3Util.DeleteS3BucketWithObjects(Client, _bucketName);
+        }
+
+
+        [TestMethod]
+        public void EnsureBucketExists()
+        {
+            IAmazonS3 s3Client = Client;
+            s3Client.EnsureBucketExists(_bucketName);
+        }
+    }
+}