Merge branch 'main' into feat/security-group-lookup-filters

aws · Jul 2, 2024 · 2d7039a · 2d7039a
2 parents 37038d6 + 61c28dd
commit 2d7039a
Show file tree

Hide file tree

Showing 14 changed files with 399 additions and 60 deletions.
diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md
@@ -2,6 +2,10 @@
 
 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.147.3-alpha.0](https://github.com/aws/aws-cdk/compare/v2.147.2-alpha.0...v2.147.3-alpha.0) (2024-07-01)
+
+## [2.147.2-alpha.0](https://github.com/aws/aws-cdk/compare/v2.147.1-alpha.0...v2.147.2-alpha.0) (2024-06-27)
+
 ## [2.147.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.147.0-alpha.0...v2.147.1-alpha.0) (2024-06-21)
 
 ## [2.147.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.146.0-alpha.0...v2.147.0-alpha.0) (2024-06-20)

diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md
@@ -2,12 +2,26 @@
 
 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.147.3](https://github.com/aws/aws-cdk/compare/v2.147.2...v2.147.3) (2024-07-01)
+
+
+### Bug Fixes
+
+* **lambda-nodejs:** breaking change in esbuild causes import module error ([#30726](https://github.com/aws/aws-cdk/issues/30726)) ([06c14b1](https://github.com/aws/aws-cdk/commit/06c14b16d04353e9e108b58edc1450d018c24b12)), closes [#30717](https://github.com/aws/aws-cdk/issues/30717)
+
+## [2.147.2](https://github.com/aws/aws-cdk/compare/v2.147.1...v2.147.2) (2024-06-27)
+
+
+### Reverts
+
+* fix(core): overrideLogicalId validation ([#29708](https://github.com/aws/aws-cdk/pull/29708)) ([b196b13](https://github.com/aws/aws-cdk/commit/b196b13b0b8a54dcacadf87fdbe744772a6e6c4d))
+
 ## [2.147.1](https://github.com/aws/aws-cdk/compare/v2.147.0...v2.147.1) (2024-06-21)
 
 
 ### Reverts
 
-* route53 CrossAccountZoneDelegationRecord fails at deployment time with imported `delegatedZone` ([#30440](https://github.com/aws/aws-cdk/issues/30440))" ([#30606](https://github.com/aws/aws-cdk/issues/30606)) ([69eb617](https://github.com/aws/aws-cdk/commit/69eb617b45b5c4e495901d367d85e1edeea57e69)), closes [#30600](https://github.com/aws/aws-cdk/issues/30600)
+* route53 CrossAccountZoneDelegationRecord fails at deployment time with imported `delegatedZone` ([#30440](https://github.com/aws/aws-cdk/issues/30440)) ([a3d9b10](https://github.com/aws/aws-cdk/commit/a3d9b10ad9036486961f74e852493aa9684cfdb4))
 
 ## [2.147.0](https://github.com/aws/aws-cdk/compare/v2.146.0...v2.147.0) (2024-06-20)
 

diff --git a/...ws-cdk-testing/framework-integ/test/aws-lambda/test/integ.permissions.js.snapshot/cdk.out b/...ws-cdk-testing/framework-integ/test/aws-lambda/test/integ.permissions.js.snapshot/cdk.out
diff --git a/...cdk-testing/framework-integ/test/aws-lambda/test/integ.permissions.js.snapshot/integ.json b/...cdk-testing/framework-integ/test/aws-lambda/test/integ.permissions.js.snapshot/integ.json
diff --git a/...k-integ/test/aws-lambda/test/integ.permissions.js.snapshot/lambda-permissions.assets.json b/...k-integ/test/aws-lambda/test/integ.permissions.js.snapshot/lambda-permissions.assets.json
diff --git a/...integ/test/aws-lambda/test/integ.permissions.js.snapshot/lambda-permissions.template.json b/...integ/test/aws-lambda/test/integ.permissions.js.snapshot/lambda-permissions.template.json
@@ -117,6 +117,20 @@
     "Principal": "apigateway.amazonaws.com"
    }
   },
+  "MyLambdaInvokeZQDUzUWqDuiGYFrGB6ik9uIPJSgF8GSLIg6NTO8jHPIBE1EB3A4": {
+   "Type": "AWS::Lambda::Permission",
+   "Properties": {
+    "Action": "lambda:InvokeFunction",
+    "FunctionName": {
+     "Fn::GetAtt": [
+      "MyLambdaCCE802FB",
+      "Arn"
+     ]
+    },
+    "Principal": "*",
+    "PrincipalOrgID": "o-xxxxxxxxxx2"
+   }
+  },
   "MyRoleF48FFE04": {
    "Type": "AWS::IAM::Role",
    "Properties": {
@@ -148,6 +162,52 @@
          "Arn"
         ]
        }
+      },
+      {
+       "Action": "lambda:InvokeFunction",
+       "Effect": "Allow",
+       "Resource": [
+        {
+         "Fn::GetAtt": [
+          "MyLambdaCCE802FB",
+          "Arn"
+         ]
+        },
+        {
+         "Fn::Join": [
+          "",
+          [
+           {
+            "Fn::GetAtt": [
+             "MyLambdaCCE802FB",
+             "Arn"
+            ]
+           },
+           ":",
+           {
+            "Fn::GetAtt": [
+             "v192FF9954",
+             "Version"
+            ]
+           }
+          ]
+         ]
+        },
+        {
+         "Fn::Join": [
+          "",
+          [
+           {
+            "Fn::GetAtt": [
+             "MyLambdaCCE802FB",
+             "Arn"
+            ]
+           },
+           ":$LATEST"
+          ]
+         ]
+        }
+       ]
       }
      ],
      "Version": "2012-10-17"
@@ -159,6 +219,14 @@
      }
     ]
    }
+  },
+  "v192FF9954": {
+   "Type": "AWS::Lambda::Version",
+   "Properties": {
+    "FunctionName": {
+     "Ref": "MyLambdaCCE802FB"
+    }
+   }
   }
  },
  "Parameters": {

diff --git a/...-testing/framework-integ/test/aws-lambda/test/integ.permissions.js.snapshot/manifest.json b/...-testing/framework-integ/test/aws-lambda/test/integ.permissions.js.snapshot/manifest.json