Skip to content

fix(DBClusterParameterGroup): false drift on provided default value #620

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

Merged
merged 1 commit into from
Jul 8, 2025
Merged

fix(DBClusterParameterGroup): false drift on provided default value #620

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
1 change: 0 additions & 1 deletion aws-rds-dbclusterparametergroup/aws-rds-dbclusterparametergroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@
"permissions": [
"rds:DescribeDBClusterParameterGroups",
"rds:DescribeDBClusterParameters",
"rds:DescribeEngineDefaultClusterParameters",
"rds:ListTagsForResource"
]
},
Expand Down
19 changes: 6 additions & 13 deletions ...ametergroup/src/main/java/software/amazon/rds/dbclusterparametergroup/BaseHandlerStd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,20 +481,13 @@ private Map<String, Parameter> getParametersToModify(

@VisibleForTesting
static Map<String, Parameter> computeModifiedDBParameters(
@NonNull final Map<String, Parameter> engineDefaultParameters,
@NonNull final Map<String, Parameter> currentDBParameters
@NonNull final Map<String, Parameter> currentDBParameters
) {
final Map<String, Parameter> modifiedParameters = new HashMap<>();
for (final String paramName : currentDBParameters.keySet()) {
final Parameter currentParam = currentDBParameters.get(paramName);
final Parameter defaultParam = engineDefaultParameters.get(paramName);

if (defaultParam == null || !Objects.equals(defaultParam.parameterValue(), currentParam.parameterValue())) {
modifiedParameters.put(paramName, currentParam);
}
}

return modifiedParameters;
// Parameter 'source' can either be 'engine-default', 'user' or 'system'
// Here, we should only consider parameters modified by the user
return currentDBParameters.entrySet().stream()
.filter(entry -> "user".equals(entry.getValue().source()))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
}

/**
Expand Down
4 changes: 1 addition & 3 deletions ...parametergroup/src/main/java/software/amazon/rds/dbclusterparametergroup/ReadHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,13 @@ private ProgressEvent<ResourceModel, CallbackContext> readParameters(
final ProxyClient<RdsClient> proxyClient,
final ProgressEvent<ResourceModel, CallbackContext> progress
) {
final Map<String, Parameter> engineDefaultClusterParameters = new HashMap<>();
final Map<String, Parameter> currentDBClusterParameters = new HashMap<>();

return progress
.then(p -> describeEngineDefaultClusterParameters(proxy, proxyClient, p, null, engineDefaultClusterParameters))
.then(p -> describeDBClusterParameters(proxy, proxyClient, p, null, currentDBClusterParameters))
.then(p -> {
p.getResourceModel().setParameters(
Translator.translateParametersFromSdk(computeModifiedDBParameters(engineDefaultClusterParameters, currentDBClusterParameters))
Translator.translateParametersFromSdk(computeModifiedDBParameters(currentDBClusterParameters))
);
return p;
});
Expand Down
26 changes: 2 additions & 24 deletions ...metergroup/src/test/java/software/amazon/rds/dbclusterparametergroup/ReadHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,21 +121,11 @@ public void handleRequest_ReadParameters() {
when(rdsClient.listTagsForResource(any(ListTagsForResourceRequest.class)))
.thenReturn(ListTagsForResourceResponse.builder().build());

when(rdsClient.describeEngineDefaultClusterParameters(any(DescribeEngineDefaultClusterParametersRequest.class)))
.thenReturn(DescribeEngineDefaultClusterParametersResponse.builder()
.engineDefaults(
EngineDefaults.builder().parameters(
Parameter.builder().parameterName(PARAM_1.parameterName()).parameterValue("default").build(),
Parameter.builder().parameterName(PARAM_2.parameterName()).parameterValue("default").build()
).build()
)
.build());

when(rdsClient.describeDBClusterParameters(any(DescribeDbClusterParametersRequest.class)))
.thenReturn(DescribeDbClusterParametersResponse.builder()
.parameters(
Parameter.builder().parameterName(PARAM_1.parameterName()).parameterValue(PARAM_1.parameterValue()).build(),
Parameter.builder().parameterName(PARAM_2.parameterName()).parameterValue(PARAM_2.parameterValue()).build()
Parameter.builder().parameterName(PARAM_1.parameterName()).parameterValue(PARAM_1.parameterValue()).source("user").build(),
Parameter.builder().parameterName(PARAM_2.parameterName()).parameterValue(PARAM_2.parameterValue()).source("user").build()
)
.build()
);
Expand All @@ -158,7 +148,6 @@ public void handleRequest_ReadParameters() {

verify(rdsProxy.client(), times(1)).describeDBClusterParameterGroups(any(DescribeDbClusterParameterGroupsRequest.class));
verify(rdsProxy.client(), times(1)).describeDBClusterParameters(any(DescribeDbClusterParametersRequest.class));
verify(rdsProxy.client(), times(1)).describeEngineDefaultClusterParameters(any(DescribeEngineDefaultClusterParametersRequest.class));
verify(rdsProxy.client(), times(1)).listTagsForResource(any(ListTagsForResourceRequest.class));
}

Expand All @@ -167,16 +156,6 @@ public void handleRequest_ReadParametersWithDefaultValues() {
when(rdsClient.listTagsForResource(any(ListTagsForResourceRequest.class)))
.thenReturn(ListTagsForResourceResponse.builder().build());

when(rdsClient.describeEngineDefaultClusterParameters(any(DescribeEngineDefaultClusterParametersRequest.class)))
.thenReturn(DescribeEngineDefaultClusterParametersResponse.builder()
.engineDefaults(
EngineDefaults.builder().parameters(
Parameter.builder().parameterName(PARAM_1.parameterName()).parameterValue("default").build(),
Parameter.builder().parameterName(PARAM_2.parameterName()).parameterValue("default").build()
).build()
)
.build());

when(rdsClient.describeDBClusterParameters(any(DescribeDbClusterParametersRequest.class)))
.thenReturn(DescribeDbClusterParametersResponse.builder()
.parameters(
Expand All @@ -201,7 +180,6 @@ public void handleRequest_ReadParametersWithDefaultValues() {

verify(rdsProxy.client(), times(1)).describeDBClusterParameterGroups(any(DescribeDbClusterParameterGroupsRequest.class));
verify(rdsProxy.client(), times(1)).describeDBClusterParameters(any(DescribeDbClusterParametersRequest.class));
verify(rdsProxy.client(), times(1)).describeEngineDefaultClusterParameters(any(DescribeEngineDefaultClusterParametersRequest.class));
verify(rdsProxy.client(), times(1)).listTagsForResource(any(ListTagsForResourceRequest.class));
}
}
Loading