[DBInstance] Add AllowMajorUpgrade on ModifyAfterCreate (#488)

Co-authored-by: dbbh <[email protected]>
aws-cloudformation · Jan 2, 2024 · 59fabfb · 59fabfb
1 parent 199b7b8
commit 59fabfb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/aws-rds-dbinstance/pom.xml b/aws-rds-dbinstance/pom.xml
@@ -52,7 +52,12 @@
             <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
-
+       <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/aws-query-protocol -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>aws-query-protocol</artifactId>
+            <version>2.20.138</version>
+        </dependency>
         <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
         <dependency>
             <groupId>org.assertj</groupId>

diff --git a/aws-rds-dbinstance/src/main/java/software/amazon/rds/dbinstance/Translator.java b/aws-rds-dbinstance/src/main/java/software/amazon/rds/dbinstance/Translator.java
@@ -588,6 +588,7 @@ public static ModifyDbInstanceRequest modifyDbInstanceAfterCreateRequestV12(fina
 
     public static ModifyDbInstanceRequest modifyDbInstanceAfterCreateRequest(final ResourceModel model) {
         final ModifyDbInstanceRequest.Builder builder = ModifyDbInstanceRequest.builder()
+                .allowMajorVersionUpgrade(model.getAllowMajorVersionUpgrade())
                 .applyImmediately(Boolean.TRUE)
                 .backupRetentionPeriod(model.getBackupRetentionPeriod())
                 .caCertificateIdentifier(model.getCACertificateIdentifier())

diff --git a/aws-rds-dbinstance/src/test/java/software/amazon/rds/dbinstance/TranslatorTest.java b/aws-rds-dbinstance/src/test/java/software/amazon/rds/dbinstance/TranslatorTest.java
@@ -729,6 +729,17 @@ public void test_translateManageMasterUserPassword_fromUnsetToSet_withSpecificKe
         assertThat(request.masterUserSecretKmsKeyId()).isEqualTo("myKey");
     }
 
+    @Test
+    public void test_createDbInstanceRequest_AllowMajorVersionUpgrade() {
+        ResourceModel model = ResourceModel.builder()
+                .allowMajorVersionUpgrade(true)
+                .build();
+        final ModifyDbInstanceRequest modifyAfterCreateRequest = Translator.modifyDbInstanceAfterCreateRequest(
+                model
+        );
+        assertThat(modifyAfterCreateRequest.allowMajorVersionUpgrade()).isTrue();
+    }
+
     @Test
     public void test_createDbInstanceRequest_SetPerformanceInsightsKMSKeyIdIfEnabled() {
         final String kmsKeyId = "test-kms-key-id";