Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DBCluster] Only include diff of ServerlessV2ScalingConfiguration in ModifyDBCluster Call #534

Merged
merged 1 commit into from
Apr 25, 2024
Merged

[DBCluster] Only include diff of ServerlessV2ScalingConfiguration in ModifyDBCluster Call #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion aws-rds-dbcluster/src/main/java/software/amazon/rds/dbcluster/Translator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,12 @@ static ModifyDbClusterRequest modifyDbClusterRequest(
.preferredBackupWindow(diff(previousModel.getPreferredBackupWindow(), desiredModel.getPreferredBackupWindow()))
.preferredMaintenanceWindow(diff(previousModel.getPreferredMaintenanceWindow(), desiredModel.getPreferredMaintenanceWindow()))
.scalingConfiguration(translateScalingConfigurationToSdk(desiredModel.getScalingConfiguration()))
.serverlessV2ScalingConfiguration(translateServerlessV2ScalingConfiguration(desiredModel.getServerlessV2ScalingConfiguration()))
.serverlessV2ScalingConfiguration(
diff(
translateServerlessV2ScalingConfiguration(previousModel.getServerlessV2ScalingConfiguration()),
translateServerlessV2ScalingConfiguration(desiredModel.getServerlessV2ScalingConfiguration())
)
)
.storageType(desiredModel.getStorageType());

if (!(isRollback || Objects.equals(previousModel.getEngineVersion(), desiredModel.getEngineVersion()))) {
Expand Down
55 changes: 53 additions & 2 deletions aws-rds-dbcluster/src/test/java/software/amazon/rds/dbcluster/TranslatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import com.google.common.collect.ImmutableList;
import software.amazon.awssdk.services.ec2.Ec2Client;
import software.amazon.awssdk.services.rds.RdsClient;
import software.amazon.awssdk.services.rds.model.DBCluster;
import software.amazon.awssdk.services.rds.model.CreateDbClusterRequest;
import software.amazon.awssdk.services.rds.model.DBCluster;
import software.amazon.awssdk.services.rds.model.DomainMembership;
import software.amazon.awssdk.services.rds.model.ModifyDbClusterRequest;
import software.amazon.awssdk.services.rds.model.RestoreDbClusterFromSnapshotRequest;
Expand Down Expand Up @@ -176,14 +176,65 @@ public void modifyDbClusterRequest_setStorageType() {
.storageType(STORAGE_TYPE_GP3)
.iops(100)
.allocatedStorage(300)
.build();
.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 modifyDbClusterRequest_setServerlessV2ScalingConfiguration() {
Double previousMax = 10.0;
Double desiredMax = 20.0;
Double previousMin = 1.0;
Double desiredMin = 2.0;

final ResourceModel previousModel = RESOURCE_MODEL.toBuilder().serverlessV2ScalingConfiguration(
ServerlessV2ScalingConfiguration.builder()
.maxCapacity(previousMax)
.minCapacity(previousMin)
.build()
).build();

final ResourceModel desiredModel = RESOURCE_MODEL.toBuilder().serverlessV2ScalingConfiguration(
ServerlessV2ScalingConfiguration.builder()
.maxCapacity(desiredMax)
.minCapacity(desiredMin)
.build()
).build();

final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, IS_NOT_ROLLBACK);
assertThat(request.serverlessV2ScalingConfiguration().minCapacity()).isEqualTo(desiredMin);
assertThat(request.serverlessV2ScalingConfiguration().maxCapacity()).isEqualTo(desiredMax);
}

@Test
public void modifyDbClusterRequest_sameServerlessV2ScalingConfiguration() {
Double previousMax = 10.0;
Double desiredMax = 10.0;
Double previousMin = 1.0;
Double desiredMin = 1.0;

final ResourceModel previousModel = RESOURCE_MODEL.toBuilder().serverlessV2ScalingConfiguration(
ServerlessV2ScalingConfiguration.builder()
.maxCapacity(previousMax)
.minCapacity(previousMin)
.build()
).build();

final ResourceModel desiredModel = RESOURCE_MODEL.toBuilder().serverlessV2ScalingConfiguration(
ServerlessV2ScalingConfiguration.builder()
.maxCapacity(desiredMax)
.minCapacity(desiredMin)
.build()
).build();

final ModifyDbClusterRequest request = Translator.modifyDbClusterRequest(previousModel, desiredModel, IS_NOT_ROLLBACK);
assertThat(request.serverlessV2ScalingConfiguration()).isEqualTo(null);
}

@Test
public void test_translateDbClusterFromSdk_emptyDomainMembership() {
final DBCluster cluster = DBCluster.builder()
Expand Down
Loading