Merge pull request #24114 from philip-stoev/platform-checks-fix-envir…

…onment-extra mzcompose,cloudtest: Make sure the same AWS-related env varibles are …
MaterializeInc · Dec 27, 2023 · 0d4e5db · 0d4e5db
2 parents 475b226 + 855cfeb
commit 0d4e5db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/misc/python/materialize/checks/mzcompose_actions.py b/misc/python/materialize/checks/mzcompose_actions.py
@@ -40,11 +40,7 @@ def __init__(
         mz_service: str | None = None,
     ) -> None:
         self.tag = tag
-        self.environment_extra = [
-            "MZ_AWS_CONNECTION_ROLE_ARN=arn:aws:iam::123456789000:role/MaterializeConnection",
-            "MZ_AWS_EXTERNAL_ID_PREFIX=eb5cb59b-e2fe-41f3-87ca-d2176a495345",
-            *environment_extra,
-        ]
+        self.environment_extra = environment_extra
         self.system_parameter_defaults = system_parameter_defaults
         self.additional_system_parameter_defaults = additional_system_parameter_defaults
         self.catalog_store = (

diff --git a/misc/python/materialize/cloudtest/k8s/environmentd.py b/misc/python/materialize/cloudtest/k8s/environmentd.py
@@ -271,6 +271,10 @@ def env_vars(self) -> list[V1EnvVar]:
             V1EnvVar(
                 name="MZ_AWS_PRIVATELINK_AVAILABILITY_ZONES", value="use1-az1,use1-az2"
             ),
+            V1EnvVar(
+                name="MZ_AWS_CONNECTION_ROLE_ARN",
+                value="arn:aws:iam::123456789000:role/MaterializeConnection",
+            ),
             V1EnvVar(
                 name="MZ_SYSTEM_PARAMETER_DEFAULT",
                 value=";".join(

diff --git a/misc/python/materialize/mzcompose/services/materialized.py b/misc/python/materialize/mzcompose/services/materialized.py
@@ -73,6 +73,8 @@ def __init__(
             "MZ_ORCHESTRATOR_PROCESS_PROMETHEUS_SERVICE_DISCOVERY_DIRECTORY=/mzdata/prometheus",
             "MZ_BOOTSTRAP_ROLE=materialize",
             "MZ_INTERNAL_PERSIST_PUBSUB_LISTEN_ADDR=0.0.0.0:6879",
+            "MZ_AWS_CONNECTION_ROLE_ARN=arn:aws:iam::123456789000:role/MaterializeConnection",
+            "MZ_AWS_EXTERNAL_ID_PREFIX=eb5cb59b-e2fe-41f3-87ca-d2176a495345",
             f"MZ_CATALOG_STORE={catalog_store}",
             # Please think twice before forwarding additional environment
             # variables from the host, as it's easy to write tests that are