Merge pull request #664 from perfectsense/bugfix/master-user-secret-k…

…ms-key-throws-null-pointer Add null pointer checks for improved error handling
perfectsense · Oct 1, 2024 · 5187cab · 5187cab
2 parents 4a75c38 + 8e17ceb
commit 5187cab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/gyro/aws/rds/DbClusterParameterGroupFinder.java b/src/main/java/gyro/aws/rds/DbClusterParameterGroupFinder.java
@@ -34,7 +34,7 @@
  *
  * .. code-block:: gyro
  *
- *    cluster-parameter-groups: $(external-query aws::db-cluster-parameter-group { name: 'cluster-parameter-group-example'})
+ *    db-cluster-parameter-group: $(external-query aws::db-cluster-parameter-group { name: 'cluster-parameter-group-example'})
  */
 @Type("db-cluster-parameter-group")
 public class DbClusterParameterGroupFinder extends AwsFinder<RdsClient, DBClusterParameterGroup, DbClusterParameterGroupResource> {

diff --git a/src/main/java/gyro/aws/rds/DbClusterResource.java b/src/main/java/gyro/aws/rds/DbClusterResource.java
@@ -906,7 +906,8 @@ protected void doCreate(GyroUI ui, State state) {
                         .map(SecurityGroupResource::getId)
                         .collect(Collectors.toList()) : null)
                     .manageMasterUserPassword(getManageMasterUserPassword())
-                    .masterUserSecretKmsKeyId(getMasterUserSecretKmsKey().getId())
+                    .masterUserSecretKmsKeyId(
+                        getMasterUserSecretKmsKey() == null ? null : getMasterUserSecretKmsKey().getId())
                     .serverlessV2ScalingConfiguration(getServerlessV2ScalingConfiguration() != null ?
                         getServerlessV2ScalingConfiguration().toServerlessV2ScalingConfiguration() : null)
                     .storageType(getStorageType())
@@ -967,7 +968,8 @@ protected void doCreate(GyroUI ui, State state) {
                     .dbClusterInstanceClass(getDbClusterInstanceClass())
                     .iops(getIops())
                     .manageMasterUserPassword(getManageMasterUserPassword())
-                    .masterUserSecretKmsKeyId(getMasterUserSecretKmsKey().getId())
+                    .masterUserSecretKmsKeyId(
+                        getMasterUserSecretKmsKey() == null ? null : getMasterUserSecretKmsKey().getId())
                     .serverlessV2ScalingConfiguration(getServerlessV2ScalingConfiguration() != null ?
                         getServerlessV2ScalingConfiguration().toServerlessV2ScalingConfiguration() : null)
                     .storageType(getStorageType())
@@ -1063,7 +1065,8 @@ protected void doUpdate(Resource config, Set<String> changedProperties) {
                     .dbClusterInstanceClass(getDbClusterInstanceClass())
                     .iops(getIops())
                     .manageMasterUserPassword(getManageMasterUserPassword())
-                    .masterUserSecretKmsKeyId(getMasterUserSecretKmsKey().getId())
+                    .masterUserSecretKmsKeyId(
+                        getMasterUserSecretKmsKey() == null ? null : getMasterUserSecretKmsKey().getId())
                     .serverlessV2ScalingConfiguration(getServerlessV2ScalingConfiguration() != null ?
                         getServerlessV2ScalingConfiguration().toServerlessV2ScalingConfiguration() : null)
                     .storageType(getStorageType())