CDK Extensibility Improvments

deployment/cdk/opensearch-service-migration/.gitignore

@@ -4,7 +4,7 @@
 node_modules
 cdk.context.json
 coverage
-
+dist
 # CDK asset staging directory
 .cdk.staging
 cdk.out

deployment/cdk/opensearch-service-migration/index.ts

@@ -0,0 +1 @@
+export * from './lib'

deployment/cdk/opensearch-service-migration/lib/index.ts

@@ -0,0 +1,10 @@
+export * from './common-utilities';
+export * from './fetch-migration-stack';
+export * from './lambda'
+export * from './migration-assistance-stack';
+export * from './msk-utility-stack';
+export * from './network-stack';
+export * from './opensearch-domain-stack';
+export * from './service-stacks';
+export * from './stack-composer';
+export * from './streaming-source-type';

deployment/cdk/opensearch-service-migration/lib/lambda/index.ts

@@ -0,0 +1,2 @@
+export * as msk_ordered_endpoints_handler from './msk-ordered-endpoints-handler'
+export * as msk_public_endpoint_handler from './msk-public-endpoint-handler'

deployment/cdk/opensearch-service-migration/lib/service-stacks/capture-proxy-es-stack.ts

@@ -1,10 +1,9 @@
 import {StackPropsExt} from "../stack-composer";
 import {IVpc, SecurityGroup} from "aws-cdk-lib/aws-ec2";
-import {PortMapping, Protocol} from "aws-cdk-lib/aws-ecs";
+import {PortMapping, Protocol, ServiceConnectService} from "aws-cdk-lib/aws-ecs";
 import {Construct} from "constructs";
 import {join} from "path";
 import {MigrationServiceCore} from "./migration-service-core";
-import {ServiceConnectService} from "aws-cdk-lib/aws-ecs/lib/base/base-service";
 import {StringParameter} from "aws-cdk-lib/aws-ssm";
 import {StreamingSourceType} from "../streaming-source-type";
 import {createMSKProducerIAMPolicies} from "../common-utilities";

deployment/cdk/opensearch-service-migration/lib/service-stacks/capture-proxy-stack.ts

@@ -1,10 +1,9 @@
 import {StackPropsExt} from "../stack-composer";
 import {IVpc, SecurityGroup} from "aws-cdk-lib/aws-ec2";
-import {PortMapping, Protocol} from "aws-cdk-lib/aws-ecs";
+import {PortMapping, Protocol, ServiceConnectService} from "aws-cdk-lib/aws-ecs";
 import {Construct} from "constructs";
 import {join} from "path";
 import {MigrationServiceCore} from "./migration-service-core";
-import {ServiceConnectService} from "aws-cdk-lib/aws-ecs/lib/base/base-service";
 import {StringParameter} from "aws-cdk-lib/aws-ssm";
 import {StreamingSourceType} from "../streaming-source-type";
 import {createMSKProducerIAMPolicies} from "../common-utilities";

deployment/cdk/opensearch-service-migration/lib/service-stacks/elasticsearch-stack.ts

@@ -1,10 +1,9 @@
 import {StackPropsExt} from "../stack-composer";
 import {IVpc, SecurityGroup} from "aws-cdk-lib/aws-ec2";
-import {PortMapping, Protocol} from "aws-cdk-lib/aws-ecs";
+import {PortMapping, Protocol, ServiceConnectService} from "aws-cdk-lib/aws-ecs";
 import {Construct} from "constructs";
 import {join} from "path";
 import {MigrationServiceCore} from "./migration-service-core";
-import {ServiceConnectService} from "aws-cdk-lib/aws-ecs/lib/base/base-service";
 import {StringParameter} from "aws-cdk-lib/aws-ssm";
 
 

deployment/cdk/opensearch-service-migration/lib/service-stacks/index.ts

@@ -0,0 +1,10 @@
+export * from './capture-proxy-es-stack'
+export * from './capture-proxy-stack'
+export * from './elasticsearch-stack'
+export * from './kafka-broker-stack'
+export * from './kafka-zookeeper-stack'
+export * from './migration-analytics-stack'
+export * from './migration-console-stack'
+export * from './migration-service-core'
+export * from './opensearch-container-stack'
+export * from './traffic-replayer-stack'

deployment/cdk/opensearch-service-migration/lib/service-stacks/kafka-broker-stack.ts

@@ -1,12 +1,11 @@
 import {StackPropsExt} from "../stack-composer";
 import {IVpc, SecurityGroup} from "aws-cdk-lib/aws-ec2";
 import {
-    PortMapping, Protocol
+    PortMapping, Protocol, ServiceConnectService
 } from "aws-cdk-lib/aws-ecs";
 import {Construct} from "constructs";
 import {MigrationServiceCore} from "./migration-service-core";
 import {StringParameter} from "aws-cdk-lib/aws-ssm";
-import {ServiceConnectService} from "aws-cdk-lib/aws-ecs/lib/base/base-service";
 
 export interface KafkaBrokerProps extends StackPropsExt {
     readonly vpc: IVpc

deployment/cdk/opensearch-service-migration/lib/service-stacks/kafka-zookeeper-stack.ts

@@ -1,12 +1,11 @@
 import {StackPropsExt} from "../stack-composer";
 import {IVpc, SecurityGroup} from "aws-cdk-lib/aws-ec2";
 import {
-    PortMapping, Protocol,
+    PortMapping, Protocol, ServiceConnectService,
 } from "aws-cdk-lib/aws-ecs";
 import {Construct} from "constructs";
 import {MigrationServiceCore} from "./migration-service-core";
 import {StringParameter} from "aws-cdk-lib/aws-ssm";
-import {ServiceConnectService} from "aws-cdk-lib/aws-ecs/lib/base/base-service";
 
 export interface KafkaZookeeperProps extends StackPropsExt {
     readonly vpc: IVpc

deployment/cdk/opensearch-service-migration/lib/service-stacks/migration-service-core.ts

@@ -1,21 +1,20 @@
 import {StackPropsExt} from "../stack-composer";
 import {ISecurityGroup, IVpc, SubnetType} from "aws-cdk-lib/aws-ec2";
 import {
-    CfnService as FargateCfnService,
+    CfnService as FargateCfnService, CloudMapOptions,
     Cluster,
     ContainerImage,
     FargateService,
     FargateTaskDefinition,
     LogDrivers,
     MountPoint,
-    PortMapping, Ulimit,
+    PortMapping, ServiceConnectService, Ulimit,
     Volume
 } from "aws-cdk-lib/aws-ecs";
 import {DockerImageAsset} from "aws-cdk-lib/aws-ecr-assets";
 import {RemovalPolicy, Stack} from "aws-cdk-lib";
 import {LogGroup, RetentionDays} from "aws-cdk-lib/aws-logs";
 import {PolicyStatement} from "aws-cdk-lib/aws-iam";
-import {CloudMapOptions, ServiceConnectService} from "aws-cdk-lib/aws-ecs/lib/base/base-service";
 import {CfnService as DiscoveryCfnService, PrivateDnsNamespace} from "aws-cdk-lib/aws-servicediscovery";
 import {StringParameter} from "aws-cdk-lib/aws-ssm";
 import {createDefaultECSTaskRole} from "../common-utilities";

deployment/cdk/opensearch-service-migration/lib/service-stacks/opensearch-container-stack.ts

@@ -1,10 +1,9 @@
 import {StackPropsExt} from "../stack-composer";
 import {IVpc, SecurityGroup} from "aws-cdk-lib/aws-ec2";
-import {PortMapping, Protocol, Ulimit, UlimitName} from "aws-cdk-lib/aws-ecs";
+import {PortMapping, Protocol, ServiceConnectService, Ulimit, UlimitName} from "aws-cdk-lib/aws-ecs";
 import {Construct} from "constructs";
 import {MigrationServiceCore} from "./migration-service-core";
 import {StringParameter} from "aws-cdk-lib/aws-ssm";
-import {ServiceConnectService} from "aws-cdk-lib/aws-ecs/lib/base/base-service";
 
 export interface OpenSearchContainerProps extends StackPropsExt {
     readonly vpc: IVpc