From 61b880e5e21806e03f39e0826b7083acca6a89d0 Mon Sep 17 00:00:00 2001 From: Georgiana Dolocan Date: Tue, 17 Oct 2023 15:07:21 +0300 Subject: [PATCH] Move func into a utils file --- deployer/infra_components/cluster.py | 21 +-------------------- deployer/utils/env_vars_management.py | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 deployer/utils/env_vars_management.py diff --git a/deployer/infra_components/cluster.py b/deployer/infra_components/cluster.py index a17b9bd2a2..7321a11457 100644 --- a/deployer/infra_components/cluster.py +++ b/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 diff --git a/deployer/utils/env_vars_management.py b/deployer/utils/env_vars_management.py new file mode 100644 index 0000000000..68c208a9f3 --- /dev/null +++ b/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]