Merge branch 'main' into ref_task_def_ecs

aws · Oct 18, 2024 · 4b90a15 · 4b90a15
2 parents 44f4165 + 4aa117b
commit 4b90a15
Show file tree

Hide file tree

Showing 19 changed files with 876 additions and 63 deletions.
diff --git a/.github/workflows/v2-pull-request.yml b/.github/workflows/v2-pull-request.yml
diff --git a/...-testing/framework-integ/test/aws-s3/test/integ.lifecycle-transitions.js.snapshot/cdk.out b/...-testing/framework-integ/test/aws-s3/test/integ.lifecycle-transitions.js.snapshot/cdk.out
diff --git a/...ons.js.snapshot/cdkintegs3lifecycletransitionsDefaultTestDeployAssert9A611ED6.assets.json b/...ons.js.snapshot/cdkintegs3lifecycletransitionsDefaultTestDeployAssert9A611ED6.assets.json
diff --git a/...s.js.snapshot/cdkintegs3lifecycletransitionsDefaultTestDeployAssert9A611ED6.template.json b/...s.js.snapshot/cdkintegs3lifecycletransitionsDefaultTestDeployAssert9A611ED6.template.json
diff --git a/...sting/framework-integ/test/aws-s3/test/integ.lifecycle-transitions.js.snapshot/integ.json b/...sting/framework-integ/test/aws-s3/test/integ.lifecycle-transitions.js.snapshot/integ.json
diff --git a/...ng/framework-integ/test/aws-s3/test/integ.lifecycle-transitions.js.snapshot/manifest.json b/...ng/framework-integ/test/aws-s3/test/integ.lifecycle-transitions.js.snapshot/manifest.json
diff --git a/.../aws-s3/test/integ.lifecycle-transitions.js.snapshot/s3-lifecycle-transitions.assets.json b/.../aws-s3/test/integ.lifecycle-transitions.js.snapshot/s3-lifecycle-transitions.assets.json
diff --git a/...ws-s3/test/integ.lifecycle-transitions.js.snapshot/s3-lifecycle-transitions.template.json b/...ws-s3/test/integ.lifecycle-transitions.js.snapshot/s3-lifecycle-transitions.template.json
@@ -0,0 +1,102 @@
+{
+ "Resources": {
+  "AllStorageClasses128KB8241761": {
+   "Type": "AWS::S3::Bucket",
+   "Properties": {
+    "LifecycleConfiguration": {
+     "Rules": [
+      {
+       "Status": "Enabled",
+       "Transitions": [
+        {
+         "StorageClass": "DEEP_ARCHIVE",
+         "TransitionInDays": 30
+        }
+       ]
+      },
+      {
+       "ObjectSizeGreaterThan": 200000,
+       "ObjectSizeLessThan": 300000,
+       "Status": "Enabled",
+       "Transitions": [
+        {
+         "StorageClass": "ONEZONE_IA",
+         "TransitionInDays": 30
+        }
+       ]
+      }
+     ],
+     "TransitionDefaultMinimumObjectSize": "all_storage_classes_128K"
+    }
+   },
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  },
+  "VariesByStorageClassCD3C88D5": {
+   "Type": "AWS::S3::Bucket",
+   "Properties": {
+    "LifecycleConfiguration": {
+     "Rules": [
+      {
+       "Status": "Enabled",
+       "Transitions": [
+        {
+         "StorageClass": "DEEP_ARCHIVE",
+         "TransitionInDays": 30
+        }
+       ]
+      },
+      {
+       "ObjectSizeGreaterThan": 200000,
+       "ObjectSizeLessThan": 300000,
+       "Status": "Enabled",
+       "Transitions": [
+        {
+         "StorageClass": "ONEZONE_IA",
+         "TransitionInDays": 30
+        }
+       ]
+      }
+     ],
+     "TransitionDefaultMinimumObjectSize": "varies_by_storage_class"
+    }
+   },
+   "UpdateReplacePolicy": "Delete",
+   "DeletionPolicy": "Delete"
+  }
+ },
+ "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."
+    }
+   ]
+  }
+ }
+}