Skip to content

Commit

Permalink
Merge branch 'main' into huijbers/disable-asset-prebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Nov 16, 2022
2 parents 16c227d + 741b5e5 commit 5c5b82c
Show file tree
Hide file tree
Showing 15 changed files with 266 additions and 266 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"devDependencies": {
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
"cdk-generate-synthetic-examples": "^0.1.57",
"cdk-generate-synthetic-examples": "^0.1.64",
"conventional-changelog-cli": "^2.2.2",
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.10",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-codepipeline-actions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"@aws-cdk/cx-api": "0.0.0",
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.5.2",
"@types/lodash": "^4.14.188",
"@types/lodash": "^4.14.189",
"jest": "^27.5.1",
"lodash": "^4.17.21"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-eks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@
"@types/sinon": "^9.0.11",
"@types/yaml": "1.9.6",
"aws-sdk": "^2.1211.0",
"cdk8s": "^2.5.39",
"cdk8s": "^2.5.46",
"cdk8s-plus-21": "^2.0.0-beta.12",
"cdk8s-plus-23": "2.0.21",
"cdk8s-plus-23": "2.0.28",
"jest": "^27.5.1",
"sinon": "^9.2.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-lambda-event-sources/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ behavior:
* __onFailure__: In the event a record fails and consumes all retries, the record will be sent to SQS queue or SNS topic that is specified here
* __parallelizationFactor__: The number of batches to concurrently process on each shard.
* __retryAttempts__: The maximum number of times a record should be retried in the event of failure.
* __startingPosition__: Will determine where to being consumption. 'LATEST' will start at the most recent record and ignore all records that arrived prior to attaching the event source, 'TRIM_HORIZON' will start at the oldest record and ensure you process all available data, while 'AT_TIMESTAMP' will start reading records from a specified time stamp. Note that 'AT_TIMESTAMP' is only supported for Amazon Kinesis streams.
* __startingPosition__: Will determine where to begin consumption. 'LATEST' will start at the most recent record and ignore all records that arrived prior to attaching the event source, 'TRIM_HORIZON' will start at the oldest record and ensure you process all available data, while 'AT_TIMESTAMP' will start reading records from a specified time stamp. Note that 'AT_TIMESTAMP' is only supported for Amazon Kinesis streams.
* __startingPositionTimestamp__: The time stamp from which to start reading. Used in conjunction with __startingPosition__ when set to 'AT_TIMESTAMP'.
* __tumblingWindow__: The duration in seconds of a processing window when using streams.
* __enabled__: If the DynamoDB Streams event source mapping should be enabled. The default is true.
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 @@ -79,7 +79,7 @@
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^27.5.2",
"delay": "5.0.0",
"esbuild": "^0.15.13"
"esbuild": "^0.15.14"
},
"dependencies": {
"@aws-cdk/aws-lambda": "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 @@ -93,7 +93,7 @@
"@aws-cdk/pkglint": "0.0.0",
"@types/aws-lambda": "^8.10.108",
"@types/jest": "^27.5.2",
"@types/lodash": "^4.14.188",
"@types/lodash": "^4.14.189",
"jest": "^27.5.1",
"lodash": "^4.17.21"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
"@types/aws-lambda": "^8.10.108",
"@types/fs-extra": "^8.1.2",
"@types/jest": "^27.5.2",
"@types/lodash": "^4.14.188",
"@types/lodash": "^4.14.189",
"@types/minimatch": "^3.0.5",
"aws-sdk": "^2.928.0",
"@types/node": "^14.18.33",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/integ-runner/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The @aws-cdk/integ-runner package includes the following third-party software/licensing:

** [email protected].0 - https://www.npmjs.com/package/ajv/v/8.11.0 | MIT
** [email protected].2 - https://www.npmjs.com/package/ajv/v/8.11.2 | MIT
The MIT License (MIT)

Copyright (c) 2015-2021 Evgeny Poberezkin
Expand Down Expand Up @@ -156,7 +156,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE

----------------

** aws-sdk@2.1250.0 - https://www.npmjs.com/package/aws-sdk/v/2.1250.0 | Apache-2.0
** aws-sdk@2.1255.0 - https://www.npmjs.com/package/aws-sdk/v/2.1255.0 | Apache-2.0
AWS SDK for JavaScript
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/lambda-layer-awscli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@
"dependencies": {
"@aws-cdk/aws-lambda": "0.0.0",
"@aws-cdk/core": "0.0.0",
"@aws-cdk/asset-awscli-v1": "^2.2.2",
"@aws-cdk/asset-awscli-v1": "^2.2.9",
"constructs": "^10.0.0"
},
"homepage": "https://github.com/aws/aws-cdk",
"peerDependencies": {
"@aws-cdk/aws-lambda": "0.0.0",
"@aws-cdk/core": "0.0.0",
"@aws-cdk/asset-awscli-v1": "^2.2.2",
"@aws-cdk/asset-awscli-v1": "^2.2.9",
"constructs": "^10.0.0"
},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/lambda-layer-node-proxy-agent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@
"dependencies": {
"@aws-cdk/aws-lambda": "0.0.0",
"@aws-cdk/core": "0.0.0",
"@aws-cdk/asset-node-proxy-agent-v5": "^2.0.8",
"@aws-cdk/asset-node-proxy-agent-v5": "^2.0.15",
"constructs": "^10.0.0"
},
"homepage": "https://github.com/aws/aws-cdk",
"peerDependencies": {
"@aws-cdk/aws-lambda": "0.0.0",
"@aws-cdk/core": "0.0.0",
"@aws-cdk/asset-node-proxy-agent-v5": "^2.0.8",
"@aws-cdk/asset-node-proxy-agent-v5": "^2.0.15",
"constructs": "^10.0.0"
},
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/pipelines/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ const originalPipeline = new pipelines.CdkPipeline(this, 'Pipeline', {
This section of the documentation describes the AWS CodePipeline engine,
which comes with this library. If you want to use a different deployment
engine, read the section
[Using a different deployment engine](#using-a-different-deployment-engine)below.
[Using a different deployment engine](#using-a-different-deployment-engine) below.

### Synth and sources

Expand Down Expand Up @@ -1685,7 +1685,7 @@ cannot be remedied by CDK at this point. They are reproduced here for completene
console will assume all links are relative to the current account. You will
not be able to use the pipeline console to click through to a CloudFormation
stack in a different account.
- **If a change set failed to apply the pipeline must restarted**: if a change
- **If a change set failed to apply the pipeline must be restarted**: if a change
set failed to apply, it cannot be retried. The pipeline must be restarted from
the top by clicking **Release Change**.
- **A stack that failed to create must be deleted manually**: if a stack
Expand Down
6 changes: 3 additions & 3 deletions packages/aws-cdk-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@
"punycode": "^2.1.1",
"semver": "^7.3.8",
"yaml": "1.10.2",
"@aws-cdk/asset-awscli-v1": "^2.2.2",
"@aws-cdk/asset-node-proxy-agent-v5": "^2.0.8",
"@aws-cdk/asset-awscli-v1": "^2.2.9",
"@aws-cdk/asset-node-proxy-agent-v5": "^2.0.15",
"@aws-cdk/asset-kubectl-v20": "^2.1.1"
},
"devDependencies": {
Expand Down Expand Up @@ -374,7 +374,7 @@
"@types/fs-extra": "^8.1.2",
"@types/node": "^14.18.33",
"constructs": "^10.0.0",
"esbuild": "^0.15.13",
"esbuild": "^0.15.14",
"fs-extra": "^9.1.0",
"ts-node": "^9.1.1",
"typescript": "~3.8.3"
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-cdk/THIRD_PARTY_LICENSES
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ THE SOFTWARE.

----------------

** [email protected].0 - https://www.npmjs.com/package/ajv/v/8.11.0 | MIT
** [email protected].2 - https://www.npmjs.com/package/ajv/v/8.11.2 | MIT
The MIT License (MIT)

Copyright (c) 2015-2021 Evgeny Poberezkin
Expand Down Expand Up @@ -268,7 +268,7 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH RE

----------------

** aws-sdk@2.1250.0 - https://www.npmjs.com/package/aws-sdk/v/2.1250.0 | Apache-2.0
** aws-sdk@2.1255.0 - https://www.npmjs.com/package/aws-sdk/v/2.1255.0 | Apache-2.0
AWS SDK for JavaScript
Copyright 2012-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.

Expand Down
4 changes: 2 additions & 2 deletions tools/@aws-cdk/node-bundle/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5c5b82c

Please sign in to comment.