diff --git a/bignbit/save_cnm_message.py b/bignbit/save_cnm_message.py index 9956d2b..5ce1c83 100644 --- a/bignbit/save_cnm_message.py +++ b/bignbit/save_cnm_message.py @@ -30,15 +30,18 @@ def process(self): """ pobit_audit_bucket = self.config['pobit_audit_bucket'] + print(pobit_audit_bucket) + print(self.input.get('cnm_sent')) collection_name = self.config['collection'] granule_ur = self.config['granule_ur'] print(collection_name) print(granule_ur) - print(self.input) + - cnm_content = self.input.get('cnm_sent') + cnm_content = self.input + print(cnm_content) print(cnm_content) print(cnm_content['submissionTime']) diff --git a/terraform/state_machine_definition.tpl b/terraform/state_machine_definition.tpl index a78c0be..91c697e 100644 --- a/terraform/state_machine_definition.tpl +++ b/terraform/state_machine_definition.tpl @@ -448,9 +448,40 @@ "Type": "Task", "Resource": "arn:aws:states:::lambda:invoke", "TimeoutSeconds": 86400, - "End": true, + "Next": "SaveCNMMessage", "ResultPath": "$.gitc_response" - } + }, + "SaveCNMMessage": { + "Type": "Task", + "Resource": "${SaveCNMMessageLambda}", + "Parameters": { + "cma": { + "event.$": "$", + "task_config": { + "collection": "{$.collection_name}", + "granule_ur": "{$.granule_ur}", + "pobit_audit_bucket": "${PobitAuditBucket}", + "cumulus_message": { + "input": "{$.gitc_response}" + } + } + } + }, + "Retry": [ + { + "ErrorEquals": [ + "Lambda.ServiceException", + "Lambda.AWSLambdaException", + "Lambda.SdkClientException", + "Lambda.TooManyRequestsException" + ], + "IntervalSeconds": 2, + "MaxAttempts": 6, + "BackoffRate": 2 + } + ], + "Next": "WorkflowSucceeded" + }, } }, "ResultPath": "$.payload.pobit", @@ -472,39 +503,9 @@ "MaxAttempts": 1 } ], - "Next": "SaveCNMMessage" - }, - "SaveCNMMessage": { - "Type": "Task", - "Resource": "${SaveCNMMessageLambda}", - "Parameters": { - "cma": { - "event.$": "$", - "task_config": { - "collection": "{$.collection_name}", - "granule_ur": "{$.granule_ur}", - "pobit_audit_bucket": "${PobitAuditBucket}", - "cumulus_message": { - "input": "{$.payload.pobit}" - } - } - } - }, - "Retry": [ - { - "ErrorEquals": [ - "Lambda.ServiceException", - "Lambda.AWSLambdaException", - "Lambda.SdkClientException", - "Lambda.TooManyRequestsException" - ], - "IntervalSeconds": 2, - "MaxAttempts": 6, - "BackoffRate": 2 - } - ], - "Next": "WorkflowSucceeded" + "End": "True" }, + "WorkflowSucceeded": { "Type": "Succeed" },