Merge branch 'main' into 28015

aws · Dec 18, 2023 · 9ccf73c · 9ccf73c
2 parents a0b28a6 + 0e30fcc
commit 9ccf73c
Show file tree

Hide file tree

Showing 28 changed files with 38,708 additions and 7 deletions.
diff --git a/...napshot/LogGroupResourcePolicyAnyPrincialIntegDefaultTestDeployAssert1A3C13F5.assets.json b/...napshot/LogGroupResourcePolicyAnyPrincialIntegDefaultTestDeployAssert1A3C13F5.assets.json
diff --git a/...pshot/LogGroupResourcePolicyAnyPrincialIntegDefaultTestDeployAssert1A3C13F5.template.json b/...pshot/LogGroupResourcePolicyAnyPrincialIntegDefaultTestDeployAssert1A3C13F5.template.json
diff --git a/...-policy-any-principal.js.snapshot/aws-cdk-log-group-resource-policy-any-integ.assets.json b/...-policy-any-principal.js.snapshot/aws-cdk-log-group-resource-policy-any-integ.assets.json
diff --git a/...olicy-any-principal.js.snapshot/aws-cdk-log-group-resource-policy-any-integ.template.json b/...olicy-any-principal.js.snapshot/aws-cdk-log-group-resource-policy-any-integ.template.json
@@ -0,0 +1,67 @@
+{
+ "Resources": {
+  "LogGroupF5B46931": {
+   "Type": "AWS::Logs::LogGroup",
+   "Properties": {
+    "RetentionInDays": 731
+   },
+   "UpdateReplacePolicy": "Retain",
+   "DeletionPolicy": "Retain"
+  },
+  "LogGroupPolicyResourcePolicy6FA18555": {
+   "Type": "AWS::Logs::ResourcePolicy",
+   "Properties": {
+    "PolicyDocument": {
+     "Fn::Join": [
+      "",
+      [
+       "{\"Statement\":[{\"Action\":\"logs:PutLogEvents\",\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"*\"},\"Resource\":\"",
+       {
+        "Fn::GetAtt": [
+         "LogGroupF5B46931",
+         "Arn"
+        ]
+       },
+       "\"}],\"Version\":\"2012-10-17\"}"
+      ]
+     ]
+    },
+    "PolicyName": "awscdkloggroupresourcepolicyanyintegLogGroupPolicy69400813"
+   }
+  }
+ },
+ "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."
+    }
+   ]
+  }
+ }
+}
diff --git a/...work-integ/test/aws-logs/test/integ.log-resource-policy-any-principal.js.snapshot/cdk.out b/...work-integ/test/aws-logs/test/integ.log-resource-policy-any-principal.js.snapshot/cdk.out
diff --git a/...k-integ/test/aws-logs/test/integ.log-resource-policy-any-principal.js.snapshot/integ.json b/...k-integ/test/aws-logs/test/integ.log-resource-policy-any-principal.js.snapshot/integ.json
diff --git a/...nteg/test/aws-logs/test/integ.log-resource-policy-any-principal.js.snapshot/manifest.json b/...nteg/test/aws-logs/test/integ.log-resource-policy-any-principal.js.snapshot/manifest.json