Merge pull request #1070 from joviegas/release

Merging RDS pre-signed URL customization for StartDBInstanceAutomated…

Author: joviegas

services/rds/src/main/java/software/amazon/awssdk/services/rds/internal/StartDbInstanceAutomatedBackupsReplicationPresignInterceptor.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright 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.rds.internal;
+
+import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.http.SdkHttpFullRequest;
+import software.amazon.awssdk.services.rds.model.StartDbInstanceAutomatedBackupsReplicationRequest;
+import software.amazon.awssdk.services.rds.transform.StartDbInstanceAutomatedBackupsReplicationRequestMarshaller;
+
+/**
+ * Handler for pre-signing {@link StartDbInstanceAutomatedBackupsReplicationRequest}.
+ */
+@SdkInternalApi
+public final class StartDbInstanceAutomatedBackupsReplicationPresignInterceptor extends
+        RdsPresignInterceptor<StartDbInstanceAutomatedBackupsReplicationRequest> {
+
+    public static final StartDbInstanceAutomatedBackupsReplicationRequestMarshaller MARSHALLER =
+        new StartDbInstanceAutomatedBackupsReplicationRequestMarshaller(PROTOCOL_FACTORY);
+
+    public StartDbInstanceAutomatedBackupsReplicationPresignInterceptor() {
+        super(StartDbInstanceAutomatedBackupsReplicationRequest.class);
+    }
+
+    @Override
+    protected PresignableRequest adaptRequest(final StartDbInstanceAutomatedBackupsReplicationRequest originalRequest) {
+        return new PresignableRequest() {
+            @Override
+            public String getSourceRegion() {
+                return originalRequest.sourceRegion();
+            }
+
+            @Override
+            public SdkHttpFullRequest marshall() {
+                return MARSHALLER.marshall(originalRequest);
+            }
+        };
+    }
+}

services/rds/src/main/resources/codegen-resources/customization.config

@@ -43,6 +43,17 @@
                     }
                 }
             ]
+        },
+        "StartDBInstanceAutomatedBackupsReplicationMessage" : {
+            "inject" : [
+                {
+                    // This is for enabling automatic request presigning only; it should not be marshalled
+                    "SourceRegion" : {
+                        "shape" : "String",
+                        "documentation" : "If PreSignedUrl is not specified, this is the region where the source snapshot is located. A PreSignedUrl will be generated automatically by the SDK."
+                    }
+                }
+            ]
         }
     },
     "blacklistedSimpleMethods" : ["failoverDBCluster"],

services/rds/src/main/resources/software/amazon/awssdk/services/rds/execution.interceptors

@@ -1,4 +1,5 @@
 software.amazon.awssdk.services.rds.internal.CopyDbClusterSnapshotPresignInterceptor
 software.amazon.awssdk.services.rds.internal.CopyDbSnapshotPresignInterceptor
 software.amazon.awssdk.services.rds.internal.CreateDbClusterPresignInterceptor
-software.amazon.awssdk.services.rds.internal.CreateDbInstanceReadReplicaPresignInterceptor
+software.amazon.awssdk.services.rds.internal.CreateDbInstanceReadReplicaPresignInterceptor
+software.amazon.awssdk.services.rds.internal.StartDbInstanceAutomatedBackupsReplicationPresignInterceptor

services/rds/src/test/java/software/amazon/awssdk/services/rds/internal/PresignRequestWireMockTest.java

@@ -98,4 +98,10 @@ public void verifyMethodCallSendsPresignedUrl(Runnable methodCall, String action
         assertThat(lastRequestBody).contains("PreSignedUrl=https%3A%2F%2Frds.us-west-2.amazonaws.com%3FAction%3D" + actionName
                                              + "%26Version%3D2014-10-31%26DestinationRegion%3Dus-east-1%26");
     }
+
+    @Test
+    public void startDBInstanceAutomatedBackupsReplicationWithSourceRegionSendsPresignedUrl() {
+        verifyMethodCallSendsPresignedUrl(() -> client.startDBInstanceAutomatedBackupsReplication(r -> r.sourceRegion("us-west-2")),
+                "StartDBInstanceAutomatedBackupsReplication");
+    }
 }