|
1 | 1 | import route53 = require('@aws-cdk/aws-route53');
|
2 | 2 | import s3 = require('@aws-cdk/aws-s3');
|
3 | 3 | import cdk = require('@aws-cdk/cdk');
|
4 |
| -import { CfnCloudFrontOriginAccessIdentity, CfnDistribution } from './cloudfront.generated'; |
| 4 | +import { CfnDistribution } from './cloudfront.generated'; |
5 | 5 |
|
6 | 6 | export enum HttpVersion {
|
7 | 7 | HTTP1_1 = "http1.1",
|
@@ -237,12 +237,12 @@ export interface S3OriginConfig {
|
237 | 237 | /**
|
238 | 238 | * The source bucket to serve content from
|
239 | 239 | */
|
240 |
| - readonly s3BucketSource: s3.IBucket, |
| 240 | + readonly s3BucketSource: s3.IBucket; |
241 | 241 |
|
242 | 242 | /**
|
243 |
| - * The optional origin identity cloudfront will use when calling your s3 bucket. |
| 243 | + * The optional ID of the origin identity cloudfront will use when calling your s3 bucket. |
244 | 244 | */
|
245 |
| - readonly originAccessIdentity?: CfnCloudFrontOriginAccessIdentity |
| 245 | + readonly originAccessIdentityId?: string; |
246 | 246 | }
|
247 | 247 |
|
248 | 248 | /**
|
@@ -570,8 +570,8 @@ export class CloudFrontWebDistribution extends cdk.Construct implements route53.
|
570 | 570 | : originConfig.customOriginSource!.domainName,
|
571 | 571 | originPath: originConfig.originPath,
|
572 | 572 | originCustomHeaders: originHeaders.length > 0 ? originHeaders : undefined,
|
573 |
| - s3OriginConfig: originConfig.s3OriginSource && originConfig.s3OriginSource.originAccessIdentity |
574 |
| - ? { originAccessIdentity: `origin-access-identity/cloudfront/${originConfig.s3OriginSource.originAccessIdentity.ref}` } |
| 573 | + s3OriginConfig: originConfig.s3OriginSource && originConfig.s3OriginSource.originAccessIdentityId |
| 574 | + ? { originAccessIdentity: `origin-access-identity/cloudfront/${originConfig.s3OriginSource.originAccessIdentityId}` } |
575 | 575 | : originConfig.s3OriginSource
|
576 | 576 | ? { }
|
577 | 577 | : undefined,
|
|
0 commit comments