From 7330f91b1aa8360db29384c823948596d1370ca7 Mon Sep 17 00:00:00 2001 From: Ryan Clark Date: Sat, 3 May 2025 16:15:24 -0700 Subject: [PATCH] add region to autogenerated name for cloudfront origin request policy --- .../aws-cdk-lib/aws-cloudfront/lib/origin-request-policy.ts | 4 ++-- .../aws-cloudfront/test/origin-request-policy.test.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/origin-request-policy.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/origin-request-policy.ts index b532766d95647..91cb7e2d7c98d 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/lib/origin-request-policy.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/lib/origin-request-policy.ts @@ -1,6 +1,6 @@ import { Construct } from 'constructs'; import { CfnOriginRequestPolicy } from './cloudfront.generated'; -import { Names, Resource, Token, UnscopedValidationError, ValidationError } from '../../core'; +import { Names, Resource, Stack, Token, UnscopedValidationError, ValidationError } from '../../core'; import { addConstructMetadata } from '../../core/lib/metadata-resource'; /** @@ -94,7 +94,7 @@ export class OriginRequestPolicy extends Resource implements IOriginRequestPolic // Enhanced CDK Analytics Telemetry addConstructMetadata(this, props); - const originRequestPolicyName = props.originRequestPolicyName ?? Names.uniqueId(this); + const originRequestPolicyName = props.originRequestPolicyName ?? `${Names.uniqueId(this).slice(0, 110)}-${Stack.of(this).region}`; if (!Token.isUnresolved(originRequestPolicyName) && !originRequestPolicyName.match(/^[\w-]+$/i)) { throw new ValidationError(`'originRequestPolicyName' can only include '-', '_', and alphanumeric characters, got: '${props.originRequestPolicyName}'`, this); } diff --git a/packages/aws-cdk-lib/aws-cloudfront/test/origin-request-policy.test.ts b/packages/aws-cdk-lib/aws-cloudfront/test/origin-request-policy.test.ts index 234c406851bfa..f801e161ea5a8 100644 --- a/packages/aws-cdk-lib/aws-cloudfront/test/origin-request-policy.test.ts +++ b/packages/aws-cdk-lib/aws-cloudfront/test/origin-request-policy.test.ts @@ -24,7 +24,7 @@ describe('OriginRequestPolicy', () => { Template.fromStack(stack).hasResourceProperties('AWS::CloudFront::OriginRequestPolicy', { OriginRequestPolicyConfig: { - Name: 'StackOriginRequestPolicy6B17D9ED', + Name: 'StackOriginRequestPolicy6B17D9ED-testregion', CookiesConfig: { CookieBehavior: 'none', },