Skip to content

Commit

Permalink
BaseOrigin -> OriginBase
Browse files Browse the repository at this point in the history
  • Loading branch information
njlynch committed Jul 29, 2020
1 parent 0be2dad commit 6d873e1
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export interface HttpOriginProps extends cloudfront.OriginProps {
*
* @experimental
*/
export class HttpOrigin extends cloudfront.BaseOrigin {
export class HttpOrigin extends cloudfront.OriginBase {

constructor(domainName: string, private readonly props: HttpOriginProps = {}) {
super(domainName, props);
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-cloudfront-origins/lib/s3-origin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export class S3Origin implements cloudfront.IOrigin {
*
* Contains additional logic around bucket permissions and origin access identities.
*/
class S3BucketOrigin extends cloudfront.BaseOrigin {
class S3BucketOrigin extends cloudfront.OriginBase {
private originAccessIdentity!: cloudfront.OriginAccessIdentity;

constructor(private readonly bucket: s3.IBucket, props: S3OriginProps) {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-cloudfront/lib/origin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export interface OriginBindOptions {
*
* @experimental
*/
export abstract class BaseOrigin implements IOrigin {
export abstract class OriginBase implements IOrigin {
private readonly domainName: string;
private readonly originPath?: string;
private readonly connectionTimeout?: Duration;
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-cloudfront/test/distribution.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import '@aws-cdk/assert/jest';
import * as acm from '@aws-cdk/aws-certificatemanager';
import * as lambda from '@aws-cdk/aws-lambda';
import { App, Duration, Stack } from '@aws-cdk/core';
import { BaseOrigin, CfnDistribution, Distribution, IOrigin, LambdaEdgeEventType, OriginProps, OriginProtocolPolicy, PriceClass } from '../lib';
import { CfnDistribution, Distribution, IOrigin, LambdaEdgeEventType, OriginBase, OriginProps, OriginProtocolPolicy, PriceClass } from '../lib';

let app: App;
let stack: Stack;
Expand Down Expand Up @@ -386,7 +386,7 @@ function defaultOrigin(domainName?: string): IOrigin {
return new TestOrigin(domainName ?? 'www.example.com');
}

class TestOrigin extends BaseOrigin {
class TestOrigin extends OriginBase {
constructor(domainName: string, props: OriginProps = {}) { super(domainName, props); }
protected renderCustomOriginConfig(): CfnDistribution.CustomOriginConfigProperty | undefined {
return { originProtocolPolicy: OriginProtocolPolicy.HTTPS_ONLY };
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk/aws-cloudfront/test/origin.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '@aws-cdk/assert/jest';
import { App, Stack, Duration } from '@aws-cdk/core';
import { CfnDistribution, OriginProtocolPolicy, BaseOrigin, OriginProps } from '../lib';
import { CfnDistribution, OriginProtocolPolicy, OriginBase, OriginProps } from '../lib';

let app: App;
let stack: Stack;
Expand Down Expand Up @@ -46,7 +46,7 @@ test.each(['api', '/api', '/api/', 'api/'])
});

/** Used for testing common Origin functionality */
class TestOrigin extends BaseOrigin {
class TestOrigin extends OriginBase {
constructor(domainName: string, props: OriginProps = {}) { super(domainName, props); }
protected renderCustomOriginConfig(): CfnDistribution.CustomOriginConfigProperty | undefined {
return { originProtocolPolicy: OriginProtocolPolicy.HTTPS_ONLY };
Expand Down

0 comments on commit 6d873e1

Please sign in to comment.