Skip to content

fix(cloudfront): auto-generated cache policy name might conflict cross-region #13737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 3 commits into from
Mar 29, 2021
Merged

fix(cloudfront): auto-generated cache policy name might conflict cross-region #13737

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5879b0
fix(cloudfront): auto-generated name of cache policy must be unique a…
robertd Mar 22, 2021
e025344
Merge branch 'master' into robertd/cloudfront-unique-cache-policy-name
mergify[bot] Mar 29, 2021
4075a0f
Merge branch 'master' into robertd/cloudfront-unique-cache-policy-name
mergify[bot] Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-cloudfront/lib/cache-policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Duration, Names, Resource, Token } from '@aws-cdk/core';
import { Duration, Names, Resource, Stack, Token } from '@aws-cdk/core';
import { Construct } from 'constructs';
import { CfnCachePolicy } from './cloudfront.generated';

Expand Down Expand Up @@ -125,7 +125,7 @@ export class CachePolicy extends Resource implements ICachePolicy {
physicalName: props.cachePolicyName,
});

const cachePolicyName = props.cachePolicyName ?? Names.uniqueId(this);
const cachePolicyName = props.cachePolicyName ?? `${Names.uniqueId(this)}-${Stack.of(this).region}`;
if (!Token.isUnresolved(cachePolicyName) && !cachePolicyName.match(/^[\w-]+$/i)) {
throw new Error(`'cachePolicyName' can only include '-', '_', and alphanumeric characters, got: '${props.cachePolicyName}'`);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-cloudfront/test/cache-policy.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('CachePolicy', () => {

expect(stack).toHaveResource('AWS::CloudFront::CachePolicy', {
CachePolicyConfig: {
Name: 'StackCachePolicy0D6FCBC0',
Name: 'StackCachePolicy0D6FCBC0-testregion',
MinTTL: 0,
DefaultTTL: 86400,
MaxTTL: 31536000,
Expand Down