Merge branch 'main' into automation/yarn-upgrade

aws · Sep 11, 2024 · bee1d25 · bee1d25
2 parents 7ae7bda + 1794dc4
commit bee1d25
Show file tree

Hide file tree

Showing 29 changed files with 1,262 additions and 5 deletions.
diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md
@@ -9,7 +9,7 @@ All notable changes to this project will be documented in this file. See [standa
 
 * update L1 CloudFormation resource definitions ([#31361](https://github.com/aws/aws-cdk/issues/31361)) ([bc4dbfd](https://github.com/aws/aws-cdk/commit/bc4dbfdb05a1fe02d30c4724958d09f239a3656f))
 * **appsync:** support DEBUG and INFO logging levels for AppSync GraphQL APIs ([#31326](https://github.com/aws/aws-cdk/issues/31326)) ([4b9643f](https://github.com/aws/aws-cdk/commit/4b9643f28edc2c530809931ccd7a17a811891af2))
-* **lambda:** added new property allowAllIpv6Outbound to FunctionOptions ([#31013](https://github.com/aws/aws-cdk/issues/31013)) ([fa55194](https://github.com/aws/aws-cdk/commit/fa55194698960b9161590e05cf1138a813315615)), closes [#30994](https://github.com/aws/aws-cdk/issues/30994) [/github.com/aws/aws-cdk/blob/9295a85a8fb893d7f5eae06108b68df864096c4c/packages/aws-cdk-lib/aws-ec2/lib/security-group.ts#L272](https://github.com/aws//github.com/aws/aws-cdk/blob/9295a85a8fb893d7f5eae06108b68df864096c4c/packages/aws-cdk-lib/aws-ec2/lib/security-group.ts/issues/L272) [/github.com/aws/aws-cdk/blob/9295a85a8fb893d7f5eae06108b68df864096c4c/packages/aws-cdk-lib/aws-lambda/lib/function.ts#L146C18-L146C33](https://github.com/aws//github.com/aws/aws-cdk/blob/9295a85a8fb893d7f5eae06108b68df864096c4c/packages/aws-cdk-lib/aws-lambda/lib/function.ts/issues/L146C18-L146C33) [/github.com/aws/aws-cdk/blob/9295a85a8fb893d7f5eae06108b68df864096c4c/packages/aws-cdk-lib/aws-lambda/lib/function.ts#L296C12-L296C28](https://github.com/aws//github.com/aws/aws-cdk/blob/9295a85a8fb893d7f5eae06108b68df864096c4c/packages/aws-cdk-lib/aws-lambda/lib/function.ts/issues/L296C12-L296C28) [/github.com/aws/aws-cdk/blob/9295a85a8fb893d7f5eae06108b68df864096c4c/packages/aws-cdk-lib/aws-lambda/lib/function.ts#L1464C11-L1464C23](https://github.com/aws//github.com/aws/aws-cdk/blob/9295a85a8fb893d7f5eae06108b68df864096c4c/packages/aws-cdk-lib/aws-lambda/lib/function.ts/issues/L1464C11-L1464C23) [/github.com/aws/aws-cdk/blob/9295a85a8fb893d7f5eae06108b68df864096c4c/packages/aws-cdk-lib/aws-lambda/lib/function.ts#L1503](https://github.com/aws//github.com/aws/aws-cdk/blob/9295a85a8fb893d7f5eae06108b68df864096c4c/packages/aws-cdk-lib/aws-lambda/lib/function.ts/issues/L1503)
+* **lambda:** added new property allowAllIpv6Outbound to FunctionOptions ([#31013](https://github.com/aws/aws-cdk/issues/31013)) ([fa55194](https://github.com/aws/aws-cdk/commit/fa55194698960b9161590e05cf1138a813315615)), closes [#30994](https://github.com/aws/aws-cdk/issues/30994)
 
 
 ### Bug Fixes

diff --git a/...trinsics.js.snapshot/ResourceTagIntrinsicStackDefaultTestDeployAssert069A8F1A.assets.json b/...trinsics.js.snapshot/ResourceTagIntrinsicStackDefaultTestDeployAssert069A8F1A.assets.json
diff --git a/...insics.js.snapshot/ResourceTagIntrinsicStackDefaultTestDeployAssert069A8F1A.template.json b/...insics.js.snapshot/ResourceTagIntrinsicStackDefaultTestDeployAssert069A8F1A.template.json
diff --git a/...dformation-include/test/integ.resource-tags-wtih-intrinsics.js.snapshot/Stack.assets.json b/...dformation-include/test/integ.resource-tags-wtih-intrinsics.js.snapshot/Stack.assets.json
diff --git a/...ormation-include/test/integ.resource-tags-wtih-intrinsics.js.snapshot/Stack.template.json b/...ormation-include/test/integ.resource-tags-wtih-intrinsics.js.snapshot/Stack.template.json
@@ -0,0 +1,77 @@
+{
+ "Parameters": {
+  "Param": {
+   "Type": "CommaDelimitedList",
+   "Default": "key,value"
+  },
+  "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]"
+  }
+ },
+ "Conditions": {
+  "ShouldIncludeTag": {
+   "Fn::Equals": [
+    2,
+    2
+   ]
+  }
+ },
+ "Resources": {
+  "Bucket": {
+   "Type": "AWS::S3::Bucket",
+   "Properties": {
+    "BucketName": "cdk-integ-cfn-include-bucket2",
+    "Tags": [
+     {
+      "Fn::If": [
+       "ShouldIncludeTag",
+       {
+        "Key": {
+         "Fn::Select": [
+          0,
+          {
+           "Ref": "Param"
+          }
+         ]
+        },
+        "Value": "TagValue"
+       },
+       {
+        "Ref": "AWS::NoValue"
+       }
+      ]
+     }
+    ]
+   }
+  }
+ },
+ "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."
+    }
+   ]
+  }
+ }
+}
diff --git a/.../test/cloudformation-include/test/integ.resource-tags-wtih-intrinsics.js.snapshot/cdk.out b/.../test/cloudformation-include/test/integ.resource-tags-wtih-intrinsics.js.snapshot/cdk.out
diff --git a/...st/cloudformation-include/test/integ.resource-tags-wtih-intrinsics.js.snapshot/integ.json b/...st/cloudformation-include/test/integ.resource-tags-wtih-intrinsics.js.snapshot/integ.json
diff --git a/...cloudformation-include/test/integ.resource-tags-wtih-intrinsics.js.snapshot/manifest.json b/...cloudformation-include/test/integ.resource-tags-wtih-intrinsics.js.snapshot/manifest.json