feat(dbcluster) CFN-459 - Database Insights Mode CloudFormation support

cr: https://code.amazon.com/reviews/CR-165673301
angusy29 · Jan 8, 2025 · e314edb · e314edb
1 parent 6f88e4c
commit e314edb
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 29 deletions.
diff --git a/aws-rds-cfn-common/pom.xml b/aws-rds-cfn-common/pom.xml
@@ -28,12 +28,12 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>utils</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>rds</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.cloudformation</groupId>

diff --git a/aws-rds-customdbengineversion/pom.xml b/aws-rds-customdbengineversion/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>rds</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.rds.common</groupId>
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-query-protocol</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
         <dependency>

diff --git a/aws-rds-dbcluster/aws-rds-dbcluster.json b/aws-rds-dbcluster/aws-rds-dbcluster.json
@@ -52,6 +52,10 @@
       "description": "A value that indicates whether to copy all tags from the DB cluster to snapshots of the DB cluster. The default is not to copy them.",
       "type": "boolean"
     },
+    "DatabaseInsightsMode": {
+      "description": "A value that indicates the mode of Database Insights to enable for the DB cluster",
+      "type": "string"
+    },
     "DatabaseName": {
       "description": "The name of your database. If you don't provide a name, then Amazon RDS won't create a database in this DB cluster. For naming constraints, see Naming Constraints in the Amazon RDS User Guide.",
       "type": "string"

diff --git a/aws-rds-dbcluster/pom.xml b/aws-rds-dbcluster/pom.xml
@@ -30,18 +30,18 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>rds</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>ec2</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.awssdk/aws-query-protocol -->
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-query-protocol</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
         <dependency>

diff --git a/aws-rds-dbcluster/src/main/java/software/amazon/rds/dbcluster/Translator.java b/aws-rds-dbcluster/src/main/java/software/amazon/rds/dbcluster/Translator.java
@@ -57,6 +57,7 @@ static CreateDbClusterRequest createDbClusterRequest(
                 .backupRetentionPeriod(model.getBackupRetentionPeriod())
                 .clusterScalabilityType(model.getClusterScalabilityType())
                 .copyTagsToSnapshot(model.getCopyTagsToSnapshot())
+                .databaseInsightsMode(model.getDatabaseInsightsMode())
                 .databaseName(model.getDatabaseName())
                 .dbClusterIdentifier(model.getDBClusterIdentifier())
                 .dbClusterInstanceClass(model.getDBClusterInstanceClass())
@@ -215,6 +216,7 @@ static ModifyDbClusterRequest modifyDbClusterAfterCreateRequest(final ResourceMo
                 .backupRetentionPeriod(desiredModel.getBackupRetentionPeriod())
                 .cloudwatchLogsExportConfiguration(config)
                 .copyTagsToSnapshot(desiredModel.getCopyTagsToSnapshot())
+                .databaseInsightsMode(desiredModel.getDatabaseInsightsMode())
                 .dbClusterIdentifier(desiredModel.getDBClusterIdentifier())
                 .dbClusterInstanceClass(desiredModel.getDBClusterInstanceClass())
                 .dbClusterParameterGroupName(desiredModel.getDBClusterParameterGroupName())
@@ -268,6 +270,7 @@ static ModifyDbClusterRequest modifyDbClusterRequest(
                 .backupRetentionPeriod(desiredModel.getBackupRetentionPeriod())
                 .cloudwatchLogsExportConfiguration(config)
                 .copyTagsToSnapshot(desiredModel.getCopyTagsToSnapshot())
+                .databaseInsightsMode(desiredModel.getDatabaseInsightsMode())
                 .dbClusterIdentifier(desiredModel.getDBClusterIdentifier())
                 .dbClusterInstanceClass(desiredModel.getDBClusterInstanceClass())
                 .dbClusterParameterGroupName(desiredModel.getDBClusterParameterGroupName())
@@ -556,6 +559,7 @@ public static ResourceModel translateDbClusterFromSdk(
                 .backtrackWindow(Translator.castToInt(dbCluster.backtrackWindow()))
                 .backupRetentionPeriod(dbCluster.backupRetentionPeriod())
                 .copyTagsToSnapshot(dbCluster.copyTagsToSnapshot())
+                .databaseInsightsMode(dbCluster.databaseInsightsModeAsString())
                 .databaseName(dbCluster.databaseName())
                 .dBClusterArn(dbCluster.dbClusterArn())
                 .dBClusterIdentifier(dbCluster.dbClusterIdentifier())

diff --git a/aws-rds-dbclusterendpoint/pom.xml b/aws-rds-dbclusterendpoint/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>rds</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
         <dependency>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-query-protocol</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.rds.common</groupId>

diff --git a/aws-rds-dbclusterparametergroup/pom.xml b/aws-rds-dbclusterparametergroup/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>rds</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
         <dependency>
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-query-protocol</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.rds.common</groupId>

diff --git a/aws-rds-dbinstance/aws-rds-dbinstance.json b/aws-rds-dbinstance/aws-rds-dbinstance.json
@@ -171,6 +171,10 @@
       "type": "string",
       "description": "The instance profile associated with the underlying Amazon EC2 instance of an RDS Custom DB instance. The instance profile must meet the following requirements:\n * The profile must exist in your account.\n * The profile must have an IAM role that Amazon EC2 has permissions to assume.\n * The instance profile name and the associated IAM role name must start with the prefix AWSRDSCustom .\nFor the list of permissions required for the IAM role, see Configure IAM and your VPC in the Amazon RDS User Guide .\n\nThis setting is required for RDS Custom."
     },
+    "DatabaseInsightsMode": {
+      "description": "A value that indicates the mode of Database Insights to enable for the DB instance",
+      "type": "string"
+    },
     "DBClusterIdentifier": {
       "type": "string",
       "description": "The identifier of the DB cluster that the instance will belong to."
@@ -555,7 +559,8 @@
     "/properties/DBInstanceArn",
     "/properties/MasterUserSecret/SecretArn",
     "/properties/CertificateDetails/CAIdentifier",
-    "/properties/CertificateDetails/ValidTill"
+    "/properties/CertificateDetails/ValidTill",
+    "/properties/DatabaseInsightsMode"
   ],
   "primaryIdentifier": [
     "/properties/DBInstanceIdentifier"

diff --git a/aws-rds-dbinstance/pom.xml b/aws-rds-dbinstance/pom.xml
@@ -34,12 +34,12 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>rds</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>ec2</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
         <dependency>
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-query-protocol</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
         <dependency>

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
@@ -854,6 +854,7 @@ public static ResourceModel.ResourceModelBuilder translateDbInstanceFromSdkBuild
                 .characterSetName(dbInstance.characterSetName())
                 .copyTagsToSnapshot(dbInstance.copyTagsToSnapshot())
                 .customIAMInstanceProfile(dbInstance.customIamInstanceProfile())
+                .databaseInsightsMode(dbInstance.databaseInsightsModeAsString())
                 .dBClusterIdentifier(dbInstance.dbClusterIdentifier())
                 .dBInstanceArn(dbInstance.dbInstanceArn())
                 .dBInstanceClass(dbInstance.dbInstanceClass())

diff --git a/aws-rds-dbparametergroup/pom.xml b/aws-rds-dbparametergroup/pom.xml
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-query-protocol</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>rds</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
         <dependency>

diff --git a/aws-rds-dbshardgroup/pom.xml b/aws-rds-dbshardgroup/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>rds</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
         <dependency>
@@ -53,7 +53,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-query-protocol</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.assertj/assertj-core -->
         <dependency>

diff --git a/aws-rds-dbsubnetgroup/pom.xml b/aws-rds-dbsubnetgroup/pom.xml
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-query-protocol</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>rds</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
         <dependency>

diff --git a/aws-rds-eventsubscription/pom.xml b/aws-rds-eventsubscription/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-query-protocol</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.rds.common</groupId>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>rds</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
         <dependency>

diff --git a/aws-rds-globalcluster/pom.xml b/aws-rds-globalcluster/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-query-protocol</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.rds.common</groupId>
@@ -35,7 +35,7 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>rds</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
         <dependency>

diff --git a/aws-rds-integration/pom.xml b/aws-rds-integration/pom.xml
@@ -23,12 +23,12 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-query-protocol</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>rds</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
         <dependency>

diff --git a/aws-rds-optiongroup/pom.xml b/aws-rds-optiongroup/pom.xml
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>aws-query-protocol</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>rds</artifactId>
-            <version>2.29.16</version>
+            <version>2.29.30</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/software.amazon.cloudformation/aws-cloudformation-rpdk-java-plugin -->
         <dependency>