refactor: update guard clause

aws · mergify · Feb 17, 2023 · Sep 13, 2022 · Sep 14, 2022 · Sep 15, 2022
commit a76b88763c2cad732b3080184651a1718cdeb429
diff --git a/packages/@aws-cdk/aws-redshift/lib/cluster.ts b/packages/@aws-cdk/aws-redshift/lib/cluster.ts
@@ -1,3 +1,4 @@
+import * as path from 'path';
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as iam from '@aws-cdk/aws-iam';
 import * as kms from '@aws-cdk/aws-kms';
@@ -7,7 +8,6 @@ import * as secretsmanager from '@aws-cdk/aws-secretsmanager';
 import { ArnFormat, CustomResource, Duration, IResource, Lazy, RemovalPolicy, Resource, SecretValue, Stack, Token } from '@aws-cdk/core';
 import { AwsCustomResource, AwsCustomResourcePolicy, PhysicalResourceId, Provider } from '@aws-cdk/custom-resources';
 import { Construct } from 'constructs';
-import * as path from 'path';
 import { DatabaseSecret } from './database-secret';
 import { Endpoint } from './endpoint';
 import { ClusterParameterGroup, IClusterParameterGroup } from './parameter-group';
@@ -477,11 +477,6 @@ export class Cluster extends ClusterBase {
    */
   protected parameterGroup?: IClusterParameterGroup;
 
-  /**
-   * Guards against repeated invocations of enableRebootForParameterChanges()
-   */
-  protected rebootForParameterChangesEnabled?: boolean;
-
   /**
    * The ARNs of the roles that will be attached to the cluster.
    *
@@ -707,10 +702,9 @@ export class Cluster extends ClusterBase {
    * Enables automatic cluster rebooting when changes to the cluster's parameter group require a restart to apply.
    */
   public enableRebootForParameterChanges(): void {
-    if (this.rebootForParameterChangesEnabled) {
+    if (this.node.tryFindChild('RedshiftClusterRebooterCustomResource')) {
       return;
     }
-    this.rebootForParameterChangesEnabled = true;
     const rebootFunction = new lambda.SingletonFunction(this, 'RedshiftClusterRebooterFunction', {
       uuid: '511e207f-13df-4b8b-b632-c32b30b65ac2',
       runtime: lambda.Runtime.NODEJS_16_X,

diff --git a/packages/@aws-cdk/aws-redshift/test/cluster.test.ts b/packages/@aws-cdk/aws-redshift/test/cluster.test.ts
@@ -662,6 +662,22 @@ describe('reboot for Parameter Changes', () => {
       .not.toThrowError(/Cannot enable reboot for parameter changes/);
   });
 
+  test('not create duplicate resources when reboot feature is enabled multiple times on a cluster', () => {
+    // Given
+    const cluster = new Cluster(stack, 'Redshift', {
+      masterUser: {
+        masterUsername: 'admin',
+      },
+      vpc,
+      rebootForParameterChanges: true,
+    });
+    cluster.addToParameterGroup('foo', 'bar');
+    //WHEN
+    cluster.enableRebootForParameterChanges();
+    // THEN
+    Template.fromStack(stack).resourceCountIs('Custom::RedshiftClusterRebooter', 1);
+  });
+
   test('cluster with parameter group', () => {
     // Given
     const cluster = new Cluster(stack, 'Redshift', {