Add final-db-snapshot-identifier validation

perfectsense · Oct 23, 2024 · 72df295 · 72df295
1 parent 0bd2a76
commit 72df295
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/src/main/java/gyro/aws/rds/DbClusterResource.java b/src/main/java/gyro/aws/rds/DbClusterResource.java
@@ -41,6 +41,7 @@
 import gyro.core.validation.ConflictsWith;
 import gyro.core.validation.Required;
 import gyro.core.validation.ValidStrings;
+import gyro.core.validation.ValidationError;
 import software.amazon.awssdk.services.rds.RdsClient;
 import software.amazon.awssdk.services.rds.model.CreateDbClusterRequest;
 import software.amazon.awssdk.services.rds.model.CreateDbClusterResponse;
@@ -1094,7 +1095,8 @@ public void delete(GyroUI ui, State state) {
 
         client.deleteDBCluster(
             r -> r.dbClusterIdentifier(getIdentifier())
-                .finalDBSnapshotIdentifier(!getSkipFinalSnapshot() ? getFinalDbSnapshotIdentifier() : null)
+                .finalDBSnapshotIdentifier(
+                    Boolean.TRUE.equals(getSkipFinalSnapshot()) ? null : getFinalDbSnapshotIdentifier())
                 .skipFinalSnapshot(getSkipFinalSnapshot())
         );
 
@@ -1129,4 +1131,20 @@ private void waitForActiveStatus(RdsClient client, TimeoutSettings.Action action
             throw new GyroException("Unable to reach 'available' state for rds db cluster - " + getIdentifier());
         }
     }
+
+    @Override
+    public List<ValidationError> validate(Set<String> configuredFields) {
+        ArrayList<ValidationError> errors = new ArrayList<>();
+
+        if ((getSkipFinalSnapshot() == null || Boolean.FALSE.equals(getSkipFinalSnapshot())) &&
+            getFinalDbSnapshotIdentifier() == null) {
+            errors.add(new ValidationError(
+                this,
+                "final-db-snapshot-identifier",
+                "'final-db-snapshot-identifier' is required when 'skip-final-snapshot' is unspecified or set to 'false'."
+            ));
+        }
+
+        return errors;
+    }
 }