chore: merge conflict cleanups

aws · Mar 22, 2021 · 381520f · 381520f
1 parent 1a082f4
commit 381520f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/packages/@aws-cdk/aws-apigatewayv2/lib/websocket/integration.ts b/packages/@aws-cdk/aws-apigatewayv2/lib/websocket/integration.ts
@@ -5,10 +5,6 @@ import { IIntegration } from '../common';
 import { IWebSocketApi } from './api';
 import { IWebSocketRoute } from './route';
 
-// v2 - keep this import as a separate section to reduce merge conflict when forward merging with the v2 branch.
-// eslint-disable-next-line
-import { Construct as CoreConstruct } from '@aws-cdk/core';
-
 /**
  * Represents an Integration for an WebSocket API.
  */
@@ -81,7 +77,7 @@ export interface WebSocketRouteIntegrationBindOptions {
    * If the `WebSocketRouteIntegration` being bound creates additional constructs,
    * this will be used as their parent scope.
    */
-  readonly scope: CoreConstruct;
+  readonly scope: Construct;
 }
 
 /**

diff --git a/packages/@aws-cdk/aws-dynamodb/lib/replica-provider.ts b/packages/@aws-cdk/aws-dynamodb/lib/replica-provider.ts
@@ -42,13 +42,8 @@ export class ReplicaProvider extends NestedStack {
    */
   public readonly isCompleteHandler: lambda.Function;
 
-<<<<<<< HEAD
   private constructor(scope: Construct, id: string, props: ReplicaProviderProps = {}) {
-    super(scope as CoreConstruct, id);
-=======
-  private constructor(scope: Construct, id: string) {
     super(scope, id);
->>>>>>> refs/rewritten/origin-v2-main-2
 
     const code = lambda.Code.fromAsset(path.join(__dirname, 'replica-handler'));
 

diff --git a/packages/@aws-cdk/aws-ecs/lib/ec2/ec2-service.ts b/packages/@aws-cdk/aws-ecs/lib/ec2/ec2-service.ts
@@ -233,7 +233,7 @@ export class Ec2Service extends BaseService implements IEc2Service {
       validate: () => !this.taskDefinition.defaultContainer ? ['A TaskDefinition must have at least one essential container'] : [],
     });
 
-    this.node.addValidation({ validate: () => this.validateEc2Service() });
+    this.node.addValidation({ validate: this.validateEc2Service.bind(this) });
   }
 
   /**