Merge branch 'main' into onezone

CHANGELOG.v2.alpha.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.139.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.139.0-alpha.0...v2.139.1-alpha.0) (2024-04-29)
+
 ## [2.139.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.138.0-alpha.0...v2.139.0-alpha.0) (2024-04-24)
 
 ## [2.138.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.137.0-alpha.0...v2.138.0-alpha.0) (2024-04-18)

CHANGELOG.v2.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.139.1](https://github.com/aws/aws-cdk/compare/v2.139.0...v2.139.1) (2024-04-29)
+
+
+### Reverts
+
+* fix(lambda): version.fromVersionArn creates invalid Version object ([#30003](https://github.com/aws/aws-cdk/issues/30003)) ([ced7a46](https://github.com/aws/aws-cdk/commit/ced7a46b45aeee335264d91cf8287da4837dbab8))
+
 ## [2.139.0](https://github.com/aws/aws-cdk/compare/v2.138.0...v2.139.0) (2024-04-24)
 
 

CONTRIBUTORS.md

@@ -15,18 +15,18 @@ Shout out to our top contributors!
 - [madeline-k](https://github.com/madeline-k)
 - [comcalvi](https://github.com/comcalvi)
 - [NetaNir](https://github.com/NetaNir)
-- [robertd](https://github.com/robertd)
 - [pahud](https://github.com/pahud)
+- [robertd](https://github.com/robertd)
 - [TheRealAmazonKendra](https://github.com/TheRealAmazonKendra)
 - [MrArnoldPalmer](https://github.com/MrArnoldPalmer)
 - [lpizzinidev](https://github.com/lpizzinidev)
-- [peterwoodworth](https://github.com/peterwoodworth)
 - [go-to-k](https://github.com/go-to-k)
+- [peterwoodworth](https://github.com/peterwoodworth)
 - [colifran](https://github.com/colifran)
 - [nija-at](https://github.com/nija-at)
-- [hoegertn](https://github.com/hoegertn)
 - [msambol](https://github.com/msambol)
+- [hoegertn](https://github.com/hoegertn)
 - [watany-dev](https://github.com/watany-dev)
 
 
-_Last updated: Mon, 01 Apr 24 00:09:41 +0000_
+_Last updated: Wed, 01 May 24 00:09:37 +0000_

package.json

@@ -20,16 +20,16 @@
  "@types/prettier": "2.6.0",
  "@yarnpkg/lockfile": "^1.1.0",
  "aws-sdk-js-codemod": "^0.28.2",
- "cdk-generate-synthetic-examples": "^0.2.0",
+ "cdk-generate-synthetic-examples": "^0.2.1",
  "conventional-changelog-cli": "^2.2.2",
  "fs-extra": "^9.1.0",
  "graceful-fs": "^4.2.11",
  "jest-junit": "^13.2.0",
- "jsii-diff": "1.97.0",
- "jsii-pacmak": "1.97.0",
- "jsii-reflect": "1.97.0",
+ "jsii-diff": "1.98.0",
+ "jsii-pacmak": "1.98.0",
+ "jsii-reflect": "1.98.0",
  "lerna": "^8.1.2",
- "nx": "^18.3.1",
+ "nx": "^18.3.4",
  "patch-package": "^6.5.1",
  "semver": "^7.6.0",
  "standard-version": "^9.5.0",

packages/@aws-cdk-testing/cli-integ/README.md

@@ -46,6 +46,31 @@ yarn build # Build the @aws-cdk-testing/cli-integ package
 ../../../scripts/align-version.sh # Align the versions of CDK packages
 ```
 
+### Running tests with debugger
+
+```json
+{
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "type": "node",
+ "request": "launch",
+ "args": ["-a", "cli-integ-tests", "-t", "context in stage propagates to top"],
+ "name": "debug integ tests",
+ "program": "~/aws-cdk/packages/@aws-cdk-testing/cli-integ/bin/run-suite",
+ "console": "integratedTerminal",
+ "sourceMaps": true,
+ "skipFiles": [ "<node_internals>/**/*" ],
+ "stopOnEntry": false
+ }
+ ]
+}
+```
+
+1. Assuming you checked out the `aws-cdk` repository in your `~` directory, use the above `launch.json`.
+2. In the `"args"` value after `"-t"`, place the name of the test that you'd like to run.
+3. Press the VS code green arrow to launch the debugger.
+
 ### Running a test suite
 
 You run a suite using the `bin/run-suite` tool. You must select either a version of the CLI and framework which can be `npm install`ed, or point to the root of the source tree:

packages/@aws-cdk-testing/cli-integ/package.json

@@ -39,7 +39,7 @@
  },
  "dependencies": {
  "@octokit/rest": "^18.12.0",
- "aws-sdk": "^2.1600.0",
+ "aws-sdk": "^2.1610.0",
  "axios": "^1.6.8",
  "fs-extra": "^9.1.0",
  "glob": "^7.2.3",

packages/@aws-cdk-testing/framework-integ/package.json

@@ -42,10 +42,10 @@
  "@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
  "@aws-cdk/lambda-layer-kubectl-v29": "^2.0.0",
  "aws-cdk-lib": "0.0.0",
- "aws-sdk": "^2.1600.0",
+ "aws-sdk": "^2.1610.0",
  "aws-sdk-mock": "5.6.0",
- "cdk8s": "2.68.60",
- "cdk8s-plus-27": "2.7.88",
+ "cdk8s": "2.68.65",
+ "cdk8s-plus-27": "2.9.1",
  "constructs": "^10.0.0"
  },
  "repository": {

packages/@aws-cdk-testing/framework-integ/test/aws-codecommit/test/integ.repository-encryption.js.snapshot/RepositoryEncryption.template.json

@@ -0,0 +1,85 @@
+{
+ "Resources": {
+ "MyKey6AB29FA6": {
+ "Type": "AWS::KMS::Key",
+ "Properties": {
+ "KeyPolicy": {
+ "Statement": [
+ {
+ "Action": "kms:*",
+ "Effect": "Allow",
+ "Principal": {
+ "AWS": {
+ "Fn::Join": [
+ "",
+ [
+ "arn:",
+ {
+ "Ref": "AWS::Partition"
+ },
+ ":iam::",
+ {
+ "Ref": "AWS::AccountId"
+ },
+ ":root"
+ ]
+ ]
+ }
+ },
+ "Resource": "*"
+ }
+ ],
+ "Version": "2012-10-17"
+ }
+ },
+ "UpdateReplacePolicy": "Retain",
+ "DeletionPolicy": "Retain"
+ },
+ "MyCodecommitRepository26DB372B": {
+ "Type": "AWS::CodeCommit::Repository",
+ "Properties": {
+ "KmsKeyId": {
+ "Fn::GetAtt": [
+ "MyKey6AB29FA6",
+ "Arn"
+ ]
+ },
+ "RepositoryName": "my-test-repository"
+ }
+ }
+ },
+ "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."
+ }
+ ]
+ }
+ }
+}