fix(DBCluster): Throw DBClusterNotFoundException when the DBCluster l…

…ist is empty in describe
aws-cloudformation · Sep 4, 2024 · a4a70a6 · a4a70a6
1 parent fadd9df
commit a4a70a6
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/aws-rds-dbcluster/src/main/java/software/amazon/rds/dbcluster/BaseHandlerStd.java b/aws-rds-dbcluster/src/main/java/software/amazon/rds/dbcluster/BaseHandlerStd.java
@@ -264,6 +264,13 @@ protected DBCluster fetchDBCluster(
                 Translator.describeDbClustersRequest(model),
                 proxyClient.client()::describeDBClusters
         );
+
+        if (response.dbClusters().isEmpty()) {
+            throw DbClusterNotFoundException.builder()
+                .message(String.format("No clusters of identifier %s returned from describe call", model.getDBClusterIdentifier()))
+                .build();
+        }
+
         return response.dbClusters().get(0);
     }