diff --git a/aws-rds-cfn-common/pom.xml b/aws-rds-cfn-common/pom.xml index 790cbf71..2274651e 100644 --- a/aws-rds-cfn-common/pom.xml +++ b/aws-rds-cfn-common/pom.xml @@ -28,12 +28,12 @@ software.amazon.awssdk utils - 2.29.16 + 2.29.30 software.amazon.awssdk rds - 2.29.16 + 2.29.30 software.amazon.cloudformation diff --git a/aws-rds-customdbengineversion/pom.xml b/aws-rds-customdbengineversion/pom.xml index d4e2fb99..e7fe7298 100644 --- a/aws-rds-customdbengineversion/pom.xml +++ b/aws-rds-customdbengineversion/pom.xml @@ -23,7 +23,7 @@ software.amazon.awssdk rds - 2.29.16 + 2.29.30 software.amazon.rds.common @@ -54,7 +54,7 @@ software.amazon.awssdk aws-query-protocol - 2.29.16 + 2.29.30 diff --git a/aws-rds-dbcluster/aws-rds-dbcluster.json b/aws-rds-dbcluster/aws-rds-dbcluster.json index cd479cad..54e3e794 100644 --- 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 index fff8f867..4eca9870 100644 --- a/aws-rds-dbcluster/pom.xml +++ b/aws-rds-dbcluster/pom.xml @@ -30,18 +30,18 @@ software.amazon.awssdk rds - 2.29.16 + 2.29.30 software.amazon.awssdk ec2 - 2.29.16 + 2.29.30 software.amazon.awssdk aws-query-protocol - 2.29.16 + 2.29.30 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 index 09ae7649..3811f6a1 100644 --- 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 index 936c0abe..5d50cb5b 100644 --- a/aws-rds-dbclusterendpoint/pom.xml +++ b/aws-rds-dbclusterendpoint/pom.xml @@ -30,7 +30,7 @@ software.amazon.awssdk rds - 2.29.16 + 2.29.30 @@ -78,7 +78,7 @@ software.amazon.awssdk aws-query-protocol - 2.29.16 + 2.29.30 software.amazon.rds.common diff --git a/aws-rds-dbclusterparametergroup/pom.xml b/aws-rds-dbclusterparametergroup/pom.xml index ac0fd1f6..5202e7a8 100644 --- a/aws-rds-dbclusterparametergroup/pom.xml +++ b/aws-rds-dbclusterparametergroup/pom.xml @@ -30,7 +30,7 @@ software.amazon.awssdk rds - 2.29.16 + 2.29.30 @@ -78,7 +78,7 @@ software.amazon.awssdk aws-query-protocol - 2.29.16 + 2.29.30 software.amazon.rds.common diff --git a/aws-rds-dbinstance/aws-rds-dbinstance.json b/aws-rds-dbinstance/aws-rds-dbinstance.json index 379a3f28..248ab8c0 100644 --- 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 index 524b43f5..de2292c5 100644 --- a/aws-rds-dbinstance/pom.xml +++ b/aws-rds-dbinstance/pom.xml @@ -34,12 +34,12 @@ software.amazon.awssdk rds - 2.29.16 + 2.29.30 software.amazon.awssdk ec2 - 2.29.16 + 2.29.30 @@ -58,7 +58,7 @@ software.amazon.awssdk aws-query-protocol - 2.29.16 + 2.29.30 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 index a3c889c6..bd133a2a 100644 --- 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 index 23c90e1c..3f04c6a5 100644 --- a/aws-rds-dbparametergroup/pom.xml +++ b/aws-rds-dbparametergroup/pom.xml @@ -24,12 +24,12 @@ software.amazon.awssdk aws-query-protocol - 2.29.16 + 2.29.30 software.amazon.awssdk rds - 2.29.16 + 2.29.30 diff --git a/aws-rds-dbshardgroup/pom.xml b/aws-rds-dbshardgroup/pom.xml index aa34625c..1eafd985 100644 --- a/aws-rds-dbshardgroup/pom.xml +++ b/aws-rds-dbshardgroup/pom.xml @@ -34,7 +34,7 @@ software.amazon.awssdk rds - 2.29.16 + 2.29.30 @@ -53,7 +53,7 @@ software.amazon.awssdk aws-query-protocol - 2.29.16 + 2.29.30 diff --git a/aws-rds-dbsubnetgroup/pom.xml b/aws-rds-dbsubnetgroup/pom.xml index c676f80b..991c0375 100644 --- a/aws-rds-dbsubnetgroup/pom.xml +++ b/aws-rds-dbsubnetgroup/pom.xml @@ -24,12 +24,12 @@ software.amazon.awssdk aws-query-protocol - 2.29.16 + 2.29.30 software.amazon.awssdk rds - 2.29.16 + 2.29.30 diff --git a/aws-rds-eventsubscription/pom.xml b/aws-rds-eventsubscription/pom.xml index 29b79f89..74ee8d00 100644 --- a/aws-rds-eventsubscription/pom.xml +++ b/aws-rds-eventsubscription/pom.xml @@ -24,7 +24,7 @@ software.amazon.awssdk aws-query-protocol - 2.29.16 + 2.29.30 software.amazon.rds.common @@ -35,7 +35,7 @@ software.amazon.awssdk rds - 2.29.16 + 2.29.30 diff --git a/aws-rds-globalcluster/pom.xml b/aws-rds-globalcluster/pom.xml index 4ad0be8c..5f02551d 100644 --- a/aws-rds-globalcluster/pom.xml +++ b/aws-rds-globalcluster/pom.xml @@ -24,7 +24,7 @@ software.amazon.awssdk aws-query-protocol - 2.29.16 + 2.29.30 software.amazon.rds.common @@ -35,7 +35,7 @@ software.amazon.awssdk rds - 2.29.16 + 2.29.30 diff --git a/aws-rds-integration/pom.xml b/aws-rds-integration/pom.xml index 827b0f1a..f8f5096a 100644 --- a/aws-rds-integration/pom.xml +++ b/aws-rds-integration/pom.xml @@ -23,12 +23,12 @@ software.amazon.awssdk aws-query-protocol - 2.29.16 + 2.29.30 software.amazon.awssdk rds - 2.29.16 + 2.29.30 diff --git a/aws-rds-optiongroup/pom.xml b/aws-rds-optiongroup/pom.xml index ffe6fe47..113ebbcb 100644 --- a/aws-rds-optiongroup/pom.xml +++ b/aws-rds-optiongroup/pom.xml @@ -24,12 +24,12 @@ software.amazon.awssdk aws-query-protocol - 2.29.16 + 2.29.30 software.amazon.awssdk rds - 2.29.16 + 2.29.30