From 0549ccc031e0395fe120b5d57e1b42975ad8ac94 Mon Sep 17 00:00:00 2001 From: Cameron Childress Date: Thu, 15 Dec 2022 09:14:33 -0500 Subject: [PATCH 1/2] Add support for new managed Origin Request Policy AllViewerAndCloudFrontHeaders-2022-06 This adds support for the managed policy "AllViewerAndCloudFrontHeaders-2022-06", which includes newer CloudFront Headers such as CloudFront-Viewer-Latitude CloudFront-Viewer-Longitude. Detail about this managed policy: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-origin-request-policies.html#managed-origin-request-policy-all-viewer-and-cloudfront --- packages/@aws-cdk/aws-cloudfront/lib/origin-request-policy.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/@aws-cdk/aws-cloudfront/lib/origin-request-policy.ts b/packages/@aws-cdk/aws-cloudfront/lib/origin-request-policy.ts index 2a72736e95e5f..d8a87ffaade7d 100644 --- a/packages/@aws-cdk/aws-cloudfront/lib/origin-request-policy.ts +++ b/packages/@aws-cdk/aws-cloudfront/lib/origin-request-policy.ts @@ -66,6 +66,8 @@ export class OriginRequestPolicy extends Resource implements IOriginRequestPolic public static readonly ALL_VIEWER = OriginRequestPolicy.fromManagedOriginRequestPolicy('216adef6-5c7f-47e4-b989-5492eafa07d3'); /** This policy is designed for use with an origin that is an AWS Elemental MediaTailor endpoint. */ public static readonly ELEMENTAL_MEDIA_TAILOR = OriginRequestPolicy.fromManagedOriginRequestPolicy('775133bc-15f2-49f9-abea-afb2e0bf67d2'); + /** This policy includes all values (headers, cookies, and query strings) in the viewer request, and all CloudFront headers that were released through June 2022 (CloudFront headers released after June 2022 are not included). */ + public static readonly ALL_VIEWER_AND_CLOUDFRONT_2022 = OriginRequestPolicy.fromManagedOriginRequestPolicy('33f36d7e-f396-46d9-90e0-52428a34d9dc'); /** Imports a Origin Request Policy from its id. */ public static fromOriginRequestPolicyId(scope: Construct, id: string, originRequestPolicyId: string): IOriginRequestPolicy { From 43bbe6d0b4f8c01fbbf061d41f71f427262a2877 Mon Sep 17 00:00:00 2001 From: Cameron Childress Date: Thu, 15 Dec 2022 09:36:58 -0500 Subject: [PATCH 2/2] Update to supporting integration test --- .../@aws-cdk/aws-cloudfront/test/origin-request-policy.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/@aws-cdk/aws-cloudfront/test/origin-request-policy.test.ts b/packages/@aws-cdk/aws-cloudfront/test/origin-request-policy.test.ts index bda5a09058e67..b0fbbd93539c8 100644 --- a/packages/@aws-cdk/aws-cloudfront/test/origin-request-policy.test.ts +++ b/packages/@aws-cdk/aws-cloudfront/test/origin-request-policy.test.ts @@ -108,6 +108,7 @@ test('managed policies are provided', () => { expect(OriginRequestPolicy.CORS_S3_ORIGIN.originRequestPolicyId).toEqual('88a5eaf4-2fd4-4709-b370-b4c650ea3fcf'); expect(OriginRequestPolicy.ALL_VIEWER.originRequestPolicyId).toEqual('216adef6-5c7f-47e4-b989-5492eafa07d3'); expect(OriginRequestPolicy.ELEMENTAL_MEDIA_TAILOR.originRequestPolicyId).toEqual('775133bc-15f2-49f9-abea-afb2e0bf67d2'); + expect(OriginRequestPolicy.ALL_VIEWER_AND_CLOUDFRONT_2022.originRequestPolicyId).toEqual('33f36d7e-f396-46d9-90e0-52428a34d9dc'); }); // OriginRequestCookieBehavior and OriginRequestQueryStringBehavior have identical behavior