Skip to content

Commit

Permalink
Merge branch 'main' into merge-back/2.128.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Feb 14, 2024
2 parents d995261 + 256cca4 commit fa183b1
Show file tree
Hide file tree
Showing 42 changed files with 692 additions and 529 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
"aws-sdk-js-codemod": "^0.28.2",
"cdk-generate-synthetic-examples": "^0.1.302",
"cdk-generate-synthetic-examples": "^0.1.303",
"conventional-changelog-cli": "^2.2.2",
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.11",
"jest-junit": "^13.2.0",
"jsii-diff": "1.94.0",
"jsii-pacmak": "1.94.0",
"jsii-reflect": "1.94.0",
"jsii-rosetta": "~5.3.9",
"jsii-rosetta": "~5.3.15",
"lerna": "^7.4.2",
"nx": "^16.10.0",
"patch-package": "^6.5.1",
"semver": "^7.5.4",
"semver": "^7.6.0",
"standard-version": "^9.5.0",
"ts-jest": "^29.1.2",
"ts-node": "^10.9.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk-testing/cli-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"license": "Apache-2.0",
"devDependencies": {
"@aws-cdk/cdk-build-tools": "0.0.0",
"@types/semver": "^7.5.6",
"@types/semver": "^7.5.7",
"@types/yargs": "^15.0.19",
"@types/fs-extra": "^9.0.13",
"@types/glob": "^7.2.0",
Expand All @@ -39,7 +39,7 @@
},
"dependencies": {
"@octokit/rest": "^18.12.0",
"aws-sdk": "^2.1548.0",
"aws-sdk": "^2.1557.0",
"axios": "^1.6.7",
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
Expand All @@ -48,7 +48,7 @@
"make-runnable": "^1.4.1",
"npm": "^8.19.4",
"p-queue": "^6.6.2",
"semver": "^7.5.4",
"semver": "^7.6.0",
"sinon": "^9.2.4",
"ts-mock-imports": "^1.3.8",
"yaml": "1.10.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk-testing/framework-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
"@aws-cdk/integ-tests-alpha": "0.0.0",
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
"aws-cdk-lib": "0.0.0",
"aws-sdk": "^2.1548.0",
"aws-sdk": "^2.1557.0",
"aws-sdk-mock": "5.6.0",
"cdk8s": "2.68.33",
"cdk8s-plus-27": "2.7.75",
"cdk8s": "2.68.37",
"cdk8s-plus-27": "2.7.77",
"constructs": "^10.0.0"
},
"repository": {
Expand Down

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

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

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

Large diffs are not rendered by default.

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

Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"S3Bucket": {
"Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
},
"S3Key": "6ce083eb2441f090467fba2edf5b09bfaf50233b25bf8f9302a3b7abf78b9f5a.zip"
"S3Key": "5cea6a85ed0a0680ff29f4c65face159d9990204dd6cae4a489ad3dbd8e25c06.zip"
},
"Environment": {
"Variables": {
Expand Down

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

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

4 changes: 2 additions & 2 deletions packages/@aws-cdk/cloud-assembly-schema/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^29.5.12",
"@types/mock-fs": "^4.13.4",
"@types/semver": "^7.5.6",
"@types/semver": "^7.5.7",
"aws-cdk-lib": "0.0.0",
"jest": "^29.7.0",
"mock-fs": "^4.14.0",
Expand All @@ -110,7 +110,7 @@
"stability": "stable",
"dependencies": {
"jsonschema": "^1.4.1",
"semver": "^7.5.4"
"semver": "^7.6.0"
},
"awscdkio": {
"announce": false
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/cloudformation-diff/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@aws-cdk/aws-service-spec": "^0.0.47",
"@aws-cdk/service-spec-types": "^0.0.47",
"chalk": "^4",
"diff": "^5.1.0",
"diff": "^5.2.0",
"fast-deep-equal": "^3.1.3",
"string-width": "^4.2.3",
"table": "^6.8.1"
Expand All @@ -38,7 +38,7 @@
"@types/string-width": "^4.0.1",
"fast-check": "^3.15.1",
"jest": "^29.7.0",
"aws-sdk": "2.1548.0",
"aws-sdk": "2.1557.0",
"ts-jest": "^29.1.2"
},
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/custom-resource-handlers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@aws-sdk/client-synthetics": "3.421.0",
"@aws-sdk/client-ecr": "3.421.0",
"@aws-sdk/client-s3": "3.421.0",
"aws-sdk": "^2.1548.0"
"aws-sdk": "^2.1557.0"
},
"repository": {
"url": "https://github.com/aws/aws-cdk.git",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/cx-api/FEATURE_FLAGS.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Flags come in three types:
| [@aws-cdk/aws-rds:preventRenderingDeprecatedCredentials](#aws-cdkaws-rdspreventrenderingdeprecatedcredentials) | When enabled, creating an RDS database cluster from a snapshot will only render credentials for snapshot credentials. | 2.98.0 | (fix) |
| [@aws-cdk/aws-codepipeline-actions:useNewDefaultBranchForCodeCommitSource](#aws-cdkaws-codepipeline-actionsusenewdefaultbranchforcodecommitsource) | When enabled, the CodeCommit source action is using the default branch name 'main'. | 2.103.1 | (fix) |
| [@aws-cdk/aws-cloudwatch-actions:changeLambdaPermissionLogicalIdForLambdaAction](#aws-cdkaws-cloudwatch-actionschangelambdapermissionlogicalidforlambdaaction) | When enabled, the logical ID of a Lambda permission for a Lambda action includes an alarm ID. | 2.124.0 | (fix) |
| [@aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse](#aws-cdkaws-codepipelinecrossaccountkeysdefaultvaluetofalse) | Enables Pipeline to set the default value for crossAccountKeys to false. | V2NEXT | (default) |
| [@aws-cdk/aws-codepipeline:crossAccountKeysDefaultValueToFalse](#aws-cdkaws-codepipelinecrossaccountkeysdefaultvaluetofalse) | Enables Pipeline to set the default value for crossAccountKeys to false. | 2.127.0 | (default) |

<!-- END table -->

Expand Down Expand Up @@ -1226,7 +1226,7 @@ construct, the construct automatically defaults the value of this property to fa
| Since | Default | Recommended |
| ----- | ----- | ----- |
| (not in v1) | | |
| V2NEXT | `false` | `true` |
| 2.127.0 | `false` | `true` |

**Compatibility with old behavior:** Pass `crossAccountKeys: true` to `Pipeline` construct to restore the previous behavior.

Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/cx-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"organization": true
},
"dependencies": {
"semver": "^7.5.4"
"semver": "^7.6.0"
},
"peerDependencies": {
"@aws-cdk/cloud-assembly-schema": "0.0.0"
Expand All @@ -91,7 +91,7 @@
"@aws-cdk/pkglint": "0.0.0",
"@types/jest": "^29.5.12",
"@types/mock-fs": "^4.13.4",
"@types/semver": "^7.5.6",
"@types/semver": "^7.5.7",
"jest": "^29.7.0",
"madge": "^5.0.2",
"mock-fs": "^4.14.0"
Expand Down
Loading

0 comments on commit fa183b1

Please sign in to comment.