Merge branch 'main' into add-remote-check-to-workflows

aws · Feb 20, 2025 · 93be3d7 · 93be3d7
2 parents dc9eae4 + 1b116b9
commit 93be3d7
Show file tree

Hide file tree

Showing 18 changed files with 769 additions and 9 deletions.
diff --git a/...distribution-grpc.js.snapshot/DistributionGrpcDefaultTestDeployAssertE740300C.assets.json b/...distribution-grpc.js.snapshot/DistributionGrpcDefaultTestDeployAssertE740300C.assets.json
diff --git a/...stribution-grpc.js.snapshot/DistributionGrpcDefaultTestDeployAssertE740300C.template.json b/...stribution-grpc.js.snapshot/DistributionGrpcDefaultTestDeployAssertE740300C.template.json
diff --git a/...ting/framework-integ/test/aws-cloudfront/test/integ.distribution-grpc.js.snapshot/cdk.out b/...ting/framework-integ/test/aws-cloudfront/test/integ.distribution-grpc.js.snapshot/cdk.out
diff --git a/...s-cloudfront/test/integ.distribution-grpc.js.snapshot/integ-distribution-grpc.assets.json b/...s-cloudfront/test/integ.distribution-grpc.js.snapshot/integ-distribution-grpc.assets.json
diff --git a/...cloudfront/test/integ.distribution-grpc.js.snapshot/integ-distribution-grpc.template.json b/...cloudfront/test/integ.distribution-grpc.js.snapshot/integ-distribution-grpc.template.json
@@ -0,0 +1,91 @@
+{
+ "Resources": {
+  "TestDistribution94EC811C": {
+   "Type": "AWS::CloudFront::Distribution",
+   "Properties": {
+    "DistributionConfig": {
+     "CacheBehaviors": [
+      {
+       "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
+       "Compress": true,
+       "PathPattern": "/second",
+       "TargetOriginId": "integdistributiongrpcTestDistributionOrigin1C4AE5CE4",
+       "ViewerProtocolPolicy": "allow-all"
+      },
+      {
+       "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
+       "Compress": true,
+       "PathPattern": "/third",
+       "TargetOriginId": "integdistributiongrpcTestDistributionOrigin1C4AE5CE4",
+       "ViewerProtocolPolicy": "allow-all"
+      }
+     ],
+     "DefaultCacheBehavior": {
+      "AllowedMethods": [
+       "GET",
+       "HEAD",
+       "OPTIONS",
+       "PUT",
+       "PATCH",
+       "POST",
+       "DELETE"
+      ],
+      "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
+      "Compress": true,
+      "GrpcConfig": {
+       "Enabled": true
+      },
+      "TargetOriginId": "integdistributiongrpcTestDistributionOrigin1C4AE5CE4",
+      "ViewerProtocolPolicy": "allow-all"
+     },
+     "Enabled": true,
+     "HttpVersion": "http2",
+     "IPV6Enabled": true,
+     "Origins": [
+      {
+       "CustomOriginConfig": {
+        "OriginProtocolPolicy": "https-only"
+       },
+       "DomainName": "www.example.com",
+       "Id": "integdistributiongrpcTestDistributionOrigin1C4AE5CE4"
+      }
+     ]
+    }
+   }
+  }
+ },
+ "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/...g/framework-integ/test/aws-cloudfront/test/integ.distribution-grpc.js.snapshot/integ.json b/...g/framework-integ/test/aws-cloudfront/test/integ.distribution-grpc.js.snapshot/integ.json
diff --git a/...ramework-integ/test/aws-cloudfront/test/integ.distribution-grpc.js.snapshot/manifest.json b/...ramework-integ/test/aws-cloudfront/test/integ.distribution-grpc.js.snapshot/manifest.json