Remove leading slash in header value for ARNs in CopySourceInterceptor (#3526)

* Update CopySourceInterceptor to remove leading slash in header value for ARN source buckets

* Updated changelong entry

Author: dave-fn

.changes/next-release/bugfix-AWSSDKforJavav2-73c904b.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "Amazon S3",
+    "contributor": "",
+    "description": "Update CopySourceInterceptor to remove leading slash in header value for ARN source buckets"
+}

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/CopySourceInterceptor.java

@@ -17,6 +17,7 @@
 
 import static software.amazon.awssdk.utils.http.SdkHttpUtils.urlEncodeIgnoreSlashes;
 
+import java.util.Optional;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.core.SdkRequest;
 import software.amazon.awssdk.core.interceptor.Context.ModifyRequest;
@@ -97,9 +98,12 @@ private static SdkRequest modifyUploadPartCopyRequest(UploadPartCopyRequest requ
 
     private static String constructCopySource(String sourceBucket, String sourceKey, String sourceVersionId) {
         StringBuilder copySource = new StringBuilder();
-        copySource.append("/");
+        Optional<S3ResourceType> arnTypeOptional = S3ArnUtils.getArnType(sourceBucket);
+        if (!arnTypeOptional.isPresent()) {
+            copySource.append("/");
+        }
         copySource.append(urlEncodeIgnoreSlashes(sourceBucket));
-        S3ArnUtils.getArnType(sourceBucket).ifPresent(arnType -> {
+        arnTypeOptional.ifPresent(arnType -> {
             if (arnType == S3ResourceType.ACCESS_POINT || arnType == S3ResourceType.OUTPOST) {
                 copySource.append("/object");
             }

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/handlers/CopySourceInterceptorTest.java

@@ -154,7 +154,7 @@ public void modifyRequest_insertsSlashObject_whenAccessPointArn() {
             .modifyRequest(() -> originalRequest, new ExecutionAttributes());
 
         assertThat(modifiedRequest.copySource()).isEqualTo(
-            "/arn%3Aaws%3As3%3Aus-west-2%3A123456789012%3Aaccesspoint/my-access-point/object/my-key");
+            "arn%3Aaws%3As3%3Aus-west-2%3A123456789012%3Aaccesspoint/my-access-point/object/my-key");
     }
 
     @Test
@@ -168,6 +168,6 @@ public void modifyRequest_insertsSlashObject_whenOutpostArn() {
             .modifyRequest(() -> originalRequest, new ExecutionAttributes());
 
         assertThat(modifiedRequest.copySource()).isEqualTo(
-            "/arn%3Aaws%3As3-outposts%3Aus-west-2%3A123456789012%3Aoutpost/my-outpost/bucket/my-bucket/object/my-key");
+            "arn%3Aaws%3As3-outposts%3Aus-west-2%3A123456789012%3Aoutpost/my-outpost/bucket/my-bucket/object/my-key");
     }
 }