diff --git a/.gitignore b/.gitignore index 0dd0e1ff5..a6d02c52d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,13 @@ aws-rds-handlers.iml rpdk.log +/build/ +# python helper scripts +bin/ +lib/ +env/ # for IntelliJ IDEA .idea/ +# Gradle +.gradle +/gradle/ +/wrapper/ diff --git a/aws-rds-cfn-common/pom.xml b/aws-rds-cfn-common/pom.xml index 5843530f0..aaab71632 100644 --- a/aws-rds-cfn-common/pom.xml +++ b/aws-rds-cfn-common/pom.xml @@ -28,12 +28,12 @@ software.amazon.awssdk utils - 2.21.17 + 2.24.13 software.amazon.awssdk rds - 2.21.17 + 2.24.13 software.amazon.cloudformation @@ -190,7 +190,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.8 diff --git a/aws-rds-cfn-common/src/test/java/software/amazon/rds/common/handler/TaggingTest.java b/aws-rds-cfn-common/src/test/java/software/amazon/rds/common/handler/TaggingTest.java index 5b23b55dd..45f59f83a 100644 --- a/aws-rds-cfn-common/src/test/java/software/amazon/rds/common/handler/TaggingTest.java +++ b/aws-rds-cfn-common/src/test/java/software/amazon/rds/common/handler/TaggingTest.java @@ -40,6 +40,7 @@ import software.amazon.rds.common.error.ErrorRuleSet; import software.amazon.rds.common.error.ErrorStatus; import software.amazon.rds.common.error.UnexpectedErrorStatus; +import software.amazon.rds.common.handler.Tagging.TagSet; import software.amazon.rds.common.logging.LoggingProxyClient; import software.amazon.rds.common.logging.RequestLogger; import software.amazon.rds.common.printer.FilteredJsonPrinter; @@ -83,6 +84,26 @@ public void setup() { proxyRdsClient = new LoggingProxyClient<>(new RequestLogger(null, request, new FilteredJsonPrinter()), MOCK_PROXY(proxy, rds)); } + @Test + void tagset_emptySystemTags_notEmpty() { + final Set systemTags = Collections.emptySet(); + final Set stackTags = STACK_TAGS; + final Set resourceTags = RESOURCE_TAGS; + + final TagSet tagset = new TagSet(systemTags, stackTags, resourceTags); + assertThat(tagset.isEmpty()).isFalse(); + } + + @Test + void tagset_emptyResourceTags_notEmpty() { + final Set systemTags = SYSTEM_TAGS; + final Set stackTags = STACK_TAGS; + final Set resourceTags = Collections.emptySet(); + + final TagSet tagset = new TagSet(systemTags, stackTags, resourceTags); + assertThat(tagset.isEmpty()).isFalse(); + } + @Test void simple_success() { final ProgressEvent event = new ProgressEvent<>(); @@ -186,6 +207,14 @@ void test_translateTagsToSdk() { assertThat(allTags.containsAll(RESOURCE_TAGS)).isTrue(); } + @Test + void test_translateTagsToSdk_from_collection() { + final Collection tagSet = Collections.emptyList(); + final Collection allTags = Tagging.translateTagsToSdk(tagSet); + + assertThat(allTags.isEmpty()); + } + @Test void test_translateTagsToSdk_duplicate_tags() { String duplicateTagKey = "duplicate-tag-key"; diff --git a/aws-rds-cfn-common/src/test/java/software/amazon/rds/common/logging/RequestLoggerTest.java b/aws-rds-cfn-common/src/test/java/software/amazon/rds/common/logging/RequestLoggerTest.java index 6b698d306..d6b81fa11 100644 --- a/aws-rds-cfn-common/src/test/java/software/amazon/rds/common/logging/RequestLoggerTest.java +++ b/aws-rds-cfn-common/src/test/java/software/amazon/rds/common/logging/RequestLoggerTest.java @@ -82,6 +82,19 @@ void test_pass_if_logger_null() { } } + @Test + void test_log_with_exception() { + try{ + ResourceHandlerRequest request = new ResourceHandlerRequest<>(); + request.setStackId(STACK_ID); + RequestLogger requestLogger = new RequestLogger(logger, request, null); + requestLogger.log(SIMPLE_LOG, request); + } catch (Throwable throwable) { + verify(logger, atLeast(1)).log(captor.capture()); + assertThat(captor.getValue().contains(STACK_ID)).isTrue(); + } + } + @Test void test_log_and_throw() { Throwable throwable = new Throwable("This is Exception"); diff --git a/aws-rds-cfn-test-common/pom.xml b/aws-rds-cfn-test-common/pom.xml index 8ec84309e..4dd596625 100644 --- a/aws-rds-cfn-test-common/pom.xml +++ b/aws-rds-cfn-test-common/pom.xml @@ -141,7 +141,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.8 diff --git a/aws-rds-customdbengineversion/pom.xml b/aws-rds-customdbengineversion/pom.xml index 96a71ca60..45ce992fb 100644 --- a/aws-rds-customdbengineversion/pom.xml +++ b/aws-rds-customdbengineversion/pom.xml @@ -23,7 +23,7 @@ software.amazon.awssdk rds - 2.21.17 + 2.24.13 software.amazon.rds.common @@ -159,7 +159,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.8 **/BaseConfiguration* diff --git a/aws-rds-dbcluster/aws-rds-dbcluster.json b/aws-rds-dbcluster/aws-rds-dbcluster.json index 112e3ed9f..d1ab0c357 100644 --- a/aws-rds-dbcluster/aws-rds-dbcluster.json +++ b/aws-rds-dbcluster/aws-rds-dbcluster.json @@ -244,6 +244,10 @@ "description": "Indicates whether the DB instance is encrypted.\nIf you specify the DBClusterIdentifier, SnapshotIdentifier, or SourceDBInstanceIdentifier property, don't specify this property. The value is inherited from the cluster, snapshot, or source DB instance.", "type": "boolean" }, + "StorageThroughput": { + "description": "Specifies the storage throughput value for the DB cluster. This setting applies only to the gp3 storage type.", + "type": "integer" + }, "StorageType": { "description": "Specifies the storage type to be associated with the DB cluster.", "type": "string" @@ -422,7 +426,8 @@ "/properties/Endpoint/Port", "/properties/ReadEndpoint/Port", "/properties/ReadEndpoint/Address", - "/properties/MasterUserSecret/SecretArn" + "/properties/MasterUserSecret/SecretArn", + "/properties/StorageThroughput" ], "createOnlyProperties": [ "/properties/AvailabilityZones", diff --git a/aws-rds-dbcluster/pom.xml b/aws-rds-dbcluster/pom.xml index bc9cc53cd..6b745d7cc 100644 --- a/aws-rds-dbcluster/pom.xml +++ b/aws-rds-dbcluster/pom.xml @@ -30,7 +30,7 @@ software.amazon.awssdk rds - 2.22.12 + 2.24.13 software.amazon.awssdk @@ -178,7 +178,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.8 **/BaseConfiguration* diff --git a/aws-rds-dbcluster/src/main/java/software/amazon/rds/dbcluster/BaseHandlerStd.java b/aws-rds-dbcluster/src/main/java/software/amazon/rds/dbcluster/BaseHandlerStd.java index a47a3da04..30813db03 100644 --- a/aws-rds-dbcluster/src/main/java/software/amazon/rds/dbcluster/BaseHandlerStd.java +++ b/aws-rds-dbcluster/src/main/java/software/amazon/rds/dbcluster/BaseHandlerStd.java @@ -44,6 +44,7 @@ import software.amazon.awssdk.services.rds.model.Event; import software.amazon.awssdk.services.rds.model.GlobalCluster; import software.amazon.awssdk.services.rds.model.GlobalClusterNotFoundException; +import software.amazon.awssdk.services.rds.model.InsufficientDbInstanceCapacityException; import software.amazon.awssdk.services.rds.model.InsufficientStorageClusterCapacityException; import software.amazon.awssdk.services.rds.model.InvalidDbClusterSnapshotStateException; import software.amazon.awssdk.services.rds.model.InvalidDbClusterStateException; @@ -136,6 +137,7 @@ public abstract class BaseHandlerStd extends BaseHandler { .withErrorClasses(ErrorStatus.failWith(HandlerErrorCode.ServiceLimitExceeded), DbClusterQuotaExceededException.class, InsufficientStorageClusterCapacityException.class, + InsufficientDbInstanceCapacityException.class, StorageQuotaExceededException.class, SnapshotQuotaExceededException.class) .withErrorClasses(ErrorStatus.failWith(HandlerErrorCode.ResourceConflict), 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 903cd5b28..784926105 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 @@ -567,6 +567,7 @@ public static ResourceModel translateDbClusterFromSdk( .serverlessV2ScalingConfiguration(translateServerlessV2ScalingConfigurationFromSdk(dbCluster.serverlessV2ScalingConfiguration())) .scalingConfiguration(translateScalingConfigurationFromSdk(dbCluster.scalingConfigurationInfo())) .storageEncrypted(dbCluster.storageEncrypted()) + .storageThroughput(dbCluster.storageThroughput()) .storageType(Optional.ofNullable(dbCluster.storageType()).orElse(STORAGE_TYPE_AURORA)) .tags(translateTagsFromSdk(dbCluster.tagList())) .vpcSecurityGroupIds( diff --git a/aws-rds-dbcluster/src/test/java/software/amazon/rds/dbcluster/TranslatorTest.java b/aws-rds-dbcluster/src/test/java/software/amazon/rds/dbcluster/TranslatorTest.java index e183ca790..b2ecff742 100644 --- a/aws-rds-dbcluster/src/test/java/software/amazon/rds/dbcluster/TranslatorTest.java +++ b/aws-rds-dbcluster/src/test/java/software/amazon/rds/dbcluster/TranslatorTest.java @@ -26,6 +26,9 @@ public class TranslatorTest extends AbstractHandlerTest { private final static String STORAGE_TYPE_AURORA = "aurora"; private final static String STORAGE_TYPE_AURORA_IOPT1 = "aurora-opt1"; + private final static String STORAGE_TYPE_GP3 = "gp3"; + private final static boolean IS_NOT_ROLLBACK = false; + private final static boolean IS_ROLLBACK = true; @Test @@ -36,12 +39,52 @@ public void createDbClusterRequest_enableGlobalWriteForwarding() { assertThat(request.enableGlobalWriteForwarding()).isEqualTo(Boolean.TRUE); } + @Test + public void createDbClusterRequest_storageTypeAndIops_shouldBeSet() { + final ResourceModel model = ResourceModel.builder() + .engine(ENGINE_AURORA_POSTGRESQL) + .storageType(STORAGE_TYPE_GP3) + .iops(100) + .allocatedStorage(300) + .build(); + + final CreateDbClusterRequest request = Translator.createDbClusterRequest(model, Tagging.TagSet.emptySet()); + assertThat(request.storageType()).isEqualTo(STORAGE_TYPE_GP3); + assertThat(request.iops()).isEqualTo(100); + assertThat(request.allocatedStorage()).isEqualTo(300); + } + + @Test + public void restoreDbClusterFromSnapshotRequest_setStorageType() { + final ResourceModel model = ResourceModel.builder() + .engine(ENGINE_AURORA_POSTGRESQL) + .storageType(STORAGE_TYPE_GP3) + .iops(100) + .build(); + + final RestoreDbClusterFromSnapshotRequest request = Translator.restoreDbClusterFromSnapshotRequest(model, Tagging.TagSet.emptySet()); + assertThat(request.storageType()).isEqualTo(STORAGE_TYPE_GP3); + assertThat(request.iops()).isEqualTo(100); + } + + @Test + public void restoreDbClusterToPointInTimeRequest_setStorageType() { + final ResourceModel model = ResourceModel.builder() + .engine(ENGINE_AURORA_POSTGRESQL) + .storageType(STORAGE_TYPE_GP3) + .iops(100) + .build(); + + final RestoreDbClusterToPointInTimeRequest request = Translator.restoreDbClusterToPointInTimeRequest(model, Tagging.TagSet.emptySet()); + assertThat(request.storageType()).isEqualTo(STORAGE_TYPE_GP3); + assertThat(request.iops()).isEqualTo(100); + } + @Test public void modifyDbClusterRequest_omitPreferredMaintenanceWindowIfUnchanged() { final ResourceModel model = RESOURCE_MODEL.toBuilder().preferredMaintenanceWindow("old").build(); - final Boolean isRollback = false; - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(model, model, isRollback); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(model, model, IS_NOT_ROLLBACK); assertThat(request.preferredMaintenanceWindow()).isNull(); } @@ -50,18 +93,16 @@ public void modifyDbClusterRequest_setPreferredMaintenanceWindow() { final ResourceModel previousModel = RESOURCE_MODEL.toBuilder().preferredMaintenanceWindow("old").build(); final ResourceModel desiredModel = RESOURCE_MODEL.toBuilder().preferredMaintenanceWindow("new").build(); - final Boolean isRollback = false; - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, isRollback); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, IS_NOT_ROLLBACK); assertThat(request.preferredMaintenanceWindow()).isEqualTo("new"); } @Test public void modifyDbClusterRequest_omitPreferredBackupWindowIfUnchanged() { final ResourceModel model = RESOURCE_MODEL.toBuilder().preferredBackupWindow("old").build(); - final Boolean isRollback = false; - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(model, model, isRollback); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(model, model, IS_NOT_ROLLBACK); assertThat(request.preferredBackupWindow()).isNull(); } @@ -69,18 +110,16 @@ public void modifyDbClusterRequest_omitPreferredBackupWindowIfUnchanged() { public void modifyDbClusterRequest_setPreferredBackupWindowWindow() { final ResourceModel previousModel = RESOURCE_MODEL.toBuilder().preferredBackupWindow("old").build(); final ResourceModel desiredModel = RESOURCE_MODEL.toBuilder().preferredBackupWindow("new").build(); - final Boolean isRollback = false; - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, isRollback); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, IS_NOT_ROLLBACK); assertThat(request.preferredBackupWindow()).isEqualTo("new"); } @Test public void modifyDbClusterRequest_omitEnableIAMDatabaseAuthenticationIfUnchanged() { final ResourceModel model = RESOURCE_MODEL.toBuilder().enableIAMDatabaseAuthentication(true).build(); - final Boolean isRollback = false; - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(model, model, isRollback); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(model, model, IS_NOT_ROLLBACK); assertThat(request.enableIAMDatabaseAuthentication()).isNull(); } @@ -88,9 +127,8 @@ public void modifyDbClusterRequest_omitEnableIAMDatabaseAuthenticationIfUnchange public void modifyDbClusterRequest_setEnableIAMDatabaseAuthentication() { final ResourceModel previousModel = RESOURCE_MODEL.toBuilder().enableIAMDatabaseAuthentication(false).build(); final ResourceModel desiredModel = RESOURCE_MODEL.toBuilder().enableIAMDatabaseAuthentication(true).build(); - final Boolean isRollback = false; - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, isRollback); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, IS_NOT_ROLLBACK); assertThat(request.enableIAMDatabaseAuthentication()).isEqualTo(Boolean.TRUE); } @@ -98,39 +136,54 @@ public void modifyDbClusterRequest_setEnableIAMDatabaseAuthentication() { public void modifyDbClusterRequest_setEnableGlobalWriteForwarding() { final ResourceModel previousModel = RESOURCE_MODEL.toBuilder().enableGlobalWriteForwarding(false).build(); final ResourceModel desiredModel = RESOURCE_MODEL.toBuilder().enableGlobalWriteForwarding(true).build(); - final Boolean isRollback = false; - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, isRollback); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, IS_NOT_ROLLBACK); assertThat(request.enableGlobalWriteForwarding()).isEqualTo(Boolean.TRUE); } @Test - public void ModifyDbClusterRequest_dbInstanceParameterGroupNameIsNotSetWhenEngineVersionIsNotUpgrading() { + public void modifyDbClusterRequest_dbInstanceParameterGroupNameIsNotSetWhenEngineVersionIsNotUpgrading() { final ResourceModel previousModel = RESOURCE_MODEL.toBuilder().engineVersion("old-engine").dBInstanceParameterGroupName("old-pg").build(); final ResourceModel desiredModel = RESOURCE_MODEL.toBuilder().engineVersion("old-engine").dBInstanceParameterGroupName("new-pg").build(); - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, false); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, IS_NOT_ROLLBACK); assertThat(request.dbInstanceParameterGroupName()).isBlank(); } @Test - public void ModifyDbClusterRequest_dbInstanceParameterGroupNameIsSetWhenEngineVersionIsUpgrading() { + public void modifyDbClusterRequest_dbInstanceParameterGroupNameIsSetWhenEngineVersionIsUpgrading() { final ResourceModel previousModel = RESOURCE_MODEL.toBuilder().engineVersion("old-engine").dBInstanceParameterGroupName("old-pg").build(); final ResourceModel desiredModel = RESOURCE_MODEL.toBuilder().engineVersion("new-engine").dBInstanceParameterGroupName("new-pg").build(); - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, false); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, IS_NOT_ROLLBACK); assertThat(request.dbInstanceParameterGroupName()).isEqualTo("new-pg"); } @Test - public void ModifyDbClusterRequest_dbInstanceParameterGroupNameIsNotSetDuringRollback() { + public void modifyDbClusterRequest_dbInstanceParameterGroupNameIsNotSetDuringRollback() { final ResourceModel previousModel = RESOURCE_MODEL.toBuilder().engineVersion("old-engine").dBInstanceParameterGroupName("old-pg").build(); final ResourceModel desiredModel = RESOURCE_MODEL.toBuilder().engineVersion("new-engine").dBInstanceParameterGroupName("new-pg").build(); - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, true); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, IS_ROLLBACK); assertThat(request.dbInstanceParameterGroupName()).isBlank(); } + @Test + public void modifyDbClusterRequest_setStorageType() { + final ResourceModel previousModel = RESOURCE_MODEL.toBuilder().build(); + final ResourceModel desiredModel = RESOURCE_MODEL.toBuilder() + .engine(ENGINE_AURORA_POSTGRESQL) + .storageType(STORAGE_TYPE_GP3) + .iops(100) + .allocatedStorage(300) + .build(); + + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, IS_NOT_ROLLBACK); + assertThat(request.storageType()).isEqualTo(STORAGE_TYPE_GP3); + assertThat(request.iops()).isEqualTo(100); + assertThat(request.allocatedStorage()).isEqualTo(300); + } + @Test public void test_translateDbClusterFromSdk_emptyDomainMembership() { final DBCluster cluster = DBCluster.builder() @@ -165,7 +218,7 @@ public void translateManageMasterUserPassword_fromUnsetToUnset() { .masterUserPassword("password") .build(); - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(prev, desired, false); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(prev, desired, IS_NOT_ROLLBACK); assertThat(request.manageMasterUserPassword()).isNull(); assertThat(request.masterUserSecretKmsKeyId()).isNull(); @@ -181,7 +234,7 @@ public void translateManageMasterUserPassword_fromSetToUnset() { final ResourceModel desired = RESOURCE_MODEL.toBuilder() .build(); - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(prev, desired, false); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(prev, desired, IS_NOT_ROLLBACK); assertThat(request.manageMasterUserPassword()).isFalse(); assertThat(request.masterUserSecretKmsKeyId()).isNull(); @@ -198,7 +251,7 @@ public void translateManageMasterUserPassword_explicitUnset() { .masterUserSecret(MasterUserSecret.builder().kmsKeyId("key1").build()) .build(); - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(prev, desired, false); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(prev, desired, IS_NOT_ROLLBACK); assertThat(request.manageMasterUserPassword()).isFalse(); assertThat(request.masterUserSecretKmsKeyId()).isNull(); @@ -214,7 +267,7 @@ public void translateManageMasterUserPassword_fromUnsetToSet_withDefaultKey() { .masterUserSecret(MasterUserSecret.builder().kmsKeyId(null).build()) .build(); - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(prev, desired, false); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(prev, desired, IS_NOT_ROLLBACK); assertThat(request.manageMasterUserPassword()).isTrue(); assertThat(request.masterUserSecretKmsKeyId()).isNull(); @@ -230,7 +283,7 @@ public void translateManageMasterUserPassword_fromUnsetToSet_withSpecificKey() { .masterUserSecret(MasterUserSecret.builder().kmsKeyId("myKey").build()) .build(); - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(prev, desired, false); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(prev, desired, IS_NOT_ROLLBACK); assertThat(request.manageMasterUserPassword()).isTrue(); assertThat(request.masterUserSecretKmsKeyId()).isEqualTo("myKey"); @@ -249,7 +302,7 @@ public void translateManageMasterUserPassword_fromExplicitFalseToExplicitFalse() .masterUserSecret(MasterUserSecret.builder().kmsKeyId("key").build()) .build(); - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(prev, desired, false); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(prev, desired, IS_NOT_ROLLBACK); assertThat(request.manageMasterUserPassword()).isNull(); assertThat(request.masterUserSecretKmsKeyId()).isNull(); @@ -313,7 +366,7 @@ public void test_modifyAfterCreateWhenManageMasterUserPasswordIsTrueWithImplicit .manageMasterUserPassword(true) .build(); - final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(desired, desired, false); + final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(desired, desired, IS_NOT_ROLLBACK); assertThat(request.manageMasterUserPassword()).isTrue(); assertThat(request.masterUserSecretKmsKeyId()).isNull(); diff --git a/aws-rds-dbclusterendpoint/pom.xml b/aws-rds-dbclusterendpoint/pom.xml index 2002abf22..f505bc59e 100644 --- a/aws-rds-dbclusterendpoint/pom.xml +++ b/aws-rds-dbclusterendpoint/pom.xml @@ -30,7 +30,7 @@ software.amazon.awssdk rds - 2.21.17 + 2.24.13 @@ -167,7 +167,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.8 **/BaseConfiguration* diff --git a/aws-rds-dbclusterparametergroup/pom.xml b/aws-rds-dbclusterparametergroup/pom.xml index 2c9e6ac63..e36c8de10 100644 --- a/aws-rds-dbclusterparametergroup/pom.xml +++ b/aws-rds-dbclusterparametergroup/pom.xml @@ -30,7 +30,7 @@ software.amazon.awssdk rds - 2.21.17 + 2.24.13 @@ -167,7 +167,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.8 **/BaseConfiguration* diff --git a/aws-rds-dbinstance/pom.xml b/aws-rds-dbinstance/pom.xml index 1048c544c..604213fbb 100644 --- a/aws-rds-dbinstance/pom.xml +++ b/aws-rds-dbinstance/pom.xml @@ -33,7 +33,7 @@ software.amazon.awssdk rds - 2.21.17 + 2.24.13 software.amazon.awssdk @@ -175,7 +175,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.8 **/BaseConfiguration* diff --git a/aws-rds-dbinstance/src/main/java/software/amazon/rds/dbinstance/BaseHandlerStd.java b/aws-rds-dbinstance/src/main/java/software/amazon/rds/dbinstance/BaseHandlerStd.java index 304a19eca..d0f43d907 100644 --- a/aws-rds-dbinstance/src/main/java/software/amazon/rds/dbinstance/BaseHandlerStd.java +++ b/aws-rds-dbinstance/src/main/java/software/amazon/rds/dbinstance/BaseHandlerStd.java @@ -772,22 +772,23 @@ boolean isNoPendingChanges(final DBInstance dbInstance) { final PendingModifiedValues pending = dbInstance.pendingModifiedValues(); return (pending == null) || (pending.dbInstanceClass() == null && pending.allocatedStorage() == null && - pending.masterUserPassword() == null && - pending.port() == null && + pending.automationMode() == null && pending.backupRetentionPeriod() == null && - pending.multiAZ() == null && - pending.engineVersion() == null && + pending.dbInstanceIdentifier() == null && + pending.dbSubnetGroupName() == null && pending.engine() == null && + pending.engineVersion() == null && + pending.iamDatabaseAuthenticationEnabled() == null && pending.iops() == null && - pending.dbInstanceIdentifier() == null && pending.licenseModel() == null && - pending.storageType() == null && - pending.dbSubnetGroupName() == null && + pending.masterUserPassword() == null && + pending.multiAZ() == null && pending.pendingCloudwatchLogsExports() == null && + pending.port() == null && CollectionUtils.isNullOrEmpty(pending.processorFeatures()) && - pending.iamDatabaseAuthenticationEnabled() == null && - pending.automationMode() == null && - pending.resumeFullAutomationModeTime() == null + pending.resumeFullAutomationModeTime() == null && + pending.storageThroughput() == null && + pending.storageType() == null ); } diff --git a/aws-rds-dbparametergroup/pom.xml b/aws-rds-dbparametergroup/pom.xml index 01767a5e2..c6e18e66d 100644 --- a/aws-rds-dbparametergroup/pom.xml +++ b/aws-rds-dbparametergroup/pom.xml @@ -23,7 +23,7 @@ software.amazon.awssdk rds - 2.21.17 + 2.24.13 @@ -160,7 +160,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.8 **/BaseConfiguration* diff --git a/aws-rds-dbsubnetgroup/pom.xml b/aws-rds-dbsubnetgroup/pom.xml index ffcc8d723..752efadb3 100644 --- a/aws-rds-dbsubnetgroup/pom.xml +++ b/aws-rds-dbsubnetgroup/pom.xml @@ -23,7 +23,7 @@ software.amazon.awssdk rds - 2.21.17 + 2.24.13 @@ -160,7 +160,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.8 **/BaseConfiguration* diff --git a/aws-rds-eventsubscription/pom.xml b/aws-rds-eventsubscription/pom.xml index c310db925..414f37f7b 100644 --- a/aws-rds-eventsubscription/pom.xml +++ b/aws-rds-eventsubscription/pom.xml @@ -29,7 +29,7 @@ software.amazon.awssdk rds - 2.21.17 + 2.24.13 @@ -160,7 +160,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.8 **/BaseConfiguration* diff --git a/aws-rds-globalcluster/pom.xml b/aws-rds-globalcluster/pom.xml index 3ac7c9504..7dae3a1e1 100644 --- a/aws-rds-globalcluster/pom.xml +++ b/aws-rds-globalcluster/pom.xml @@ -28,7 +28,7 @@ software.amazon.awssdk rds - 2.21.17 + 2.24.13 @@ -153,7 +153,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.8 **/BaseConfiguration* diff --git a/aws-rds-integration/pom.xml b/aws-rds-integration/pom.xml index 2f97cde52..e9557b9af 100644 --- a/aws-rds-integration/pom.xml +++ b/aws-rds-integration/pom.xml @@ -22,7 +22,7 @@ software.amazon.awssdk rds - 2.21.17 + 2.24.13 @@ -159,7 +159,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.8 **/BaseConfiguration* diff --git a/aws-rds-optiongroup/pom.xml b/aws-rds-optiongroup/pom.xml index af77ed079..0e5d50834 100644 --- a/aws-rds-optiongroup/pom.xml +++ b/aws-rds-optiongroup/pom.xml @@ -23,7 +23,7 @@ software.amazon.awssdk rds - 2.21.17 + 2.24.13 @@ -160,7 +160,7 @@ org.jacoco jacoco-maven-plugin - 0.8.4 + 0.8.8 **/BaseConfiguration*