Move func into a utils file

deployer/infra_components/cluster.py

@@ -4,6 +4,7 @@
 import tempfile
 from contextlib import contextmanager
 
+from deployer.utils.env_vars_management import unset_env_vars
 from deployer.utils.file_acquisition import (
     HELM_CHARTS_DIR,
     get_decrypted_file,
@@ -14,26 +15,6 @@
 from .hub import Hub
 
 
-@contextmanager
-def unset_env_vars(vars):
-    """
-    Temporarily unset env vars in vars if they exist
-    """
-    orig_values = {}
-    for e in vars:
-        if e in os.environ:
-            orig_values[e] = os.environ[e]
-            # Clear values from os.environ if they are present!
-            del os.environ[e]
-
-    try:
-        yield
-    finally:
-        for e in orig_values:
-            # Put values back into os.environ when contextmanager returns
-            os.environ[e] = orig_values[e]
-
-
 class Cluster:
     """
     A single k8s cluster we can deploy to

deployer/utils/env_vars_management.py

@@ -0,0 +1,22 @@
+import os
+from contextlib import contextmanager
+
+
+@contextmanager
+def unset_env_vars(vars):
+    """
+    Temporarily unset env vars in vars if they exist
+    """
+    orig_values = {}
+    for e in vars:
+        if e in os.environ:
+            orig_values[e] = os.environ[e]
+            # Clear values from os.environ if they are present!
+            del os.environ[e]
+
+    try:
+        yield
+    finally:
+        for e in orig_values:
+            # Put values back into os.environ when contextmanager returns
+            os.environ[e] = orig_values[e]