Merge branch 'main' into feat(redshift-alpha)/add-enhanced-vpc-routin…

…g-option
aws · Oct 18, 2022 · 37a92bd · 37a92bd
2 parents 8ecae68 + 6f332ef
commit 37a92bd
Show file tree

Hide file tree

Showing 22 changed files with 1,439 additions and 4 deletions.
diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/package.json b/packages/@aws-cdk/aws-stepfunctions-tasks/package.json
@@ -79,7 +79,6 @@
  },
  "license": "Apache-2.0",
  "devDependencies": {
- "@aws-cdk/integ-tests": "0.0.0",
  "@aws-cdk/assertions": "0.0.0",
  "@aws-cdk/aws-apigatewayv2": "0.0.0",
  "@aws-cdk/aws-apigatewayv2-integrations": "0.0.0",
@@ -91,6 +90,7 @@
  "@aws-cdk/aws-sns-subscriptions": "0.0.0",
  "@aws-cdk/cdk-build-tools": "0.0.0",
  "@aws-cdk/integ-runner": "0.0.0",
+ "@aws-cdk/integ-tests": "^0.0.0",
  "@aws-cdk/pkglint": "0.0.0",
  "@types/jest": "^27.5.2",
  "jest": "^27.5.1"

diff --git a/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/integ.stringset-after-parallel.ts b/packages/@aws-cdk/aws-stepfunctions-tasks/test/dynamodb/integ.stringset-after-parallel.ts
@@ -0,0 +1,46 @@
+import * as ddb from '@aws-cdk/aws-dynamodb';
+import * as sfn from '@aws-cdk/aws-stepfunctions';
+import * as cdk from '@aws-cdk/core';
+import * as integ from '@aws-cdk/integ-tests';
+import * as tasks from '../../lib';
+
+const app = new cdk.App();
+const stack = new cdk.Stack(app, 'stringset-after-parallel');
+
+const table = new ddb.Table(stack, 'Table', {
+ partitionKey: { name: 'pk', type: ddb.AttributeType.STRING },
+ removalPolicy: cdk.RemovalPolicy.DESTROY,
+});
+
+const passPK = new sfn.Pass(stack, 'passPK', {
+ parameters: { 'pk.$': '$.pk' },
+});
+const passStringSet = new sfn.Pass(stack, 'PassStringSet', {
+ parameters: { 'stringset.$': '$.stringset' },
+});
+
+const parallel = new sfn.Parallel(stack, 'Parallel', {
+ resultPath: '$',
+});
+parallel.branch(passPK)
+ .branch(passStringSet);
+
+const putItem = new tasks.DynamoPutItem(stack, 'PutItem', {
+ table: table,
+ item: {
+ pk: tasks.DynamoAttributeValue.fromString('$[0].pk'),
+ stringset: tasks.DynamoAttributeValue.fromStringSet(sfn.JsonPath.listAt('$[1].stringset')),
+ },
+});
+
+const definition = sfn.Chain.start(parallel).next(putItem);
+
+new sfn.StateMachine(stack, 'StateMachine', {
+ definition: definition,
+});
+
+new integ.IntegTest(app, 'StringSetAfterParallel', {
+ testCases: [stack],
+});
+
+app.synth();
diff --git a/...parallel.integ.snapshot/StringSetAfterParallelDefaultTestDeployAssert649ABBB9.assets.json b/...parallel.integ.snapshot/StringSetAfterParallelDefaultTestDeployAssert649ABBB9.assets.json
@@ -0,0 +1,19 @@
+{
+ "version": "21.0.0",
+ "files": {
+ "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
+ "source": {
+ "path": "StringSetAfterParallelDefaultTestDeployAssert649ABBB9.template.json",
+ "packaging": "file"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ }
+ },
+ "dockerImages": {}
+}
diff --git a/...rallel.integ.snapshot/StringSetAfterParallelDefaultTestDeployAssert649ABBB9.template.json b/...rallel.integ.snapshot/StringSetAfterParallelDefaultTestDeployAssert649ABBB9.template.json
@@ -0,0 +1,36 @@
+{
+ "Parameters": {
+ "BootstrapVersion": {
+ "Type": "AWS::SSM::Parameter::Value<String>",
+ "Default": "/cdk-bootstrap/hnb659fds/version",
+ "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
+ }
+ },
+ "Rules": {
+ "CheckBootstrapVersion": {
+ "Assertions": [
+ {
+ "Assert": {
+ "Fn::Not": [
+ {
+ "Fn::Contains": [
+ [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ {
+ "Ref": "BootstrapVersion"
+ }
+ ]
+ }
+ ]
+ },
+ "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
+ }
+ ]
+ }
+ }
+}
diff --git a/...cdk/aws-stepfunctions-tasks/test/dynamodb/stringset-after-parallel.integ.snapshot/cdk.out b/...cdk/aws-stepfunctions-tasks/test/dynamodb/stringset-after-parallel.integ.snapshot/cdk.out
@@ -0,0 +1 @@
+{"version":"21.0.0"}
diff --git a/.../aws-stepfunctions-tasks/test/dynamodb/stringset-after-parallel.integ.snapshot/integ.json b/.../aws-stepfunctions-tasks/test/dynamodb/stringset-after-parallel.integ.snapshot/integ.json
@@ -0,0 +1,12 @@
+{
+ "version": "21.0.0",
+ "testCases": {
+ "StringSetAfterParallel/DefaultTest": {
+ "stacks": [
+ "stringset-after-parallel"
+ ],
+ "assertionStack": "StringSetAfterParallel/DefaultTest/DeployAssert",
+ "assertionStackName": "StringSetAfterParallelDefaultTestDeployAssert649ABBB9"
+ }
+ }
+}
diff --git a/...s-stepfunctions-tasks/test/dynamodb/stringset-after-parallel.integ.snapshot/manifest.json b/...s-stepfunctions-tasks/test/dynamodb/stringset-after-parallel.integ.snapshot/manifest.json
@@ -0,0 +1,135 @@
+{
+ "version": "21.0.0",
+ "artifacts": {
+ "Tree": {
+ "type": "cdk:tree",
+ "properties": {
+ "file": "tree.json"
+ }
+ },
+ "stringset-after-parallel.assets": {
+ "type": "cdk:asset-manifest",
+ "properties": {
+ "file": "stringset-after-parallel.assets.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "stringset-after-parallel": {
+ "type": "aws:cloudformation:stack",
+ "environment": "aws://unknown-account/unknown-region",
+ "properties": {
+ "templateFile": "stringset-after-parallel.template.json",
+ "validateOnSynth": false,
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+ "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/30011aca79761d24d65d6f3f8af03bf4a54f58ac4a5fdbadcb2d1fb0fa225066.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+ "additionalDependencies": [
+ "stringset-after-parallel.assets"
+ ],
+ "lookupRole": {
+ "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+ "requiresBootstrapStackVersion": 8,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "dependencies": [
+ "stringset-after-parallel.assets"
+ ],
+ "metadata": {
+ "/stringset-after-parallel/Table/Resource": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "TableCD117FA1"
+ }
+ ],
+ "/stringset-after-parallel/StateMachine/Role/Resource": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "StateMachineRoleB840431D"
+ }
+ ],
+ "/stringset-after-parallel/StateMachine/Role/DefaultPolicy/Resource": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "StateMachineRoleDefaultPolicyDF1E6607"
+ }
+ ],
+ "/stringset-after-parallel/StateMachine/Resource": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "StateMachine2E01A3A5"
+ }
+ ],
+ "/stringset-after-parallel/Service-principalMap": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "ServiceprincipalMap"
+ }
+ ],
+ "/stringset-after-parallel/BootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "BootstrapVersion"
+ }
+ ],
+ "/stringset-after-parallel/CheckBootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "CheckBootstrapVersion"
+ }
+ ]
+ },
+ "displayName": "stringset-after-parallel"
+ },
+ "StringSetAfterParallelDefaultTestDeployAssert649ABBB9.assets": {
+ "type": "cdk:asset-manifest",
+ "properties": {
+ "file": "StringSetAfterParallelDefaultTestDeployAssert649ABBB9.assets.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "StringSetAfterParallelDefaultTestDeployAssert649ABBB9": {
+ "type": "aws:cloudformation:stack",
+ "environment": "aws://unknown-account/unknown-region",
+ "properties": {
+ "templateFile": "StringSetAfterParallelDefaultTestDeployAssert649ABBB9.template.json",
+ "validateOnSynth": false,
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
+ "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
+ "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
+ "requiresBootstrapStackVersion": 6,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
+ "additionalDependencies": [
+ "StringSetAfterParallelDefaultTestDeployAssert649ABBB9.assets"
+ ],
+ "lookupRole": {
+ "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}",
+ "requiresBootstrapStackVersion": 8,
+ "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version"
+ }
+ },
+ "dependencies": [
+ "StringSetAfterParallelDefaultTestDeployAssert649ABBB9.assets"
+ ],
+ "metadata": {
+ "/StringSetAfterParallel/DefaultTest/DeployAssert/BootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "BootstrapVersion"
+ }
+ ],
+ "/StringSetAfterParallel/DefaultTest/DeployAssert/CheckBootstrapVersion": [
+ {
+ "type": "aws:cdk:logicalId",
+ "data": "CheckBootstrapVersion"
+ }
+ ]
+ },
+ "displayName": "StringSetAfterParallel/DefaultTest/DeployAssert"
+ }
+ }
+}
diff --git a/...est/dynamodb/stringset-after-parallel.integ.snapshot/stringset-after-parallel.assets.json b/...est/dynamodb/stringset-after-parallel.integ.snapshot/stringset-after-parallel.assets.json
@@ -0,0 +1,19 @@
+{
+ "version": "21.0.0",
+ "files": {
+ "30011aca79761d24d65d6f3f8af03bf4a54f58ac4a5fdbadcb2d1fb0fa225066": {
+ "source": {
+ "path": "stringset-after-parallel.template.json",
+ "packaging": "file"
+ },
+ "destinations": {
+ "current_account-current_region": {
+ "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
+ "objectKey": "30011aca79761d24d65d6f3f8af03bf4a54f58ac4a5fdbadcb2d1fb0fa225066.json",
+ "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
+ }
+ }
+ }
+ },
+ "dockerImages": {}
+}