Add scheme to destination region endpoint

.changes/next-release/bugfix-AmazonEC2-b80e04f.json

@@ -0,0 +1,5 @@
+{
+    "type": "bugfix",
+    "category": "Amazon EC2",
+    "description": "Fix NPE when calling `CopySnapshot`. Fixes [#1564](https://github.com/aws/aws-sdk-java-v2/issues/1564)"
+}

services/ec2/src/main/java/software/amazon/awssdk/services/ec2/transform/internal/GeneratePreSignUrlInterceptor.java

@@ -18,7 +18,9 @@
 import static software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute.AWS_CREDENTIALS;
 
 import java.net.URI;
+import java.time.Clock;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.annotations.SdkTestInternalApi;
 import software.amazon.awssdk.auth.signer.Aws4Signer;
 import software.amazon.awssdk.auth.signer.params.Aws4PresignerParams;
 import software.amazon.awssdk.awscore.util.AwsHostNameUtils;
@@ -40,7 +42,6 @@
 
 /**
  * ExecutionInterceptor that generates a pre-signed URL for copying encrypted snapshots
- * TODO: Is this actually right? What if a different interceptor modifies the message? Should this be treated as a signer?
  */
 @SdkInternalApi
 public final class GeneratePreSignUrlInterceptor implements ExecutionInterceptor {
@@ -57,6 +58,17 @@ public final class GeneratePreSignUrlInterceptor implements ExecutionInterceptor
 
     private static final CopySnapshotRequestMarshaller MARSHALLER = new CopySnapshotRequestMarshaller(PROTOCOL_FACTORY);
 
+    private final Clock testClock; // for testing only
+
+    public GeneratePreSignUrlInterceptor() {
+        testClock = null;
+    }
+
+    @SdkTestInternalApi
+    GeneratePreSignUrlInterceptor(Clock testClock) {
+        this.testClock = testClock;
+    }
+
     @Override
     public SdkHttpRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
         SdkHttpRequest request = context.httpRequest();
@@ -122,6 +134,7 @@ private Aws4PresignerParams getPresignerParams(ExecutionAttributes attributes, S
                                   .signingRegion(Region.of(signingRegion))
                                   .signingName(signingName)
                                   .awsCredentials(attributes.getAttribute(AWS_CREDENTIALS))
+                                  .signingClockOverride(testClock)
                                   .build();
     }
 
@@ -152,6 +165,10 @@ private URI createEndpoint(String regionName, String serviceName) {
                                     .build();
         }
 
-        return Ec2Client.serviceMetadata().endpointFor(region);
+        URI endpoint = Ec2Client.serviceMetadata().endpointFor(region);
+        if (endpoint.getScheme() == null) {
+            return URI.create("https://" + endpoint);
+        }
+        return endpoint;
     }
 }

services/ec2/src/test/java/software/amazon/awssdk/services/ec2/transform/internal/GeneratePreSignUrlInterceptorTest.java

@@ -0,0 +1,121 @@
+/*
+ * Copyright 2010-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.services.ec2.transform.internal;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+import static software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute.AWS_CREDENTIALS;
+import java.net.URI;
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.core.interceptor.Context;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.http.SdkHttpMethod;
+import software.amazon.awssdk.http.SdkHttpRequest;
+import software.amazon.awssdk.services.ec2.model.CopySnapshotRequest;
+
+@RunWith(MockitoJUnitRunner.class)
+public class GeneratePreSignUrlInterceptorTest {
+    private static final GeneratePreSignUrlInterceptor INTERCEPTOR = new GeneratePreSignUrlInterceptor();
+
+    @Mock
+    private Context.ModifyHttpRequest mockContext;
+
+    @Test
+    public void copySnapshotRequest_httpsProtocolAddedToEndpoint() {
+        SdkHttpFullRequest request = SdkHttpFullRequest.builder()
+                .uri(URI.create("https://ec2.us-west-2.amazonaws.com"))
+                .method(SdkHttpMethod.POST)
+                .build();
+
+        CopySnapshotRequest ec2Request = CopySnapshotRequest.builder()
+                .sourceRegion("us-west-2")
+                .destinationRegion("us-east-2")
+                .build();
+
+        when(mockContext.httpRequest()).thenReturn(request);
+        when(mockContext.request()).thenReturn(ec2Request);
+
+        ExecutionAttributes attrs = new ExecutionAttributes();
+        attrs.putAttribute(AWS_CREDENTIALS, AwsBasicCredentials.create("foo", "bar"));
+
+        SdkHttpRequest modifiedRequest = INTERCEPTOR.modifyHttpRequest(mockContext, attrs);
+
+        String presignedUrl = modifiedRequest.rawQueryParameters().get("PresignedUrl").get(0);
+
+        assertThat(presignedUrl).startsWith("https://");
+    }
+
+    @Test
+    public void copySnapshotRequest_generatesCorrectPresignedUrl() {
+        // Expected URL was derived by first making a request to EC2 using
+        // valid credentials and a KMS encrypted snapshot and verifying that
+        // the snapshot was copied to the destination region, also encrypted.
+        // Then the same code was used to make a second request, changing only
+        // the credentials and snapshot ID.
+        String expectedPresignedUrl = "https://ec2.us-west-2.amazonaws.com?Action=CopySnapshot" +
+                "&Version=2016-11-15" +
+                "&DestinationRegion=us-east-1" +
+                "&SourceRegion=us-west-2" +
+                "&SourceSnapshotId=SNAPSHOT_ID" +
+                "&X-Amz-Algorithm=AWS4-HMAC-SHA256" +
+                "&X-Amz-Date=20200107T205609Z" +
+                "&X-Amz-SignedHeaders=host" +
+                "&X-Amz-Expires=604800" +
+                "&X-Amz-Credential=akid%2F20200107%2Fus-west-2%2Fec2%2Faws4_request" +
+                "&X-Amz-Signature=c1f5e34834292a86ff2b46b5e97cebaf2967b09641b4e2e60a382a37d137a03b";
+
+        ZoneId utcZone = ZoneId.of("UTC").normalized();
+
+        // Same signing date as the one used for the request above
+        Instant signingInstant = ZonedDateTime.of(2020, 1, 7, 20, 56, 9, 0, utcZone).toInstant();
+        Clock signingClock = Clock.fixed(signingInstant, utcZone);
+
+        GeneratePreSignUrlInterceptor interceptor = new GeneratePreSignUrlInterceptor(signingClock);
+
+        // These details don't really affect the test as they're not used in generating the signed URL
+        SdkHttpFullRequest request = SdkHttpFullRequest.builder()
+                .uri(URI.create("https://ec2.us-west-2.amazonaws.com"))
+                .method(SdkHttpMethod.POST)
+                .build();
+
+        CopySnapshotRequest ec2Request = CopySnapshotRequest.builder()
+                .sourceRegion("us-west-2")
+                .destinationRegion("us-east-1")
+                .sourceSnapshotId("SNAPSHOT_ID")
+                .build();
+
+        when(mockContext.httpRequest()).thenReturn(request);
+        when(mockContext.request()).thenReturn(ec2Request);
+
+        ExecutionAttributes attrs = new ExecutionAttributes();
+        attrs.putAttribute(AWS_CREDENTIALS, AwsBasicCredentials.create("akid", "skid"));
+
+        SdkHttpRequest modifiedRequest = interceptor.modifyHttpRequest(mockContext, attrs);
+
+        String generatedPresignedUrl = modifiedRequest.rawQueryParameters().get("PresignedUrl").get(0);
+
+        assertThat(generatedPresignedUrl).isEqualTo(expectedPresignedUrl);
+    }
+}