Skip to content

Commit ce58d15

Browse files
ibrahimcesarTikiTDO
authored andcommitted
fix(redshift): tableNameSuffix evaluation (aws#17213)
- Check if the generateSuffix is explicitly 'true'; - Closes aws#17064 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
1 parent b14a403 commit ce58d15

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

Diff for: packages/@aws-cdk/aws-redshift/lib/private/database-query-provider/table.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { ClusterProps, executeStatement } from './util';
66

77
export async function handler(props: TableHandlerProps & ClusterProps, event: AWSLambda.CloudFormationCustomResourceEvent) {
88
const tableNamePrefix = props.tableName.prefix;
9-
const tableNameSuffix = props.tableName.generateSuffix ? `${event.RequestId.substring(0, 8)}` : '';
9+
const tableNameSuffix = props.tableName.generateSuffix === 'true' ? `${event.RequestId.substring(0, 8)}` : '';
1010
const tableColumns = props.tableColumns;
1111
const clusterProps = props;
1212

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export interface UserHandlerProps {
1515
export interface TableHandlerProps {
1616
readonly tableName: {
1717
readonly prefix: string;
18-
readonly generateSuffix: boolean;
18+
readonly generateSuffix: string;
1919
};
2020
readonly tableColumns: Column[];
2121
}

Diff for: packages/@aws-cdk/aws-redshift/lib/table.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ export class Table extends TableBase {
194194
properties: {
195195
tableName: {
196196
prefix: props.tableName ?? cdk.Names.uniqueId(this),
197-
generateSuffix: !props.tableName,
197+
generateSuffix: !props.tableName ? 'true' : 'false',
198198
},
199199
tableColumns: this.tableColumns,
200200
},

Diff for: packages/@aws-cdk/aws-redshift/test/database-query-provider/table.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const physicalResourceId = 'PhysicalResourceId';
1010
const resourceProperties = {
1111
tableName: {
1212
prefix: tableNamePrefix,
13-
generateSuffix: true,
13+
generateSuffix: 'true',
1414
},
1515
tableColumns,
1616
clusterName,
@@ -64,7 +64,7 @@ describe('create', () => {
6464
...resourceProperties,
6565
tableName: {
6666
...resourceProperties.tableName,
67-
generateSuffix: false,
67+
generateSuffix: 'false',
6868
},
6969
};
7070

Diff for: packages/@aws-cdk/aws-redshift/test/integ.database.expected.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,7 @@
13691369
"databaseName": "my_db",
13701370
"tableName": {
13711371
"prefix": "awscdkredshiftclusterdatabaseTable24923533",
1372-
"generateSuffix": true
1372+
"generateSuffix": "true"
13731373
},
13741374
"tableColumns": [
13751375
{
@@ -1412,4 +1412,4 @@
14121412
"Description": "Artifact hash for asset \"daeb79e3cee39c9b902dc0d5c780223e227ed573ea60976252947adab5fb2be1\""
14131413
}
14141414
}
1415-
}
1415+
}

Diff for: packages/@aws-cdk/aws-redshift/test/table.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ describe('cluster table', () => {
4040
Template.fromStack(stack).hasResourceProperties('Custom::RedshiftDatabaseQuery', {
4141
tableName: {
4242
prefix: 'Table',
43-
generateSuffix: true,
43+
generateSuffix: 'true',
4444
},
4545
tableColumns,
4646
});
@@ -67,7 +67,7 @@ describe('cluster table', () => {
6767
Template.fromStack(stack).hasResourceProperties('Custom::RedshiftDatabaseQuery', {
6868
tableName: {
6969
prefix: tableName,
70-
generateSuffix: false,
70+
generateSuffix: 'false',
7171
},
7272
});
7373
});

0 commit comments

Comments
 (0)