no need for s3 secrets

EBI-Metagenomics · Oct 19, 2023 · b2ffda3 · b2ffda3
1 parent 2d5d80f
commit b2ffda3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/control/deciphonctl/settings.py b/control/deciphonctl/settings.py
@@ -7,8 +7,6 @@ class Settings(BaseSettings):
 
     sched_url: HttpUrl = HttpUrl("http://localhost")
 
-    s3_key: str = "minioadmin"
-    s3_secret: str = "minioadmin"
     s3_url: HttpUrl = HttpUrl("http://localhost:9000")
     s3_bucket: str = "deciphon"
 

diff --git a/control/tests/conftest.py b/control/tests/conftest.py
@@ -59,15 +59,13 @@ def stop(self):
 def compose(mqtt, s3, settings: Settings):
     settings.mqtt_host = mqtt["host"]
     settings.mqtt_port = mqtt["port"]
-    settings.s3_key = s3["access_key"]
-    settings.s3_secret = s3["secret_key"]
     settings.s3_url = HttpUrl(s3["url"])
 
     sched_settings = SchedSettings(
         mqtt_host=settings.mqtt_host,
         mqtt_port=settings.mqtt_port,
-        s3_key=settings.s3_key,
-        s3_secret=settings.s3_secret,
+        s3_key=s3["access_key"],
+        s3_secret=s3["secret_key"],
         s3_url=settings.s3_url,
     )