Merge branch 'main' into vpcv2_fix_package

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

@@ -2190,3 +2190,13 @@ async function listChildren(parent: string, pred: (x: string) => Promise<boolean
 async function listChildDirs(parent: string) {
   return listChildren(parent, async (fullPath: string) => (await fs.stat(fullPath)).isDirectory());
 }
+
+integTest(
+  'cdk notices with --unacknowledged',
+  withDefaultFixture(async (fixture) => {
+    const noticesUnacknowledged = await fixture.cdk(['notices', '--unacknowledged'], { verbose: false });
+    const noticesUnacknowledgedAlias = await fixture.cdk(['notices', '-u'], { verbose: false });
+    expect(noticesUnacknowledged).toEqual(expect.stringMatching(/There are \d{1,} unacknowledged notice\(s\)./));
+    expect(noticesUnacknowledged).toEqual(noticesUnacknowledgedAlias);
+  }),
+);

packages/@aws-cdk/aws-iot-actions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.template.json

@@ -249,6 +249,9 @@
    "ca-central-1": {
     "FirehoseCidrBlock": "35.183.92.128/27"
    },
+   "ca-west-1": {
+    "FirehoseCidrBlock": "40.176.98.192/27"
+   },
    "cn-north-1": {
     "FirehoseCidrBlock": "52.81.151.32/27"
    },

packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.js.snapshot/aws-cdk-firehose-delivery-stream.template.json

@@ -252,6 +252,9 @@
    "ca-central-1": {
     "FirehoseCidrBlock": "35.183.92.128/27"
    },
+   "ca-west-1": {
+    "FirehoseCidrBlock": "40.176.98.192/27"
+   },
    "cn-north-1": {
     "FirehoseCidrBlock": "52.81.151.32/27"
    },

packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.delivery-stream.source-stream.js.snapshot/aws-cdk-firehose-delivery-stream-source-stream.template.json

@@ -270,6 +270,9 @@
    "ca-central-1": {
     "FirehoseCidrBlock": "35.183.92.128/27"
    },
+   "ca-west-1": {
+    "FirehoseCidrBlock": "40.176.98.192/27"
+   },
    "cn-north-1": {
     "FirehoseCidrBlock": "52.81.151.32/27"
    },

packages/@aws-cdk/aws-kinesisfirehose-alpha/test/integ.kinesis-stream-events-target.js.snapshot/aws-cdk-firehose-delivery-stream.template.json

@@ -223,6 +223,9 @@
    "ca-central-1": {
     "FirehoseCidrBlock": "35.183.92.128/27"
    },
+   "ca-west-1": {
+    "FirehoseCidrBlock": "40.176.98.192/27"
+   },
    "cn-north-1": {
     "FirehoseCidrBlock": "52.81.151.32/27"
    },

packages/@aws-cdk/aws-kinesisfirehose-destinations-alpha/test/integ.s3-bucket.lit.js.snapshot/aws-cdk-firehose-delivery-stream-s3-all-properties.template.json

@@ -985,6 +985,9 @@
    "ca-central-1": {
     "FirehoseCidrBlock": "35.183.92.128/27"
    },
+   "ca-west-1": {
+    "FirehoseCidrBlock": "40.176.98.192/27"
+   },
    "cn-north-1": {
     "FirehoseCidrBlock": "52.81.151.32/27"
    },

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

@@ -138,6 +138,18 @@ new neptune.DatabaseCluster(this, 'Cluster', {
 });
 ```
 
+## Port
+
+By default, Neptune uses port `8182`. You can override the default port by specifying the `port` property:
+
+```ts
+const cluster = new neptune.DatabaseCluster(this, 'Database', {
+  vpc,
+  instanceType: neptune.InstanceType.R5_LARGE,
+  port: 12345,
+});
+```
+
 ## Logging
 
 Neptune supports various methods for monitoring performance and usage. One of those methods is logging

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

@@ -332,6 +332,13 @@ export interface DatabaseClusterProps {
    * @default - false
    */
   readonly copyTagsToSnapshot?: boolean;
+
+  /**
+   * The port number on which the DB instances in the DB cluster accept connections.
+   *
+   * @default 8182
+   */
+  readonly port?: number;
 }
 
 /**
@@ -617,6 +624,7 @@ export class DatabaseCluster extends DatabaseClusterBase implements IDatabaseClu
       deletionProtection: deletionProtection,
       associatedRoles: props.associatedRoles ? props.associatedRoles.map(role => ({ roleArn: role.roleArn })) : undefined,
       iamAuthEnabled: Lazy.any({ produce: () => this.enableIamAuthentication }),
+      dbPort: props.port,
       // Backup
       backupRetentionPeriod: props.backupRetention?.toDays(),
       preferredBackupWindow: props.preferredBackupWindow,