Do not trim leading slashes for copy object and copy part operations

generator/.DevConfigs/2869e4ae-e992-4bb7-938e-fed27e1b1d47.json

@@ -0,0 +1,11 @@
+{
+    "services": [
+        {
+            "serviceName": "S3",
+            "type": "patch",
+            "changeLogMessages": [
+                "Remove the DisableTrimmingLeadingSlash flag for CopyObject and CopyPart operations. The SDK will no longer trim leading slashes."
+            ]
+        }
+    ]
+}

sdk/src/Services/S3/Custom/Model/CopyObjectRequest.cs

@@ -245,7 +245,6 @@ public partial class CopyObjectRequest : PutWithACLRequest
         private string copySourceServerSideEncryptionCustomerProvidedKeyMD5;
         private TaggingDirective taggingDirective;
 
-        private bool disableTrimmingLeadingSlash = false;
 
         /// <summary>
         /// A canned access control list (CACL) to apply to the object.
@@ -1189,16 +1188,6 @@ internal bool IsSetChecksumAlgorithm()
             return this._checksumAlgorithm != null;
         }
 
-        /// <summary>
-        /// If this is set to true then the Amazon S3 client will not remove leading slashes from <see cref="SourceKey"/> and <see cref="DestinationKey"/>. 
-        /// The default value is false.
-        /// </summary>
-        public bool DisableTrimmingLeadingSlash
-        {
-            get { return this.disableTrimmingLeadingSlash; }
-            set { this.disableTrimmingLeadingSlash = value; }
-        }
-
         /// <summary>
         /// Specifies whether the object tag-set is copied from the source object or replaced with the tag-set that's provided in the request.
         /// <para>

sdk/src/Services/S3/Custom/Model/CopyPartRequest.cs

@@ -246,7 +246,6 @@ public partial class CopyPartRequest : AmazonWebServiceRequest
         private string copySourceServerSideEncryptionCustomerProvidedKey;
         private string copySourceServerSideEncryptionCustomerProvidedKeyMD5;
 
-        private bool disableTrimmingLeadingSlash = false;
 
         /// <summary>
         /// The name of the bucket containing the object to copy.
@@ -823,14 +822,5 @@ internal bool IsSetRequestPayer()
             return requestPayer != null;
         }
 
-        /// <summary>
-        /// If this is set to true then the Amazon S3 client will not remove leading slashes from <see cref="SourceKey"/> and <see cref="DestinationKey"/>. 
-        /// The default value is false.
-        /// </summary>
-        public bool DisableTrimmingLeadingSlash
-        {
-            get { return this.disableTrimmingLeadingSlash; }
-            set { this.disableTrimmingLeadingSlash = value; }
-        }
     }
 }

sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CopyObjectRequestMarshaller.cs

@@ -36,15 +36,9 @@ public IRequest Marshall(Amazon.Runtime.AmazonWebServiceRequest input)
 
         public IRequest Marshall(CopyObjectRequest copyObjectRequest)
         {
-            var sourceKey = 
-                copyObjectRequest.DisableTrimmingLeadingSlash || string.IsNullOrEmpty(copyObjectRequest.SourceKey) ?
-                copyObjectRequest.SourceKey :
-                AmazonS3Util.RemoveLeadingSlash(copyObjectRequest.SourceKey);
-
-            var destinationKey = 
-                copyObjectRequest.DisableTrimmingLeadingSlash || string.IsNullOrEmpty(copyObjectRequest.DestinationKey) ?
-                copyObjectRequest.DestinationKey:
-                AmazonS3Util.RemoveLeadingSlash(copyObjectRequest.DestinationKey);
+            var sourceKey = copyObjectRequest.SourceKey;
+
+            var destinationKey = copyObjectRequest.DestinationKey;
 
             IRequest request = new DefaultRequest(copyObjectRequest, "AmazonS3");
 

sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/CopyPartRequestMarshaller.cs

@@ -38,15 +38,9 @@ public IRequest Marshall(CopyPartRequest copyPartRequest)
         {
             IRequest request = new DefaultRequest(copyPartRequest, "AmazonS3");
 
-            var sourceKey =
-                copyPartRequest.DisableTrimmingLeadingSlash ?
-                copyPartRequest.SourceKey :
-                AmazonS3Util.RemoveLeadingSlash(copyPartRequest.SourceKey);
-
-            var destinationKey =
-                copyPartRequest.DisableTrimmingLeadingSlash ?
-                copyPartRequest.DestinationKey :
-                AmazonS3Util.RemoveLeadingSlash(copyPartRequest.DestinationKey);
+            var sourceKey = copyPartRequest.SourceKey;
+
+            var destinationKey = copyPartRequest.DestinationKey;
 
             request.HttpMethod = "PUT";
 

sdk/test/NetStandard/IntegrationTests/IntegrationTests/S3/CopyObjectTests.cs

@@ -42,11 +42,11 @@ protected override void Dispose(bool disposing)
         }
 
         [Theory]
-        [InlineData(false, testKey, "/destinationTestKey1.txt", "destinationTestKey1.txt")]
-        [InlineData(true, testKeyWithSlash, "/destinationTestKey2.txt", "/destinationTestKey2.txt")]
-        [InlineData(true, testKeyWithSlash, "/", "/")]
+        [InlineData(testKey, "/destinationTestKey1.txt", "/destinationTestKey1.txt")]
+        [InlineData(testKeyWithSlash, "/destinationTestKey2.txt", "/destinationTestKey2.txt")]
+        [InlineData(testKeyWithSlash, "/", "/")]
         [Trait(CategoryAttribute, "S3")]
-        public async Task CopyObjectTestWithLeadingSlash(bool disableTrimmingLeadingSlash, string sourceKey, string destinationKey, string expectedKey)
+        public async Task CopyObjectTestWithLeadingSlash(string sourceKey, string destinationKey, string expectedKey)
         {
             var copyResponse = await Client.CopyObjectAsync(new CopyObjectRequest
             {
@@ -55,8 +55,6 @@ public async Task CopyObjectTestWithLeadingSlash(bool disableTrimmingLeadingSlas
 
                 DestinationBucket = bucketName,
                 DestinationKey = destinationKey,
-
-                DisableTrimmingLeadingSlash = disableTrimmingLeadingSlash
             });
             Assert.Equal(HttpStatusCode.OK, copyResponse.HttpStatusCode);
 

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

@@ -157,12 +157,12 @@ public void TestCopyObjectWithTagsReplace()
             Assert.IsTrue(taggingMetadata.Tagging.Any(tag => tag.Key == "newtag1" && tag.Value == "1"));
         }
 
-        [DataRow(false, testKey, "/destinationTestKey1.txt", "destinationTestKey1.txt")]
-        [DataRow(true, testKeyWithSlash, "/destinationTestKey2.txt", "/destinationTestKey2.txt")]
-        [DataRow(true, testKeyWithSlash, "/", "/")]
+        [DataRow(testKey, "destinationTestKey1.txt", "destinationTestKey1.txt")]
+        [DataRow(testKeyWithSlash, "/destinationTestKey2.txt", "/destinationTestKey2.txt")]
+        [DataRow(testKeyWithSlash, "/", "/")]
         [DataTestMethod]
         [TestCategory("S3")]
-        public void TestCopyObjectWithLeadingSlash(bool disableTrimmingLeadingSlash, string sourceKey, string destinationKey, string expectedKey)
+        public void TestCopyObjectWithLeadingSlash(string sourceKey, string destinationKey, string expectedKey)
         {
             var copyObjectResponse = usEastClient.CopyObject(new CopyObjectRequest
             {
@@ -172,7 +172,6 @@ public void TestCopyObjectWithLeadingSlash(bool disableTrimmingLeadingSlash, str
                 DestinationBucket = westBucketName,
                 DestinationKey = destinationKey,
 
-                DisableTrimmingLeadingSlash = disableTrimmingLeadingSlash
             });
             Assert.AreEqual(HttpStatusCode.OK, copyObjectResponse.HttpStatusCode);
 

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

@@ -63,7 +63,6 @@ public void TestCopyPartWithLeadingSlash()
                     UploadId = uploadId,
                     PartNumber = 1,
 
-                    DisableTrimmingLeadingSlash = true
                 });
                 Assert.IsNotNull(copyPartResponse.ETag);
                 Assert.IsTrue(copyPartResponse.ETag != null && copyPartResponse.ETag.Length > 0);