make s3 credentials optional

neuro-inc · Sep 18, 2024 · b2eea99 · b2eea99
1 parent fd1b1a3
commit b2eea99
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/platform_monitoring/config.py b/platform_monitoring/config.py
@@ -37,9 +37,9 @@ class ElasticsearchConfig:
 @dataclass(frozen=True)
 class S3Config:
     region: str
-    access_key_id: str = field(repr=False)
-    secret_access_key: str = field(repr=False)
     job_logs_bucket_name: str
+    access_key_id: str | None = field(default=None, repr=False)
+    secret_access_key: str | None = field(default=None, repr=False)
     endpoint_url: URL | None = None
 
 

diff --git a/platform_monitoring/config_factory.py b/platform_monitoring/config_factory.py
@@ -82,8 +82,8 @@ def _create_s3(self) -> S3Config | None:
         endpoint_url = self._environ.get("NP_MONITORING_S3_ENDPOINT_URL", "")
         return S3Config(
             region=self._environ.get("NP_MONITORING_S3_REGION", ""),
-            access_key_id=self._environ["NP_MONITORING_S3_ACCESS_KEY_ID"],
-            secret_access_key=self._environ["NP_MONITORING_S3_SECRET_ACCESS_KEY"],
+            access_key_id=self._environ.get("NP_MONITORING_S3_ACCESS_KEY_ID"),
+            secret_access_key=self._environ.get("NP_MONITORING_S3_SECRET_ACCESS_KEY"),
             endpoint_url=URL(endpoint_url) if endpoint_url else None,
             job_logs_bucket_name=self._environ["NP_MONITORING_S3_JOB_LOGS_BUCKET_NAME"],
         )

diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py
@@ -123,6 +123,25 @@ def test_create_with_kubernetes_labels(environ: dict[str, Any]) -> None:
     assert config.kube.node_pool_label == "node-pool"
 
 
+def test_create_with_s3__default(environ: dict[str, Any]) -> None:
+    environ["NP_MONITORING_S3_REGION"] = "us-east-1"
+    environ["NP_MONITORING_S3_JOB_LOGS_BUCKET_NAME"] = "logs"
+
+    config = EnvironConfigFactory(environ).create()
+
+    assert config.s3 == S3Config(
+        region="us-east-1",
+        job_logs_bucket_name="logs",
+    )
+
+    environ["NP_MONITORING_S3_ENDPOINT_URL"] = "http://minio:9000"
+
+    config = EnvironConfigFactory(environ).create()
+
+    assert config.s3
+    assert config.s3.endpoint_url == URL("http://minio:9000")
+
+
 def test_create_with_s3(environ: dict[str, Any]) -> None:
     environ["NP_MONITORING_S3_REGION"] = "us-east-1"
     environ["NP_MONITORING_S3_ACCESS_KEY_ID"] = "access_key"