Address review comments & flake8

Signed-off-by: Mikayla Thompson <thomika@amazon.com>

TrafficCapture/dockerSolution/src/main/docker/docker-compose.yml

@@ -95,8 +95,9 @@ services:
       - migrations
     volumes:
       - sharedReplayerOutput:/shared-replayer-output
-      - ./migrationConsole/console_link/services.yaml:/etc/migration_services.yaml
-      - ./migrationConsole/console_link:/root/console_link
+      - ./migrationConsole/lib/console_link/services.yaml:/etc/migration_services.yaml
+      # this is a convenience thing for testing -- it should be removed before this makes it to prod.
+      - ./migrationConsole/lib/console_link:/root/lib/console_link
     environment:
       - MIGRATION_KAFKA_BROKER_ENDPOINTS=kafka:9092
 #    command: ./runTestBenchmarks.sh

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/Dockerfile

@@ -41,7 +41,6 @@ RUN chmod ug+x /root/showFetchMigrationCommand.sh
 RUN chmod ug+x /root/osiMigration.py
 RUN chmod ug+x /root/kafka-tools/kafkaExport.sh
 
-COPY console_link /root/console_link
-RUN pip install -e /root/console_link/
+RUN pip install -e /root/lib/console_link/
 
 CMD tail -f /dev/null

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/console_link/console_link/logic/__init__.py

@@ -0,0 +1,2 @@
+import console_link.logic.clusters
+import console_link.logic.instantiation  # noqa: F401

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/console_link/console_link/logic/instantiation.py → TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/console_link/console_link/logic/instantiation.py

@@ -31,7 +31,7 @@ def __init__(self, config_file: str):
             self.config = yaml.safe_load(f)
         v = Validator(SCHEMA)
         if not v.validate(self.config):
-            raise ValueError(f"Invalid config file: {v.errors}")
+            raise ValueError("Invalid config file", v.errors)
 
         self.source_cluster = Cluster(self.config['source_cluster'])
 

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/console_link/console_link/models/cluster.py → TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/console_link/console_link/models/cluster.py

@@ -55,7 +55,7 @@ def __init__(self, config: Dict) -> None:
         self.auth_details = config["authorization"]["details"]
         pass
 
-    def call_api(self, path, method: HttpMethod = HttpMethod.GET) -> Dict:
+    def call_api(self, path, method: HttpMethod = HttpMethod.GET) -> requests.Response:
         """
         Calls an API on the cluster.
         """

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/console_link/console_link/models/replayer.py → TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/console_link/console_link/models/replayer.py

@@ -1,6 +1,7 @@
 from enum import Enum
 from typing import Dict
 import boto3
+from cerberus import Validator
 
 DeploymentType = Enum('DeploymentType', ['DOCKER', 'ECS'])
 
@@ -20,7 +21,7 @@ def __init__(self, config: Dict) -> None:
         self.config = config
         v = Validator(SCHEMA)
         if not v.validate(config):
-            raise ValueError(f"Invalid config file for cluster: {v.errors}")
+            raise ValueError("Invalid config file for replayer", v.errors)
 
     def start_replayer(self):
         """
@@ -43,11 +44,26 @@ def stop_replayer(self):
         pass
 
 
+ECS_SCHEMA = {
+    'cluster_name': {
+        'type': 'string',
+        'required': True
+    },
+    'service_name': {
+        'type': 'string',
+        'required': True
+    }
+}
+
+
 class ECSReplayer(BaseReplayer):
     client = boto3.client('ecs')
 
     def __init__(self, config: Dict) -> None:
         super().__init__(config)
+        v = Validator(ECS_SCHEMA)
+        if not v.validate(config):
+            raise ValueError("Invalid config file for replayer", v.errors)
         self.cluster_name = config['cluster_name']
         self.service_name = config['service_name']