fix(redshift): tables were dropped on table name change

packages/@aws-cdk/aws-redshift-alpha/lib/private/database-query-provider/table.ts

@@ -1,34 +1,39 @@
 /* eslint-disable-next-line import/no-unresolved */
 import * as AWSLambda from 'aws-lambda';
+import { Column } from '../../table';
 import { executeStatement } from './redshift-data';
 import { ClusterProps, TableAndClusterProps, TableSortStyle } from './types';
-import { areColumnsEqual, getDistKeyColumn, getSortKeyColumns } from './util';
-import { Column } from '../../table';
+import { areColumnsEqual, getDistKeyColumn, getSortKeyColumns, makePhysicalId } from './util';
 
 export async function handler(props: TableAndClusterProps, event: AWSLambda.CloudFormationCustomResourceEvent) {
   const tableNamePrefix = props.tableName.prefix;
-  const tableNameSuffix = props.tableName.generateSuffix === 'true' ? `${event.RequestId.substring(0, 8)}` : '';
+  const getTableNameSuffix = (generateSuffix: string) => generateSuffix === 'true' ? `${event.StackId.substring(event.StackId.length - 12)}` : '';
   const tableColumns = props.tableColumns;
   const tableAndClusterProps = props;
   const useColumnIds = props.useColumnIds;
+  let tableName = tableNamePrefix + getTableNameSuffix(props.tableName.generateSuffix);
 
   if (event.RequestType === 'Create') {
-    const tableName = await createTable(tableNamePrefix, tableNameSuffix, tableColumns, tableAndClusterProps);
-    return { PhysicalResourceId: tableName };
+    tableName = await createTable(tableNamePrefix, getTableNameSuffix(props.tableName.generateSuffix), tableColumns, tableAndClusterProps);
+    return { PhysicalResourceId: makePhysicalId(tableNamePrefix, tableAndClusterProps, event.StackId.substring(event.StackId.length - 12)) };
   } else if (event.RequestType === 'Delete') {
-    await dropTable(event.PhysicalResourceId, tableAndClusterProps);
+    await dropTable(
+      event.PhysicalResourceId.includes(event.StackId.substring(event.StackId.length - 12)) ? tableName : event.PhysicalResourceId,
+      tableAndClusterProps,
+    );
     return;
   } else if (event.RequestType === 'Update') {
-    const tableName = await updateTable(
-      event.PhysicalResourceId,
+    const oldTableName = event.OldResourceProperties.tableName.prefix + getTableNameSuffix(event.OldResourceProperties.tableName.generateSuffix);
+    tableName = await updateTable(
+      event.PhysicalResourceId.includes(event.StackId.substring(event.StackId.length - 12)) ? oldTableName : event.PhysicalResourceId,
       tableNamePrefix,
-      tableNameSuffix,
+      getTableNameSuffix(props.tableName.generateSuffix),
       tableColumns,
       useColumnIds,
       tableAndClusterProps,
       event.OldResourceProperties as TableAndClusterProps,
     );
-    return { PhysicalResourceId: tableName };
+    return { PhysicalResourceId: event.PhysicalResourceId };
   } else {
     /* eslint-disable-next-line dot-notation */
     throw new Error(`Unrecognized event type: ${event['RequestType']}`);
@@ -89,17 +94,13 @@ async function updateTable(
   oldResourceProperties: TableAndClusterProps,
 ): Promise<string> {
   const alterationStatements: string[] = [];
+  const newTableName = tableNamePrefix + tableNameSuffix;
 
   const oldClusterProps = oldResourceProperties;
   if (tableAndClusterProps.clusterName !== oldClusterProps.clusterName || tableAndClusterProps.databaseName !== oldClusterProps.databaseName) {
     return createTable(tableNamePrefix, tableNameSuffix, tableColumns, tableAndClusterProps);
   }
 
-  const oldTableNamePrefix = oldResourceProperties.tableName.prefix;
-  if (tableNamePrefix !== oldTableNamePrefix) {
-    return createTable(tableNamePrefix, tableNameSuffix, tableColumns, tableAndClusterProps);
-  }
-
   const oldTableColumns = oldResourceProperties.tableColumns;
   const columnDeletions = oldTableColumns.filter(oldColumn => (
     tableColumns.every(column => {
@@ -208,6 +209,12 @@ async function updateTable(
 
   await Promise.all(alterationStatements.map(statement => executeStatement(statement, tableAndClusterProps)));
 
+  const oldTableNamePrefix = oldResourceProperties.tableName.prefix;
+  if (tableNamePrefix !== oldTableNamePrefix) {
+    await executeStatement(`ALTER TABLE ${tableName} RENAME TO ${newTableName}`, tableAndClusterProps);
+    return tableNamePrefix + tableNameSuffix;
+  }
+
   return tableName;
 }