Merge pull request #665 from perfectsense/bugfix/db-cluster-parameter…

…-group-does-not-refresh-parameters The db-cluster-parameter-group does not refresh parameters
perfectsense · Oct 1, 2024 · 192d8be · 192d8be
2 parents 88732e5 + 2786562
commit 192d8be
Showing 1 changed file with 28 additions and 19 deletions.
diff --git a/src/main/java/gyro/aws/rds/DbClusterParameterGroupResource.java b/src/main/java/gyro/aws/rds/DbClusterParameterGroupResource.java
@@ -33,6 +33,8 @@
 import software.amazon.awssdk.services.rds.model.DescribeDbClusterParameterGroupsResponse;
 import software.amazon.awssdk.services.rds.model.DescribeDbClusterParametersResponse;
 import software.amazon.awssdk.services.rds.model.Parameter;
+import software.amazon.awssdk.services.rds.model.DescribeDbClusterParameterGroupsRequest;
+import software.amazon.awssdk.services.rds.model.DescribeDbClusterParametersRequest;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -140,36 +142,43 @@ public void copyFrom(DBClusterParameterGroup group) {
     @Override
     protected boolean doRefresh() {
         RdsClient client = createClient(RdsClient.class);
-
         if (ObjectUtils.isBlank(getName())) {
             throw new GyroException("name is missing, unable to load cluster parameter group.");
         }
-
         try {
             DescribeDbClusterParameterGroupsResponse response = client.describeDBClusterParameterGroups(
-                r -> r.dbClusterParameterGroupName(getName())
+                DescribeDbClusterParameterGroupsRequest.builder()
+                    .dbClusterParameterGroupName(getName())
+                    .build()
             );
-
             response.dbClusterParameterGroups().forEach(this::copyFrom);
 
-            DescribeDbClusterParametersResponse parametersResponse = client.describeDBClusterParameters(
-                r -> r.dbClusterParameterGroupName(getName())
-            );
-
             Set<String> names = getParameter().stream().map(DbParameter::getName).collect(Collectors.toSet());
             getParameter().clear();
-            getParameter().addAll(parametersResponse.parameters().stream()
-                .filter(p -> names.contains(p.parameterName()))
-                .map(p -> {
-                    DbParameter parameter = new DbParameter();
-                    parameter.setApplyMethod(p.applyMethodAsString());
-                    parameter.setName(p.parameterName());
-                    parameter.setValue(p.parameterValue());
-                    return parameter;
-                })
-                .collect(Collectors.toList())
-            );
 
+            String marker = null;
+            do {
+                DescribeDbClusterParametersResponse parametersResponse = client.describeDBClusterParameters(
+                    DescribeDbClusterParametersRequest.builder()
+                        .dbClusterParameterGroupName(getName())
+                        .marker(marker)
+                        .build()
+                );
+
+                getParameter().addAll(parametersResponse.parameters().stream()
+                    .filter(p -> names.contains(p.parameterName()))
+                    .map(p -> {
+                        DbParameter parameter = new DbParameter();
+                        parameter.setApplyMethod(p.applyMethodAsString());
+                        parameter.setName(p.parameterName());
+                        parameter.setValue(p.parameterValue());
+                        return parameter;
+                    })
+                    .collect(Collectors.toList())
+                );
+
+                marker = parametersResponse.marker();
+            } while (marker != null);
         } catch (DbParameterGroupNotFoundException ex) {
             return false;
         }