condense to just __main__.py

WIPACrepo · Dec 19, 2023 · cf9b43e · cf9b43e
1 parent 6bc0952
commit cf9b43e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/ewms_sidecar/entrypoint.py → ewms_sidecar/__main__.py b/ewms_sidecar/entrypoint.py → ewms_sidecar/__main__.py
@@ -149,3 +149,8 @@ def wait_for_file(waitee: Path, wait_time: int) -> Path:
         required=True,
         help="a path or url to the workers' image",
     )
+
+
+if __name__ == "__main__":
+    main()
+    LOGGER.info("Done.")
diff --git a/ewms_sidecar/config.py b/ewms_sidecar/config.py
@@ -7,7 +7,7 @@
 
 from wipac_dev_tools import from_environment_as_dataclass
 
-LOGGER = logging.getLogger("clientmanager")
+LOGGER = logging.getLogger("ewms-sidecar")
 
 LOCAL_K8S_HOST = "local"
 
@@ -34,13 +34,6 @@ class EnvConfig:
     CLIENT_STARTER_WAIT_FOR_STARTUP_JSON: int = 60
     CONDOR_TOKEN: str = ""
     #
-    WORKER_K8S_TOKEN: str = ""
-    WORKER_K8S_CACERT: str = ""
-    WORKER_K8S_CONFIG_FILE_BASE64: str = ""
-    # local k8s
-    WORKER_K8S_LOCAL_APPLICATION_NAME: str = ""
-    WORKER_K8S_LOCAL_WORKERS_MAX: int = 3  # don't want too many *local* workers
-    #
     EWMS_PILOT_QUARANTINE_TIME: int = 0
     #
     EWMS_TMS_S3_ACCESS_KEY_ID: str = ""

diff --git a/ewms_sidecar/utils.py b/ewms_sidecar/utils.py
@@ -5,7 +5,7 @@
 from pathlib import Path
 from typing import Any
 
-import boto3  # type: ignore[import]
+import boto3  # type: ignore[import-untyped]
 import requests
 from rest_tools.client import RestClient