Merge remote-tracking branch 'origin/development' into local-staged-release

Author: aws-sdk-dotnet-automation

generator/.DevConfigs/3197e732-a717-496f-950f-d4b76e3f5db1.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." ]
+    }
+  ]
+}

generator/.DevConfigs/31d96afb-c4e2-4057-b0cc-14b36797961d.json

@@ -0,0 +1,9 @@
+{
+  "core": {
+    "changeLogMessages": [
+      "Fixed an issue in JsonPolicyWriter.WritePolicyToString() method where it was not using prettyPrint parameter for indentation."
+    ],
+    "type": "patch",
+    "updateMinimum": false
+  }
+}

sdk/src/Core/Amazon.Auth/AccessControlPolicy/Internal/JsonPolicyWriter.cs

@@ -53,7 +53,7 @@ public static string WritePolicyToString(bool prettyPrint, Policy policy)
                 // indentSize is only available in net8+ and net472
                 JsonWriterOptions options = new JsonWriterOptions
                 {
-                    Indented = true,
+                    Indented = prettyPrint
                 };
                 using (var stream = new MemoryStream())
                 using (var generator = new Utf8JsonWriter(stream, options))

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

@@ -145,11 +145,16 @@ Task ICoreAmazonS3.MakeObjectPublicAsync(string bucket, string objectKey, bool e
             return this.PutObjectAclAsync(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)
+            {
+            }
         }
-
         #endregion
     }
 }

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

@@ -143,7 +143,11 @@ void ICoreAmazonS3.MakeObjectPublic(string bucket, string objectKey, bool enable
 
         void ICoreAmazonS3.EnsureBucketExists(string bucketName)
         {
-            this.PutBucket(bucketName);
+            try
+            {
+                this.PutBucket(bucketName);
+            }
+            catch (BucketAlreadyOwnedByYouException) { }
         }
         #endregion
     }

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);
+        }
+    }
+}

sdk/test/UnitTests/Custom/PolicyTests.cs

@@ -249,5 +249,41 @@ public void HandleAnonymousWhenConvertingPrincipals()
             Assert.AreEqual(1, statement.Principals.Count);
             Assert.AreEqual(Principal.Anonymous, statement.Principals.First());
         }
+
+        [TestMethod]
+        public void TestPrettyPrintIndentationDisabled()
+        {
+            string testPolicy = @"{
+                ""Version"": ""2012-10-17"",
+                ""Statement"": [
+                {
+                    ""Sid"": ""AllowS3ListBucket"",
+                    ""Effect"": ""Allow"",
+                    ""Action"": [
+                    ""s3:ListBucket""
+                    ],
+                    ""Resource"": [
+                    ""arn:aws:s3:::your-bucket-name""
+                    ]
+                }
+                ]
+            }";
+
+            var policy = Policy.FromJson(testPolicy);
+            string policyString = policy.ToJson(false);
+
+            Assert.IsFalse(policyString.Contains("\n"));
+        }
+
+        [TestMethod]
+        public void TestPrettyPrintIndentationEnabled()
+        {
+            string testPolicy = @"{""Version"": ""2012-10-17"", ""Statement"": [{""Sid"": ""AllowS3ListBucket"", ""Effect"": ""Allow"", ""Action"": [ ""s3:ListBucket"" ], ""Resource"": [ ""arn:aws:s3:::your-bucket-name""]}]}";
+
+            var policy = Policy.FromJson(testPolicy);
+            string policyString = policy.ToJson(true);
+
+            Assert.IsTrue(policyString.Contains("\n"));
+        }
     }
 }