Skip to content

Commit 399c3d0

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into kinesis-firehouse-ca-west-1
2 parents 957bf52 + cd58b50 commit 399c3d0

19 files changed

Lines changed: 2533 additions & 6 deletions

File tree

‎packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2190,3 +2190,13 @@ async function listChildren(parent: string, pred: (x: string) => Promise<boolean
21902190
async function listChildDirs(parent: string) {
21912191
return listChildren(parent, async (fullPath: string) => (await fs.stat(fullPath)).isDirectory());
21922192
}
2193+
2194+
integTest(
2195+
'cdk notices with --unacknowledged',
2196+
withDefaultFixture(async (fixture) => {
2197+
const noticesUnacknowledged = await fixture.cdk(['notices', '--unacknowledged'], { verbose: false });
2198+
const noticesUnacknowledgedAlias = await fixture.cdk(['notices', '-u'], { verbose: false });
2199+
expect(noticesUnacknowledged).toEqual(expect.stringMatching(/There are \d{1,} unacknowledged notice\(s\)./));
2200+
expect(noticesUnacknowledged).toEqual(noticesUnacknowledgedAlias);
2201+
}),
2202+
);

‎packages/@aws-cdk/aws-neptune-alpha/README.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,18 @@ new neptune.DatabaseCluster(this, 'Cluster', {
138138
});
139139
```
140140

141+
## Port
142+
143+
By default, Neptune uses port `8182`. You can override the default port by specifying the `port` property:
144+
145+
```ts
146+
const cluster = new neptune.DatabaseCluster(this, 'Database', {
147+
vpc,
148+
instanceType: neptune.InstanceType.R5_LARGE,
149+
port: 12345,
150+
});
151+
```
152+
141153
## Logging
142154

143155
Neptune supports various methods for monitoring performance and usage. One of those methods is logging

‎packages/@aws-cdk/aws-neptune-alpha/lib/cluster.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,13 @@ export interface DatabaseClusterProps {
332332
* @default - false
333333
*/
334334
readonly copyTagsToSnapshot?: boolean;
335+
336+
/**
337+
* The port number on which the DB instances in the DB cluster accept connections.
338+
*
339+
* @default 8182
340+
*/
341+
readonly port?: number;
335342
}
336343

337344
/**
@@ -617,6 +624,7 @@ export class DatabaseCluster extends DatabaseClusterBase implements IDatabaseClu
617624
deletionProtection: deletionProtection,
618625
associatedRoles: props.associatedRoles ? props.associatedRoles.map(role => ({ roleArn: role.roleArn })) : undefined,
619626
iamAuthEnabled: Lazy.any({ produce: () => this.enableIamAuthentication }),
627+
dbPort: props.port,
620628
// Backup
621629
backupRetentionPeriod: props.backupRetention?.toDays(),
622630
preferredBackupWindow: props.preferredBackupWindow,

‎packages/@aws-cdk/aws-neptune-alpha/test/cluster.test.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,24 @@ describe('DatabaseCluster', () => {
221221
});
222222
});
223223

224+
test('cluster with port', () => {
225+
// GIVEN
226+
const stack = testStack();
227+
const vpc = new ec2.Vpc(stack, 'VPC');
228+
229+
// WHEN
230+
new DatabaseCluster(stack, 'Database', {
231+
vpc,
232+
instanceType: InstanceType.R5_LARGE,
233+
port: 1234,
234+
});
235+
236+
// THEN
237+
Template.fromStack(stack).hasResourceProperties('AWS::Neptune::DBCluster', {
238+
DBPort: 1234,
239+
});
240+
});
241+
224242
test('cluster with imported parameter group', () => {
225243
// GIVEN
226244
const stack = testStack();

‎packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster-port.js.snapshot/NeptuneClusterPortTestDefaultTestDeployAssert7A0847B4.assets.json‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster-port.js.snapshot/NeptuneClusterPortTestDefaultTestDeployAssert7A0847B4.template.json‎

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk/aws-neptune-alpha/test/integ.cluster-port.js.snapshot/NeptuneClusterPortTestStack.assets.json‎

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)