Update ValidationError for DbClusterEndpointResource

perfectsense · Sep 27, 2024 · 6e1a966 · 6e1a966
1 parent d4f4437
commit 6e1a966
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/main/java/gyro/aws/rds/DbClusterEndpointResource.java b/src/main/java/gyro/aws/rds/DbClusterEndpointResource.java
@@ -231,17 +231,21 @@ public void delete(GyroUI ui, State state) {
     @Override
     public List<ValidationError> validate(Set<String> configuredFields) {
         List<ValidationError> errors = new ArrayList<>();
-
+    
         // Add validation for Aurora DB and endpointType 'WRITER'
-        String engine = getDbCluster().getEngine();
-        if ((engine.equalsIgnoreCase("aurora-mysql") || engine.equalsIgnoreCase("aurora-postgresql"))
-                && getEndpointType().equalsIgnoreCase("WRITER")) {
-            errors.add(new ValidationError(
-                    this,
-                    "dbCluster",
-                    "Database engine " + engine + " with endpointType 'WRITER' is not supported"));
+        if (getDbCluster() != null) {
+            String engine = getDbCluster().getEngine();
+            if (engine != null && getEndpointType() != null) {
+                if ((engine.equalsIgnoreCase("aurora-mysql") || engine.equalsIgnoreCase("aurora-postgresql"))
+                        && getEndpointType().equalsIgnoreCase("WRITER")) {
+                    errors.add(new ValidationError(
+                            this,
+                            "dbCluster",
+                            "Database engine " + engine + " with endpointType 'WRITER' is not supported"));
+                }
+            } 
         }
-
+    
         return errors;
     }
 }