Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(redshift): adds elasticIp parameter to redshift cluster #21085

Merged
merged 7 commits into from
Jul 18, 2022
Merged

feat(redshift): adds elasticIp parameter to redshift cluster #21085

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
02cb331
:sparkles: feat(redshift): adds elasticIp parameter to redshift cluster
daschaa Jul 10, 2022
a756459
:memo: Adds more information to README and integ test
daschaa Jul 12, 2022
593cecc
Merge branch 'main' into redshift_elastic_ip
daschaa Jul 12, 2022
3fed76b
:rotating_light: Fixes linter warnings
daschaa Jul 12, 2022
b0727b1
:memo: Updates README
daschaa Jul 14, 2022
13292f0
Merge branch 'main' into redshift_elastic_ip
mergify[bot] Jul 15, 2022
638abec
Merge branch 'main' into redshift_elastic_ip
mergify[bot] Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/@aws-cdk/aws-redshift/lib/cluster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,13 @@ export interface ClusterProps {
* @default false
*/
readonly publiclyAccessible?: boolean

/**
* The Elastic IP (EIP) address for the cluster.
*
* @default - No Elastic IP
*/
readonly elasticIp?: string
}

/**
Expand Down Expand Up @@ -485,6 +492,7 @@ export class Cluster extends ClusterBase {
// Encryption
kmsKeyId: props.encryptionKey?.keyId,
encrypted: props.encrypted ?? true,
elasticIp: props.elasticIp,
});

cluster.applyRemovalPolicy(removalPolicy, {
Expand Down
33 changes: 33 additions & 0 deletions packages/@aws-cdk/aws-redshift/test/cluster.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,39 @@ test('default child returns a CfnCluster', () => {
expect(cluster.node.defaultChild).toBeInstanceOf(CfnCluster);
});

test('elastic ip address', () => {
// WHEN
new Cluster(stack, 'Redshift', {
masterUser: {
masterUsername: 'admin',
masterPassword: cdk.SecretValue.unsafePlainText('tooshort'),
},
vpc,
elasticIp: '1.3.3.7',
});

// THEN
Template.fromStack(stack).hasResource('AWS::Redshift::Cluster', {
Properties: {
AllowVersionUpgrade: true,
MasterUsername: 'admin',
MasterUserPassword: 'tooshort',
ClusterType: 'multi-node',
AutomatedSnapshotRetentionPeriod: 1,
Encrypted: true,
NumberOfNodes: 2,
NodeType: 'dc2.large',
DBName: 'default_db',
PubliclyAccessible: false,
ClusterSubnetGroupName: { Ref: 'RedshiftSubnetsDFE70E0A' },
VpcSecurityGroupIds: [{ 'Fn::GetAtt': ['RedshiftSecurityGroup796D74A7', 'GroupId'] }],
ElasticIp: '1.3.3.7',
},
DeletionPolicy: 'Retain',
UpdateReplacePolicy: 'Retain',
});
});

function testStack() {
const newTestStack = new cdk.Stack(undefined, undefined, { env: { account: '12345', region: 'us-test-1' } });
newTestStack.node.setContext('availability-zones:12345:us-test-1', ['us-test-1a', 'us-test-1b']);
Expand Down