Skip to content

Commit

Permalink
Merge branch 'main' into merge-back/2.147.3
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Jul 2, 2024
2 parents 32f0fdb + 7f5ce4b commit 8947451
Show file tree
Hide file tree
Showing 288 changed files with 163,634 additions and 2,950 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/issue-label-assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
env:
OSDS_DEVS: >
{
"assignees":["indrora","khushail","hunhsieh"]
"assignees":["ashishdhingra","khushail","hunhsieh"]
}
AREA_AFFIXES: >
Expand Down Expand Up @@ -283,5 +283,6 @@ env:
{"area":"@aws-cdk/triggers","keywords":["trigger","triggers"],"labels":["@aws-cdk/triggers"]},
{"area":"@aws-cdk/integ-tests","keywords":["integ-tests", "integ"],"labels":["@aws-cdk/integ-tests"]},
{"area":"@aws-cdk/integ-runner","keywords":["integ-runner"],"labels":["@aws-cdk/integ-runner"]},
{"area":"@aws-cdk/app-staging-synthesizer-alpha", "keywords":["app-staging-synthesizer", "app-staging-synthesizer-alpha"],"labels":["@aws-cdk/app-staging-synthesizer-alpha"]}
{"area":"@aws-cdk/app-staging-synthesizer-alpha", "keywords":["app-staging-synthesizer", "app-staging-synthesizer-alpha"],"labels":["@aws-cdk/app-staging-synthesizer-alpha"]},
{"area":"@aws-cdk/aws-location-alpha", "keywords":["aws-location", "aws-location-alpha"],"labels":["@aws-cdk/aws-location-alpha"]}
]
2 changes: 1 addition & 1 deletion .github/workflows/request-cli-integ-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
persist-credentials: false
- name: Find changed cli files
id: changed-cli-files
uses: tj-actions/changed-files@d6babd6899969df1a11d14c368283ea4436bca78
uses: tj-actions/changed-files@cc733854b1f224978ef800d29e4709d5ee2883e4
with:
base_sha: ${{ github.event.pull_request.base.sha }}
files_yaml: |
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8022,7 +8022,7 @@ The headliners of this release are **.NET support**, and a wealth of commits by

### AWS CodePipeline

- _**BREAKING**_: Moved CodeCommit and CodeBuild and LambdaInvoke actions from the CodePipeline library to `@aws-cdk/aws-xxx-codepipline` modules ([@skinny85] in [#401] and [#402]).
- _**BREAKING**_: Moved CodeCommit and CodeBuild and LambdaInvoke actions from the CodePipeline library to `@aws-cdk/aws-xxx-codepipeline` modules ([@skinny85] in [#401] and [#402]).
- Added attributes `pipelineName` and `pipelineVersion` ([@eladb] in [#408])

### Docs
Expand Down Expand Up @@ -8142,7 +8142,7 @@ Coverage to all event sources and target will be added in subsequent releases.
Supported targets:

- `codebuild.BuildProject`
- `codepipline.Pipeline`
- `codepipeline.Pipeline`
- `sns.Topic`

Supported sources:
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Shout out to our top contributors!
- [otaviomacedo](https://github.com/otaviomacedo)
- [mrgrain](https://github.com/mrgrain)
- [madeline-k](https://github.com/madeline-k)
- [comcalvi](https://github.com/comcalvi)
- [pahud](https://github.com/pahud)
- [comcalvi](https://github.com/comcalvi)
- [NetaNir](https://github.com/NetaNir)
- [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
- [robertd](https://github.com/robertd)
Expand All @@ -25,8 +25,8 @@ Shout out to our top contributors!
- [colifran](https://github.com/colifran)
- [msambol](https://github.com/msambol)
- [nija-at](https://github.com/nija-at)
- [hoegertn](https://github.com/hoegertn)
- [watany-dev](https://github.com/watany-dev)
- [hoegertn](https://github.com/hoegertn)


_Last updated: Sat, 01 Jun 24 00:09:37 +0000_
_Last updated: Mon, 01 Jul 24 00:11:02 +0000_
1 change: 1 addition & 0 deletions ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ The CDK team is committed to supporting our existing library of AWS L2 abstracti
- 🚦️ [VPC Construct with Full Control](https://github.com/aws/aws-cdk/issues/5927)
- 🔍 [Rewrite EKS L2](https://github.com/aws/aws-cdk-rfcs/issues/605)
- 🔍 [Glue Alpha Construct Graduation](https://github.com/aws/aws-cdk-rfcs/issues/497)
- 🔍 [Auto-generation of L2 constructs](https://github.com/aws/aws-cdk-rfcs/issues/611)

### Updates/Enhancements

Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@
"build-all": "tsc -b"
},
"devDependencies": {
"@nx/workspace": "^16.10.0",
"@nx/workspace": "^19.3.1",
"@types/node": "18.11.19",
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
"aws-sdk-js-codemod": "^0.28.2",
"cdk-generate-synthetic-examples": "^0.2.7",
"cdk-generate-synthetic-examples": "^0.2.8",
"conventional-changelog-cli": "^2.2.2",
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.11",
"jest-junit": "^13.2.0",
"jsii-diff": "1.99.0",
"jsii-pacmak": "1.99.0",
"jsii-reflect": "1.99.0",
"lerna": "^8.1.4",
"nx": "^18.3.5",
"jsii-diff": "1.101.0",
"jsii-pacmak": "1.101.0",
"jsii-reflect": "1.101.0",
"lerna": "^8.1.5",
"nx": "^19.3.1",
"patch-package": "^6.5.1",
"semver": "^7.6.2",
"standard-version": "^9.5.0",
"ts-jest": "^29.1.4",
"ts-jest": "^29.1.5",
"ts-node": "^10.9.2",
"typescript": "~5.4.5"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/cli-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"dependencies": {
"@octokit/rest": "^18.12.0",
"aws-sdk": "^2.1639.0",
"aws-sdk": "^2.1648.0",
"axios": "^1.7.2",
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk-testing/framework-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"@aws-cdk/lambda-layer-kubectl-v29": "^2.1.0",
"@aws-cdk/lambda-layer-kubectl-v30": "^2.0.0",
"aws-cdk-lib": "0.0.0",
"aws-sdk": "^2.1639.0",
"aws-sdk": "^2.1648.0",
"aws-sdk-mock": "5.6.0",
"cdk8s": "2.68.78",
"cdk8s": "2.68.82",
"cdk8s-plus-27": "2.9.5",
"constructs": "^10.0.0"
},
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.

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

Loading

0 comments on commit 8947451

Please sign in to comment.