Skip to content

Commit

Permalink
Merge branch 'master' into batch-event-target
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Mar 24, 2020
2 parents f6bdfc6 + 1e92564 commit cb7a5e4
Show file tree
Hide file tree
Showing 28 changed files with 62 additions and 70 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The CDK is available in the following languages:
* JavaScript, TypeScript ([Node.js ≥ 10.3.0](https://nodejs.org/download/release/latest-v10.x/))
* Python ([Python ≥ 3.6](https://www.python.org/downloads/))
* Java ([Java ≥ 8](https://www.oracle.com/technetwork/java/javase/downloads/index.html) and [Maven ≥ 3.5.4](https://maven.apache.org/download.cgi))
* .NET ([.NET Core ≥ 3.0](https://dotnet.microsoft.com/download))
* .NET ([.NET Core ≥ 3.1](https://dotnet.microsoft.com/download))

-------

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"conventional-changelog-cli": "^2.0.31",
"fs-extra": "^9.0.0",
"fs-extra": "^8.1.0",
"jsii-diff": "^1.1.0",
"jsii-pacmak": "^1.1.0",
"jsii-rosetta": "^1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-cloudfront/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"devDependencies": {
"@aws-cdk/assert": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.643.0",
"aws-sdk": "^2.644.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-cloudtrail/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"devDependencies": {
"@aws-cdk/assert": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.643.0",
"aws-sdk": "^2.644.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-codebuild/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@aws-cdk/aws-sns": "0.0.0",
"@aws-cdk/aws-sqs": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.643.0",
"aws-sdk": "^2.644.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-codecommit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@aws-cdk/assert": "0.0.0",
"@aws-cdk/aws-sns": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.643.0",
"aws-sdk": "^2.644.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-dynamodb/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"devDependencies": {
"@aws-cdk/assert": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.643.0",
"aws-sdk": "^2.644.0",
"aws-sdk-mock": "^5.1.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-eks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"devDependencies": {
"@aws-cdk/assert": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.643.0",
"aws-sdk": "^2.644.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-events-targets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"devDependencies": {
"@aws-cdk/assert": "0.0.0",
"@aws-cdk/aws-codecommit": "0.0.0",
"aws-sdk": "^2.643.0",
"aws-sdk": "^2.644.0",
"aws-sdk-mock": "^5.1.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-lambda-nodejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"@aws-cdk/assert": "0.0.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"fs-extra": "^9.0.0",
"fs-extra": "^8.1.0",
"parcel-bundler": "^1.12.4",
"pkglint": "0.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-lambda/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@types/lodash": "^4.14.149",
"@types/nodeunit": "^0.0.30",
"@types/sinon": "^7.5.2",
"aws-sdk": "^2.643.0",
"aws-sdk": "^2.644.0",
"aws-sdk-mock": "^5.1.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-route53/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"devDependencies": {
"@aws-cdk/assert": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.643.0",
"aws-sdk": "^2.644.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-sqs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@aws-cdk/assert": "0.0.0",
"@aws-cdk/aws-s3": "0.0.0",
"@types/nodeunit": "^0.0.30",
"aws-sdk": "^2.643.0",
"aws-sdk": "^2.644.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
Expand Down
33 changes: 25 additions & 8 deletions packages/@aws-cdk/aws-stepfunctions/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,14 @@ This library comes with a set of classes that model the [Amazon States
Language](https://states-language.net/spec.html). The following State classes
are supported:

* `Task`
* `Pass`
* `Wait`
* `Choice`
* `Parallel`
* `Succeed`
* `Fail`
* [`Task`](#task)
* [`Pass`](#pass)
* [`Wait`](#wait)
* [`Choice`](#choice)
* [`Parallel`](#parallel)
* [`Succeed`](#succeed)
* [`Fail`](#fail)
* [`Map`](#map)

An arbitrary JSON object (specified at execution start) is passed from state to
state and transformed during the execution of the workflow. For more
Expand Down Expand Up @@ -461,7 +462,7 @@ wait.next(startTheWork);

### Choice

A `Choice` state can take a differen path through the workflow based on the
A `Choice` state can take a different path through the workflow based on the
values in the execution's JSON state:

```ts
Expand Down Expand Up @@ -538,6 +539,22 @@ const success = new stepfunctions.Fail(this, 'Fail', {
});
```

### Map

A `Map` state can be used to run a set of steps for each element of an input array.
A `Map` state will execute the same steps for multiple entries of an array in the state input.

While the `Parallel` state executes multiple branches of steps using the same input, a `Map` state will
execute the same steps for multiple entries of an array in the state input.

```ts
const map = new stepfunctions.Map(this, 'Map State', {
maxConcurrency: 1,
itemsPath: stepfunctions.Data.stringAt('$.inputForMap')
});
map.iterator(new stepfunctions.Pass(this, 'Pass State'));
```

## Task Chaining

To make defining work flows as convenient (and readable in a top-to-bottom way)
Expand Down
8 changes: 6 additions & 2 deletions packages/@aws-cdk/aws-stepfunctions/lib/states/map.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,13 @@ export const isPositiveInteger = (value: number) => {
/**
* Define a Map state in the state machine
*
* A Map state can be used to dynamically process elements of an array through sub state machines
* A `Map` state can be used to run a set of steps for each element of an input array.
* A Map state will execute the same steps for multiple entries of an array in the state input.
*
* The Result of a Map state is the transformed array after processing through the iterator state machines.
* While the Parallel state executes multiple branches of steps using the same input, a Map state
* will execute the same steps for multiple entries of an array in the state input.
*
* @see https://docs.aws.amazon.com/step-functions/latest/dg/amazon-states-language-map-state.html
*/
export class Map extends State implements INextable {
public readonly endStates: INextable[];
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/cfnspec/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@types/nodeunit": "^0.0.30",
"cdk-build-tools": "0.0.0",
"fast-json-patch": "^2.2.1",
"fs-extra": "^9.0.0",
"fs-extra": "^8.1.0",
"json-diff": "^0.5.4",
"nodeunit": "^0.11.3",
"pkglint": "0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/custom-resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,12 @@
"@types/aws-lambda": "^8.10.39",
"@types/fs-extra": "^8.1.0",
"@types/sinon": "^7.5.2",
"aws-sdk": "^2.643.0",
"aws-sdk": "^2.644.0",
"aws-sdk-mock": "^5.1.0",
"cdk-build-tools": "0.0.0",
"cdk-integ-tools": "0.0.0",
"cfn2ts": "0.0.0",
"fs-extra": "^9.0.0",
"fs-extra": "^8.1.0",
"nock": "^12.0.3",
"pkglint": "0.0.0",
"sinon": "^9.0.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/region-info/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"devDependencies": {
"@types/fs-extra": "^8.1.0",
"cdk-build-tools": "0.0.0",
"fs-extra": "^9.0.0",
"fs-extra": "^8.1.0",
"pkglint": "0.0.0"
},
"jest": {
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/region-info": "0.0.0",
"archiver": "^3.1.1",
"aws-sdk": "^2.643.0",
"aws-sdk": "^2.644.0",
"camelcase": "^5.3.1",
"cdk-assets": "0.0.0",
"colors": "^1.4.0",
"decamelize": "^4.0.0",
"fs-extra": "^9.0.0",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
"json-diff": "^0.5.4",
"minimatch": ">=3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cdk-assets/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"dependencies": {
"@aws-cdk/cdk-assets-schema": "0.0.0",
"archiver": "^3.1.1",
"aws-sdk": "^2.643.0",
"aws-sdk": "^2.644.0",
"glob": "^7.1.6",
"yargs": "^15.3.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/decdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"@aws-cdk/custom-resources": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/region-info": "0.0.0",
"fs-extra": "^9.0.0",
"fs-extra": "^8.1.0",
"jsii-reflect": "^1.1.0",
"jsonschema": "^1.2.5",
"constructs": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion tools/awslint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@jsii/spec": "^1.1.0",
"camelcase": "^5.3.1",
"colors": "^1.4.0",
"fs-extra": "^9.0.0",
"fs-extra": "^8.1.0",
"jsii-reflect": "^1.1.0",
"yargs": "^15.3.1"
},
Expand Down
2 changes: 1 addition & 1 deletion tools/cdk-build-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"eslint-import-resolver-node": "^0.3.3",
"eslint-import-resolver-typescript": "^2.0.0",
"eslint-plugin-import": "^2.20.1",
"fs-extra": "^9.0.0",
"fs-extra": "^8.1.0",
"jest": "^24.9.0",
"jsii": "^1.1.0",
"jsii-pacmak": "^1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion tools/cdk-integ-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@aws-cdk/cloudformation-diff": "0.0.0",
"@aws-cdk/cx-api": "0.0.0",
"aws-cdk": "0.0.0",
"fs-extra": "^9.0.0",
"fs-extra": "^8.1.0",
"yargs": "^15.3.1"
},
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion tools/cfn2ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@aws-cdk/cfnspec": "0.0.0",
"codemaker": "^1.1.0",
"fast-json-patch": "^3.0.0-1",
"fs-extra": "^9.0.0",
"fs-extra": "^8.1.0",
"yargs": "^15.3.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion tools/pkglint/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"dependencies": {
"case": "^1.6.2",
"colors": "^1.4.0",
"fs-extra": "^9.0.0",
"fs-extra": "^8.1.0",
"semver": "^7.1.3",
"yargs": "^15.3.1"
}
Expand Down
2 changes: 1 addition & 1 deletion tools/pkgtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"pkglint": "0.0.0"
},
"dependencies": {
"fs-extra": "^9.0.0",
"fs-extra": "^8.1.0",
"yargs": "^15.3.1"
},
"keywords": [
Expand Down
37 changes: 4 additions & 33 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2600,11 +2600,6 @@ asynckit@^0.4.0:
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=

at-least-node@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==

atob-lite@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
Expand All @@ -2624,10 +2619,10 @@ aws-sdk-mock@^5.1.0:
sinon "^9.0.1"
traverse "^0.6.6"

aws-sdk@^2.637.0, aws-sdk@^2.643.0:
version "2.643.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.643.0.tgz#0b4cc49165a25c42ab0503580806d367d32ffb88"
integrity sha512-4r7VGQFqshrhXnOCVQdlatAWiK/8kmmtAtY9gbITPNpY5Is+SfIy6k/1BgrnL5H/2sYd27H+Xp8itXZoCnQeTw==
aws-sdk@^2.637.0, aws-sdk@^2.644.0:
version "2.644.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.644.0.tgz#a7422be28b5952955db8a0e09defb5341082b252"
integrity sha512-FkglRU5fvWHwT2Ll0caXS/QzRNzh5ZCS5cs4pF2nP0OjdD7VNJhNtu5lOnSzvMHAtZQJMsG3k0em8PoI8vk1AQ==
dependencies:
buffer "4.9.1"
events "1.1.1"
Expand Down Expand Up @@ -5339,16 +5334,6 @@ fs-extra@^8.1.0:
jsonfile "^4.0.0"
universalify "^0.1.0"

fs-extra@^9.0.0:
version "9.0.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3"
integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==
dependencies:
at-least-node "^1.0.0"
graceful-fs "^4.2.0"
jsonfile "^6.0.1"
universalify "^1.0.0"

fs-minipass@^1.2.5:
version "1.2.7"
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
Expand Down Expand Up @@ -7205,15 +7190,6 @@ jsonfile@^4.0.0:
optionalDependencies:
graceful-fs "^4.1.6"

jsonfile@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
dependencies:
universalify "^1.0.0"
optionalDependencies:
graceful-fs "^4.1.6"

jsonparse@^1.2.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
Expand Down Expand Up @@ -11600,11 +11576,6 @@ universalify@^0.1.0:
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==

universalify@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==

unpipe@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
Expand Down

0 comments on commit cb7a5e4

Please sign in to comment.