Clarify Docker Compose and E2E test context

anthony-chaudhary · anthony-chaudhary · commit 3b7248f47233 · 2023-08-01T18:22:53.000-07:00
-&gt; Before the assumption around E2E tests using SAME_HOST was sort of hidden.  (It was declared in E2E file, but the meaning of that depended on the prior version of dispatcher)
-&gt; Clarify the assumption that `testing_e2e` will use baremetal ingress
-&gt; Clarify the "Docker" one is ACTUALLY "Docker Compose" which is a specific implementation/usage of Docker
-&gt; Another option could be to specify which ingress is used in the env file directly. Although in this case the confusion was more the lack of any definition around E2E in this context.
diff --git a/.github/workflows/e2e_tests.yaml b/.github/workflows/e2e_tests.yaml
@@ -24,7 +24,6 @@ jobs:
         DIFFGRAM_SYSTEM_MODE: testing_e2e
         GOOGLE_APPLICATION_CREDENTIALS: /gcp/gcloud-service-key.json
         DIFFGRAM_STATIC_STORAGE_PROVIDER: minio
-        SAME_HOST: True
         IS_DIFFGRAM_S3_V4_SIGNATURE: True
         DIFFGRAM_S3_BUCKET_NAME: foo
         DIFFGRAM_MINIO_ACCESS_KEY_ID: root
@@ -36,7 +35,7 @@ jobs:
         CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
         SERVICE_ACCOUNT_FULL_PATH: /gcp/gcloud-service-key.json
         DIFFGRAM_HOST_OS: ${{ secrets.DIFFGRAM_HOST_OS }}
-        DIFFGRAM_VERSION_TAG: 0.0.1
+        DIFFGRAM_VERSION_TAG: Testing
         DIFFGRAM_INSTALL_FINGERPRINT: ${{ secrets.DIFFGRAM_INSTALL_FINGERPRINT }}
         USER: root
         RUNNER_ALLOW_RUNASROOT: true
@@ -144,7 +143,6 @@ jobs:
         DIFFGRAM_STATIC_STORAGE_PROVIDER: minio
         DIFFGRAM_S3_BUCKET_NAME: testbucket
         ML__DIFFGRAM_S3_BUCKET_NAME: testbucket
-        SAME_HOST: True
         IS_DIFFGRAM_S3_V4_SIGNATURE: True
         DIFFGRAM_MINIO_ACCESS_KEY_ID: minioadmin
         DIFFGRAM_MINIO_ACCESS_KEY_SECRET: minioadmin
diff --git a/local_dispatcher/local_dispatch.py b/local_dispatcher/local_dispatch.py
@@ -151,11 +151,11 @@ def __init__(self, host='http://127.0.0.1'):
                                static_folder = "../frontend/dist/static")
 
 
-class DockerIngress(Ingress):
+class DockerComposeIngress(Ingress):
     def __init__(self, host=None):
         super().__init__(host)
 
-        self.name = "docker"
+        self.name = "Docker Compose"
 
         self.default.host = 'http://default'
         self.walrus.host = 'http://walrus'     
@@ -196,12 +196,18 @@ def start(self):
 
     
 
-DOCKER_CONTEXT = env_adapter.bool(os.getenv('DOCKER_CONTEXT', False))
+def determine_ingress_from_env():
+    DOCKER_CONTEXT = env_adapter.bool(os.getenv('DOCKER_CONTEXT', False))
+    DIFFGRAM_SYSTEM_MODE = os.getenv('DIFFGRAM_SYSTEM_MODE', None)
 
-if DOCKER_CONTEXT is True:
-    ingress = DockerIngress()
-else:
-    ingress = BaremetalIngress()
+    ingress = BaremetalIngress()   # Default
+  
+    if DIFFGRAM_SYSTEM_MODE != 'testing_e2e':
+        if DOCKER_CONTEXT is True:
+            ingress = DockerComposeIngress() 
+            
+    return ingress
 
+ingress = determine_ingress_from_env()
 router = Router(ingress)
 router.start()
