add unit tests

packages/aws-cdk-lib/aws-cloudfront/test/distribution.test.ts

@@ -1,4 +1,4 @@
-import { defaultOrigin, defaultOriginGroup } from './test-origin';
+import { defaultOrigin, defaultOriginGroup, defaultOriginWithOriginAccessControl } from './test-origin';
 import { Annotations, Match, Template } from '../../assertions';
 import * as acm from '../../aws-certificatemanager';
 import * as cloudwatch from '../../aws-cloudwatch';
@@ -1282,6 +1282,36 @@ test('with publish additional metrics', () => {
   });
 });
 
+test('with origin access control id', () => {
+  const origin = defaultOriginWithOriginAccessControl();
+  new Distribution(stack, 'MyDist', {
+    defaultBehavior: { origin },
+    publishAdditionalMetrics: true,
+  });
+
+  Template.fromStack(stack).hasResourceProperties('AWS::CloudFront::Distribution', {
+    DistributionConfig: {
+      DefaultCacheBehavior: {
+        CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6',
+        Compress: true,
+        TargetOriginId: 'StackMyDistOrigin1D6D5E535',
+        ViewerProtocolPolicy: 'allow-all',
+      },
+      Enabled: true,
+      HttpVersion: 'http2',
+      IPV6Enabled: true,
+      Origins: [{
+        DomainName: 'www.example.com',
+        Id: 'StackMyDistOrigin1D6D5E535',
+        CustomOriginConfig: {
+          OriginProtocolPolicy: 'https-only',
+        },
+        OriginAccessControlId: "test-origin-access-control-id"
+      }],
+    },
+  });
+});
+
 describe('Distribution metrics tests', () => {
   const additionalMetrics = [
     { name: 'OriginLatency', method: 'metricOriginLatency', statistic: 'Average', additionalMetricsRequired: true, errorMetricName: 'Origin latency' },

packages/aws-cdk-lib/aws-cloudfront/test/test-origin.ts

@@ -1,16 +1,31 @@
-import { Construct } from 'constructs';
-import { CfnDistribution, IOrigin, OriginBase, OriginBindConfig, OriginBindOptions, OriginProps, OriginProtocolPolicy } from '../lib';
+import { Construct } from "constructs";
+import {
+  CfnDistribution,
+  IOrigin,
+  OriginBase,
+  OriginBindConfig,
+  OriginBindOptions,
+  OriginProps,
+  OriginProtocolPolicy,
+} from "../lib";
 
 /** Used for testing common Origin functionality */
 export class TestOrigin extends OriginBase {
-  constructor(domainName: string, props: OriginProps = {}) { super(domainName, props); }
-  protected renderCustomOriginConfig(): CfnDistribution.CustomOriginConfigProperty | undefined {
+  constructor(domainName: string, props: OriginProps = {}) {
+    super(domainName, props);
+  }
+  protected renderCustomOriginConfig():
+    | CfnDistribution.CustomOriginConfigProperty
+    | undefined {
     return { originProtocolPolicy: OriginProtocolPolicy.HTTPS_ONLY };
   }
 }
 
 export class TestOriginGroup implements IOrigin {
-  constructor(private readonly primaryDomainName: string, private readonly secondaryDomainName: string) { }
+  constructor(
+    private readonly primaryDomainName: string,
+    private readonly secondaryDomainName: string
+  ) {}
   /* eslint-disable @cdklabs/no-core-construct */
   public bind(scope: Construct, options: OriginBindOptions): OriginBindConfig {
     const primaryOrigin = new TestOrigin(this.primaryDomainName);
@@ -27,11 +42,23 @@ export class TestOriginGroup implements IOrigin {
 }
 
 export function defaultOrigin(domainName?: string, originId?: string): IOrigin {
-  return new TestOrigin(domainName ?? 'www.example.com', {
+  return new TestOrigin(domainName ?? "www.example.com", {
     originId,
   });
 }
 
 export function defaultOriginGroup(): IOrigin {
-  return new TestOriginGroup('www.example.com', 'foo.example.com');
+  return new TestOriginGroup("www.example.com", "foo.example.com");
+}
+
+export function defaultOriginWithOriginAccessControl(
+  domainName?: string,
+  originId?: string,
+  originAccessControlId?: string
+): IOrigin {
+  return new TestOrigin(domainName ?? "www.example.com", {
+    originId,
+    originAccessControlId:
+      originAccessControlId ?? "test-origin-access-control-id",
+  });
 }