From 85143fb12149291a96d7d87815ec96b86e5e99a9 Mon Sep 17 00:00:00 2001
From: Daniel Nemergut <dnemergu@nrao.edu>
Date: Wed, 13 Sep 2023 15:48:47 -0400
Subject: [PATCH] Renamed cachePath to sourcePath to make it more clear what
this is
---
.../pexable/ingest_envoy/ingest_envoy/collectors.py | 6 +++---
.../executables/pexable/ingest_envoy/ingest_envoy/ingest.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/collectors.py b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/collectors.py
index 3a5927c46..a9545581c 100644
--- a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/collectors.py
+++ b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/collectors.py
@@ -144,7 +144,7 @@ class SECICollector(CollectorIF):
:return:
"""
self.logger.info("Collecting SECI products for staging...")
- cache_path = self.parameters["cachePath"]
+ cache_path = self.parameters["sourcePath"]
workflow_dir = self.parameters["workflowDir"]
staging_dir = self.parameters["staging_area"]
tar_name = self.create_artifacts_name()
@@ -174,13 +174,13 @@ class ObservationCollector(CollectorIF):
Run observation product collection script
"""
self.logger.info("Collecting observation products for staging...")
- cache_path = self.parameters["cachePath"]
+ source_path = self.parameters["sourcePath"]
workflow_dir = self.parameters["workflowDir"]
staging_dir = self.parameters["staging_area"]
# run script
collector = subprocess.run(
- ["./observation-product-collector.sh", cache_path, workflow_dir, staging_dir],
+ ["./observation-product-collector.sh", source_path, workflow_dir, staging_dir],
stdout=sys.stdout,
stderr=sys.stderr,
)
diff --git a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingest.py b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingest.py
index 79f942dd5..2eb12035e 100644
--- a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingest.py
+++ b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingest.py
@@ -65,7 +65,7 @@ def _get_settings(
parameters["calSpl"] = cal_spl
if source_dir is not None:
parameters["workflowDir"] = pathlib.Path(source_dir).name
- parameters["cachePath"] = pathlib.Path(source_dir).parent
+ parameters["sourcePath"] = pathlib.Path(source_dir).parent
parameters["staging_area"] = ingestion_settings.stagingDirectory
parameters["storage_area"] = ingestion_settings.storageDirectory
--
GitLab