fix(redshift): tableNameSuffix evaluation

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;
 

packages/@aws-cdk/aws-redshift/lib/private/handler-props.ts

@@ -1,4 +1,4 @@
-import { Column } from '../table';
+import { Column } from "../table";
 
 export interface DatabaseQueryHandlerProps {
   readonly handler: string;
@@ -15,7 +15,7 @@ export interface UserHandlerProps {
 export interface TableHandlerProps {
   readonly tableName: {
     readonly prefix: string;
-    readonly generateSuffix: boolean;
+    readonly generateSuffix: string;
   };
   readonly tableColumns: Column[];
 }

packages/@aws-cdk/aws-redshift/lib/table.ts

@@ -1,15 +1,15 @@
-import * as cdk from '@aws-cdk/core';
-import { Construct } from 'constructs';
-import { ICluster } from './cluster';
-import { DatabaseOptions } from './database-options';
-import { DatabaseQuery } from './private/database-query';
-import { HandlerName } from './private/database-query-provider/handler-name';
-import { TableHandlerProps } from './private/handler-props';
-import { IUser } from './user';
+import * as cdk from "@aws-cdk/core";
+import { Construct } from "constructs";
+import { ICluster } from "./cluster";
+import { DatabaseOptions } from "./database-options";
+import { DatabaseQuery } from "./private/database-query";
+import { HandlerName } from "./private/database-query-provider/handler-name";
+import { TableHandlerProps } from "./private/handler-props";
+import { IUser } from "./user";
 
 // keep this import separate from other imports to reduce chance for merge conflicts with v2-main
 // eslint-disable-next-line no-duplicate-imports, import/order
-import { Construct as CoreConstruct } from '@aws-cdk/core';
+import { Construct as CoreConstruct } from "@aws-cdk/core";
 
 /**
  * An action that a Redshift user can be granted privilege to perform on a table.
@@ -50,7 +50,7 @@ export enum TableAction {
   /**
    * Grants all available privileges at once to the specified user or user group.
    */
-  ALL
+  ALL,
 }
 
 /**
@@ -164,13 +164,17 @@ export class Table extends TableBase {
   /**
    * Specify a Redshift table using a table name and schema that already exists.
    */
-  static fromTableAttributes(scope: Construct, id: string, attrs: TableAttributes): ITable {
-    return new class extends TableBase {
+  static fromTableAttributes(
+    scope: Construct,
+    id: string,
+    attrs: TableAttributes
+  ): ITable {
+    return new (class extends TableBase {
       readonly tableName = attrs.tableName;
       readonly tableColumns = attrs.tableColumns;
       readonly cluster = attrs.cluster;
       readonly databaseName = attrs.databaseName;
-    }(scope, id);
+    })(scope, id);
   }
 
   readonly tableName: string;
@@ -187,14 +191,14 @@ export class Table extends TableBase {
     this.cluster = props.cluster;
     this.databaseName = props.databaseName;
 
-    this.resource = new DatabaseQuery<TableHandlerProps>(this, 'Resource', {
+    this.resource = new DatabaseQuery<TableHandlerProps>(this, "Resource", {
       removalPolicy: cdk.RemovalPolicy.RETAIN,
       ...props,
       handler: HandlerName.Table,
       properties: {
         tableName: {
           prefix: props.tableName ?? cdk.Names.uniqueId(this),
-          generateSuffix: !props.tableName,
+          generateSuffix: !props.tableName ? "true" : "false",
         },
         tableColumns: this.tableColumns,
       },