Merge branch 'main' into autoMinorVersionUpgrade

packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.table-v2-global.js.snapshot/aws-cdk-global-table.template.json

@@ -16,7 +16,13 @@
        "KeyId": "alias/aws/kinesis"
       }
      ]
-    }
+    },
+    "Tags": [
+     {
+      "Key": "stage",
+      "Value": "IntegTest"
+     }
+    ]
    },
    "UpdateReplacePolicy": "Retain",
    "DeletionPolicy": "Retain"
@@ -148,6 +154,14 @@
       "Region": "us-east-2",
       "TableClass": "STANDARD_INFREQUENT_ACCESS",
       "Tags": [
+       {
+        "Key": "stage",
+        "Value": "IntegTest"
+       },
+       {
+        "Key": "tagAspectKey",
+        "Value": "tagAspectValue"
+       },
        {
         "Key": "USE2ReplicaTagKey",
         "Value": "USE2ReplicaTagValue"
@@ -184,6 +198,14 @@
       "Region": "us-west-2",
       "TableClass": "STANDARD",
       "Tags": [
+       {
+        "Key": "stage",
+        "Value": "IntegTest"
+       },
+       {
+        "Key": "tagAspectKey",
+        "Value": "tagAspectValue"
+       },
        {
         "Key": "USW2ReplicaTagKey",
         "Value": "USW2ReplicaTagValue"
@@ -231,6 +253,14 @@
       "Region": "us-east-1",
       "TableClass": "STANDARD_INFREQUENT_ACCESS",
       "Tags": [
+       {
+        "Key": "stage",
+        "Value": "IntegTest"
+       },
+       {
+        "Key": "tagAspectKey",
+        "Value": "tagAspectValue"
+       },
        {
         "Key": "primaryTableTagKey",
         "Value": "primaryTableTagValue"

packages/@aws-cdk-testing/framework-integ/test/aws-dynamodb/test/integ.table-v2-global.ts

@@ -1,5 +1,5 @@
 import { IntegTest } from '@aws-cdk/integ-tests-alpha';
-import { App, RemovalPolicy, Stack, StackProps } from 'aws-cdk-lib';
+import { App, RemovalPolicy, Stack, StackProps, Tags } from 'aws-cdk-lib';
 import { AttributeType, Billing, Capacity, TableV2, TableClass, TableEncryptionV2 } from 'aws-cdk-lib/aws-dynamodb';
 import { Stream } from 'aws-cdk-lib/aws-kinesis';
 import { Construct } from 'constructs';
@@ -10,7 +10,7 @@ class TestStack extends Stack {
 
     const stream = new Stream(this, 'Stream');
 
-    new TableV2(this, 'GlobalTable', {
+    const globalTable = new TableV2(this, 'GlobalTable', {
       tableName: 'my-global-table',
       partitionKey: { name: 'pk', type: AttributeType.STRING },
       sortKey: { name: 'sk', type: AttributeType.NUMBER },
@@ -68,10 +68,13 @@ class TestStack extends Stack {
       ],
       tags: [{ key: 'primaryTableTagKey', value: 'primaryTableTagValue' }],
     });
+
+    Tags.of(globalTable).add('tagAspectKey', 'tagAspectValue');
   }
 }
 
 const app = new App();
+Tags.of(app).add('stage', 'IntegTest');
 new IntegTest(app, 'aws-cdk-global-table-integ', {
   testCases: [new TestStack(app, 'aws-cdk-global-table', { env: { region: 'us-east-1' } })],
   regions: ['us-east-1'],

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

@@ -104,6 +104,10 @@ export class EngineVersion {
    * Neptune engine version 1.3.3.0
    */
   public static readonly V1_3_3_0 = new EngineVersion('1.3.3.0');
+  /**
+   * Neptune engine version 1.3.4.0
+   */
+  public static readonly V1_3_4_0 = new EngineVersion('1.3.4.0');
 
   /**
    * Constructor for specifying a custom engine version

packages/@aws-cdk/aws-pipes-sources-alpha/test/integ.dynamodb.ts

@@ -17,6 +17,8 @@ const table = new ddb.TableV2(stack, 'MyTable', {
 const dlqQueue = new cdk.aws_sqs.Queue(stack, 'DlqQueue');
 const targetQueue = new cdk.aws_sqs.Queue(stack, 'TargetQueue');
 
+// When this module is promoted from alpha, TestTarget should
+// be replaced with SqsTarget from @aws-cdk/aws-pipes-targets-alpha
 class TestTarget implements ITarget {
   targetArn: string;
 

packages/@aws-cdk/aws-pipes-sources-alpha/test/integ.kinesis.ts

@@ -9,6 +9,8 @@ const stack = new cdk.Stack(app, 'aws-cdk-pipes-sources-kinesis');
 const sourceKinesisStream = new cdk.aws_kinesis.Stream(stack, 'SourceKinesisStream');
 const targetQueue = new cdk.aws_sqs.Queue(stack, 'TargetQueue');
 
+// When this module is promoted from alpha, TestTarget should
+// be replaced with SqsTarget from @aws-cdk/aws-pipes-targets-alpha
 class TestTarget implements ITarget {
   targetArn: string;
 

packages/@aws-cdk/aws-pipes-sources-alpha/test/integ.sqs.ts

@@ -9,6 +9,8 @@ const stack = new cdk.Stack(app, 'aws-cdk-pipes-sources-sqs');
 const sourceQueue = new cdk.aws_sqs.Queue(stack, 'SourceQueue');
 const targetQueue = new cdk.aws_sqs.Queue(stack, 'TargetQueue');
 
+// When this module is promoted from alpha, TestTarget should
+// be replaced with SqsTarget from @aws-cdk/aws-pipes-targets-alpha
 class TestTarget implements ITarget {
   targetArn: string;
   inputTransformation: InputTransformation = InputTransformation.fromEventPath('$.body');