fix(redshift): tableNameSuffix evaluation (#17213)

- Check if the generateSuffix is explicitly 'true'; - Closes #17064 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
aws · Nov 11, 2021 · f7c3217 · f7c3217
1 parent 8fa293a
commit f7c3217
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/packages/@aws-cdk/aws-redshift/lib/private/database-query-provider/table.ts b/packages/@aws-cdk/aws-redshift/lib/private/database-query-provider/table.ts
@@ -6,7 +6,7 @@ import { ClusterProps, executeStatement } from './util';
 
 export async function handler(props: TableHandlerProps & ClusterProps, event: AWSLambda.CloudFormationCustomResourceEvent) {
   const tableNamePrefix = props.tableName.prefix;
-  const tableNameSuffix = props.tableName.generateSuffix ? `${event.RequestId.substring(0, 8)}` : '';
+  const tableNameSuffix = props.tableName.generateSuffix === 'true' ? `${event.RequestId.substring(0, 8)}` : '';
   const tableColumns = props.tableColumns;
   const clusterProps = props;
 

diff --git a/packages/@aws-cdk/aws-redshift/lib/private/handler-props.ts b/packages/@aws-cdk/aws-redshift/lib/private/handler-props.ts
@@ -15,7 +15,7 @@ export interface UserHandlerProps {
 export interface TableHandlerProps {
   readonly tableName: {
     readonly prefix: string;
-    readonly generateSuffix: boolean;
+    readonly generateSuffix: string;
   };
   readonly tableColumns: Column[];
 }

diff --git a/packages/@aws-cdk/aws-redshift/lib/table.ts b/packages/@aws-cdk/aws-redshift/lib/table.ts
@@ -194,7 +194,7 @@ export class Table extends TableBase {
       properties: {
         tableName: {
           prefix: props.tableName ?? cdk.Names.uniqueId(this),
-          generateSuffix: !props.tableName,
+          generateSuffix: !props.tableName ? 'true' : 'false',
         },
         tableColumns: this.tableColumns,
       },

diff --git a/packages/@aws-cdk/aws-redshift/test/database-query-provider/table.test.ts b/packages/@aws-cdk/aws-redshift/test/database-query-provider/table.test.ts
@@ -10,7 +10,7 @@ const physicalResourceId = 'PhysicalResourceId';
 const resourceProperties = {
   tableName: {
     prefix: tableNamePrefix,
-    generateSuffix: true,
+    generateSuffix: 'true',
   },
   tableColumns,
   clusterName,
@@ -64,7 +64,7 @@ describe('create', () => {
       ...resourceProperties,
       tableName: {
         ...resourceProperties.tableName,
-        generateSuffix: false,
+        generateSuffix: 'false',
       },
     };
 

diff --git a/packages/@aws-cdk/aws-redshift/test/integ.database.expected.json b/packages/@aws-cdk/aws-redshift/test/integ.database.expected.json
@@ -1369,7 +1369,7 @@
         "databaseName": "my_db",
         "tableName": {
           "prefix": "awscdkredshiftclusterdatabaseTable24923533",
-          "generateSuffix": true
+          "generateSuffix": "true"
         },
         "tableColumns": [
           {
@@ -1412,4 +1412,4 @@
       "Description": "Artifact hash for asset \"daeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1\""
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-redshift/test/table.test.ts b/packages/@aws-cdk/aws-redshift/test/table.test.ts
@@ -40,7 +40,7 @@ describe('cluster table', () => {
     Template.fromStack(stack).hasResourceProperties('Custom::RedshiftDatabaseQuery', {
       tableName: {
         prefix: 'Table',
-        generateSuffix: true,
+        generateSuffix: 'true',
       },
       tableColumns,
     });
@@ -67,7 +67,7 @@ describe('cluster table', () => {
     Template.fromStack(stack).hasResourceProperties('Custom::RedshiftDatabaseQuery', {
       tableName: {
         prefix: tableName,
-        generateSuffix: false,
+        generateSuffix: 'false',
       },
     });
   });