From fead4e47c42062f809866a92923c562ba84447bf Mon Sep 17 00:00:00 2001 From: quinntaylormitchell Date: Wed, 30 Jul 2025 17:24:04 +0000 Subject: [PATCH 1/3] Ensure environment variable always contains an absolute path --- .../presto-clp/scripts/generate-user-env-vars-file.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py b/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py index 4e4a8ac046..1871038253 100644 --- a/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py +++ b/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py @@ -111,7 +111,11 @@ def _add_clp_env_vars(clp_package_dir: Path, env_vars: Dict[str, str]) -> bool: "archive_output.storage.directory", str(clp_package_dir / "var" / "data" / "archives"), ) - env_vars["CLP_ARCHIVES_DIR"] = clp_archives_dir + + if Path(clp_archives_dir).is_absolute(): + env_vars["CLP_ARCHIVES_DIR"] = clp_archives_dir + else: + env_vars["CLP_ARCHIVES_DIR"] = str(clp_package_dir / clp_archives_dir) credentials_file_path = clp_package_dir / "etc" / "credentials.yml" if not credentials_file_path.exists(): From e709bead02f84681d1bdc6383381979da7b7c712 Mon Sep 17 00:00:00 2001 From: quinntaylormitchell Date: Wed, 30 Jul 2025 17:33:37 +0000 Subject: [PATCH 2/3] Lint --- .../presto-clp/scripts/generate-user-env-vars-file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py b/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py index 1871038253..3ab2ba68e6 100644 --- a/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py +++ b/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py @@ -111,7 +111,7 @@ def _add_clp_env_vars(clp_package_dir: Path, env_vars: Dict[str, str]) -> bool: "archive_output.storage.directory", str(clp_package_dir / "var" / "data" / "archives"), ) - + if Path(clp_archives_dir).is_absolute(): env_vars["CLP_ARCHIVES_DIR"] = clp_archives_dir else: From b068e48ed19430e345d147ffaa428aa3b0777d9a Mon Sep 17 00:00:00 2001 From: Quinn Taylor Mitchell Date: Wed, 30 Jul 2025 15:01:40 -0400 Subject: [PATCH 3/3] Update tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py Co-authored-by: kirkrodrigues <2454684+kirkrodrigues@users.noreply.github.com> --- .../deployment/presto-clp/scripts/generate-user-env-vars-file.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py b/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py index 3ab2ba68e6..470b09c048 100644 --- a/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py +++ b/tools/deployment/presto-clp/scripts/generate-user-env-vars-file.py @@ -111,7 +111,6 @@ def _add_clp_env_vars(clp_package_dir: Path, env_vars: Dict[str, str]) -> bool: "archive_output.storage.directory", str(clp_package_dir / "var" / "data" / "archives"), ) - if Path(clp_archives_dir).is_absolute(): env_vars["CLP_ARCHIVES_DIR"] = clp_archives_dir else: