rename OriginGroupSelectionCriteria to OriginSelectionCriteria to fit…

… better with existing interfaces
aws · Jan 5, 2025 · 6fb2474 · 6fb2474
1 parent e8f669a
commit 6fb2474
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/...framework-integ/test/aws-cloudfront-origins/test/integ.origin-group-selection-criteria.ts b/...framework-integ/test/aws-cloudfront-origins/test/integ.origin-group-selection-criteria.ts
@@ -18,7 +18,7 @@ const originGroup = new origins.OriginGroup({
   primaryOrigin: new origins.HttpOrigin(channelGroup.attrEgressDomain),
   fallbackOrigin: new origins.HttpOrigin(channelGroup2.attrEgressDomain),
   fallbackStatusCodes: [404],
-  selectionCriteria: cloudfront.OriginGroupSelectionCriteria.MEDIA_QUALITY_BASED,
+  selectionCriteria: cloudfront.OriginSelectionCriteria.MEDIA_QUALITY_BASED,
 });
 
 new cloudfront.Distribution(stack, 'Distribution', {

diff --git a/packages/aws-cdk-lib/aws-cloudfront-origins/README.md b/packages/aws-cdk-lib/aws-cloudfront-origins/README.md
@@ -610,7 +610,7 @@ new cloudfront.Distribution(this, 'myDist', {
       primaryOrigin: new origins.HttpOrigin("<AWS Elemental MediaPackageV2 origin 1>"),
       fallbackOrigin: new origins.HttpOrigin("<AWS Elemental MediaPackageV2 origin 2>"),
       fallbackStatusCodes: [404],
-      selectionCriteria: cloudfront.OriginGroupSelectionCriteria.MEDIA_QUALITY_BASED,
+      selectionCriteria: cloudfront.OriginSelectionCriteria.MEDIA_QUALITY_BASED,
     }),
   },
 });

diff --git a/packages/aws-cdk-lib/aws-cloudfront-origins/lib/origin-group.ts b/packages/aws-cdk-lib/aws-cloudfront-origins/lib/origin-group.ts
@@ -27,7 +27,7 @@ export interface OriginGroupProps {
    *
    * @default - nothing is returned
    */
-  readonly selectionCriteria?: cloudfront.OriginGroupSelectionCriteria;
+  readonly selectionCriteria?: cloudfront.OriginSelectionCriteria;
 }
 
 /**

diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/distribution.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/distribution.ts
@@ -4,7 +4,7 @@ import { CfnDistribution, CfnMonitoringSubscription } from './cloudfront.generat
 import { FunctionAssociation } from './function';
 import { GeoRestriction } from './geo-restriction';
 import { IKeyGroup } from './key-group';
-import { IOrigin, OriginBindConfig, OriginBindOptions, OriginGroupSelectionCriteria } from './origin';
+import { IOrigin, OriginBindConfig, OriginBindOptions, OriginSelectionCriteria } from './origin';
 import { IOriginRequestPolicy } from './origin-request-policy';
 import { CacheBehavior } from './private/cache-behavior';
 import { formatDistributionArn } from './private/utils';
@@ -686,7 +686,7 @@ export class Distribution extends Resource implements IDistribution {
   private addOriginGroup(originGroupId: string,
     statusCodes: number[] | undefined,
     originId: string, failoverOriginId: string,
-    selectionCriteria: OriginGroupSelectionCriteria | undefined): void {
+    selectionCriteria: OriginSelectionCriteria | undefined): void {
     statusCodes = statusCodes ?? [500, 502, 503, 504];
     if (statusCodes.length === 0) {
       throw new Error('fallbackStatusCodes cannot be empty');

diff --git a/packages/aws-cdk-lib/aws-cloudfront/lib/origin.ts b/packages/aws-cdk-lib/aws-cloudfront/lib/origin.ts
@@ -7,7 +7,7 @@ import { Duration, Token } from '../../core';
  *
  * @default - none
  */
-export enum OriginGroupSelectionCriteria {
+export enum OriginSelectionCriteria {
   /**
    * Default selection behavior.
    */
@@ -55,7 +55,7 @@ export interface OriginBindConfig {
    *
    * @default - nothing is returned
    */
-  readonly selectionCriteria?: OriginGroupSelectionCriteria;
+  readonly selectionCriteria?: OriginSelectionCriteria;
 }
 
 /**

diff --git a/packages/aws-cdk-lib/aws-cloudfront/test/selection-criteria-origin.test.ts b/packages/aws-cdk-lib/aws-cloudfront/test/selection-criteria-origin.test.ts
@@ -24,7 +24,7 @@ test('Selection criteria does set Media Quality Based failover', () => {
     primaryOrigin: new origins.HttpOrigin(channelGroup.attrEgressDomain),
     fallbackOrigin: new origins.HttpOrigin(channelGroup2.attrEgressDomain),
     fallbackStatusCodes: [404],
-    selectionCriteria: cloudfront.OriginGroupSelectionCriteria.MEDIA_QUALITY_BASED,
+    selectionCriteria: cloudfront.OriginSelectionCriteria.MEDIA_QUALITY_BASED,
   });
 
   new cloudfront.Distribution(stack, 'dist', {
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ export interface OriginGroupProps { @@
        *
        * @default - nothing is returned
        */
-      readonly selectionCriteria?: cloudfront.OriginGroupSelectionCriteria;
+      readonly selectionCriteria?: cloudfront.OriginSelectionCriteria;
     }
     /**
@@ Expand Down @@