From 9fb5af6b620154ff3b51ce7f66d890abd8155505 Mon Sep 17 00:00:00 2001 From: Victoria McDonald Date: Tue, 4 Jun 2024 16:00:04 -0700 Subject: [PATCH] add prefix to cnm path and fix gitc response --- bignbit/handle_gitc_response.py | 2 +- bignbit/save_cnm_message.py | 3 ++- terraform/state_machine_definition.tpl | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bignbit/handle_gitc_response.py b/bignbit/handle_gitc_response.py index 90dfcef..ce9a79c 100644 --- a/bignbit/handle_gitc_response.py +++ b/bignbit/handle_gitc_response.py @@ -40,7 +40,7 @@ def handler(event, _): umm_json = utils.get_umm_json(granule_concept_id, cmr_env) granule_ur = umm_json['GranuleUR'] - cnm_key_name = collection_name + "/" + granule_ur + "." + message_body['submission_time'] + "." + "cnm-r.json" + cnm_key_name = os.environ['POBIT_AUDIT_PATH_NAME'] + "/" + collection_name + "/" + granule_ur + "." + message_body['submissionTime'] + "." + "cnm-r.json" utils.upload_cnm(os.environ['POBIT_AUDIT_BUCKET_NAME'], cnm_key_name, json.dumps(message_body)) diff --git a/bignbit/save_cnm_message.py b/bignbit/save_cnm_message.py index b3d551c..9e4f8f4 100644 --- a/bignbit/save_cnm_message.py +++ b/bignbit/save_cnm_message.py @@ -30,13 +30,14 @@ def process(self): """ pobit_audit_bucket = self.config['pobit_audit_bucket'] + pobit_audit_path = self.config['pobit_audit_path'] collection_name = self.config['collection'] granule_ur = self.config['granule_ur'] cnm_content = self.config['cnm'] - cnm_key_name = collection_name + "/" + granule_ur + "." + cnm_content['submissionTime'] + "." + "cnm.json" + cnm_key_name = pobit_audit_path + "/" + collection_name + "/" + granule_ur + "." + cnm_content['submissionTime'] + "." + "cnm.json" upload_cnm(pobit_audit_bucket, cnm_key_name, cnm_content) diff --git a/terraform/state_machine_definition.tpl b/terraform/state_machine_definition.tpl index 98a86be..64510aa 100644 --- a/terraform/state_machine_definition.tpl +++ b/terraform/state_machine_definition.tpl @@ -462,6 +462,7 @@ "granule_ur": "{$.granule_ur}", "cnm": "{$.cnm.Payload.payload}", "pobit_audit_bucket": "${PobitAuditBucket}", + "pobit_audit_path": "${PobitAuditPath}", "cumulus_message": { "input": "{$}" }