Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/issue 7 - Remove wait for GITC response #30

Merged
merged 67 commits into from
Jun 17, 2024
Merged

Feature/issue 7 - Remove wait for GITC response #30

Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift click to select a range
28d710c
fix type in readme
torimcd May 1, 2024
f398c3a
change task token to uuid in send to gitc
torimcd May 1, 2024
1f9cf71
remove wait for task token & gitc response handler from state machine
torimcd May 1, 2024
c587bb0
change gitc response handler to invoke save cma message
torimcd May 2, 2024
42a8706
fix typo
torimcd May 2, 2024
53c6d1e
fix context parameter
torimcd May 2, 2024
168013e
convert uuid to string
torimcd May 2, 2024
d264ee3
fix json typo
torimcd May 2, 2024
fc48c27
remove uuid lib to use stdlib uuid
torimcd May 2, 2024
f3ddcae
change identifier to image set name instead of uuid
torimcd May 2, 2024
49f0af2
remove uuid import
torimcd May 2, 2024
191f76d
fix json formatting of cma invoke
torimcd May 2, 2024
86492da
add granule concept ID to identifier
torimcd May 2, 2024
ca46a16
update image set name with granule conceptid
torimcd May 13, 2024
5953f73
remove whitespace
torimcd May 14, 2024
2969c68
move get umm json to utils and save gitc outgoing cnm
torimcd May 15, 2024
e84af9f
remove unused import
torimcd May 15, 2024
da12a51
try setting cmr query env based on stage
torimcd May 15, 2024
e4fb9d7
remove task token from tests
torimcd May 15, 2024
921e057
fix granule index
torimcd May 15, 2024
5f62390
change how image set name defined
torimcd May 15, 2024
3865176
add region to ssm client in utils
torimcd May 15, 2024
7f28ba9
add ssm parameters to gitc lambdas
torimcd May 15, 2024
cf90d3d
change region reference
torimcd May 15, 2024
8ee95ee
update how granule name referenced in send to gitc
torimcd May 16, 2024
46a9395
remove unused cmr var
torimcd May 16, 2024
8944b35
fix case
torimcd May 16, 2024
bf86736
fix cnm parsing
torimcd May 16, 2024
b146dcc
reformat save cnm to separate step
torimcd May 28, 2024
ad8ed6e
update tf vars for save cnm
torimcd May 28, 2024
33e2225
fix type in module definition
torimcd May 28, 2024
10d3113
fix cnm in cma
torimcd May 28, 2024
02f4d1b
fix collection reference in save cnm
torimcd May 29, 2024
7b1f4a6
add debugging log statements
torimcd May 29, 2024
8b56b7a
fix input
torimcd May 29, 2024
b02dd73
update save cnm input
torimcd May 29, 2024
eaddd63
debugging
torimcd May 29, 2024
8d1f031
debugging
torimcd May 29, 2024
49191ca
linting
torimcd May 29, 2024
6eded09
debugging
torimcd May 29, 2024
ba5fc2d
debugging
torimcd May 29, 2024
9fdc7fc
linting
torimcd May 29, 2024
bf25f52
fix state machine
torimcd May 29, 2024
03d421c
update state machine
torimcd May 29, 2024
37c5f3b
reorg state machine
torimcd May 29, 2024
74be4dd
missing comma
torimcd May 29, 2024
df784d2
move save cnm into map
torimcd Jun 4, 2024
554a5b6
fix state machine transitions
torimcd Jun 4, 2024
1c833ca
fix sm
torimcd Jun 4, 2024
45c0435
fix boolean
torimcd Jun 4, 2024
e05dd3f
debugging cnm input
torimcd Jun 4, 2024
1dd0b62
fix input
torimcd Jun 4, 2024
0f30ca9
change input
torimcd Jun 4, 2024
27f9615
debug input
torimcd Jun 4, 2024
bcc81e4
add cnm as config parameter
torimcd Jun 4, 2024
741a438
lint
torimcd Jun 4, 2024
9b551e9
fix cnm payload
torimcd Jun 4, 2024
04be710
remove debugging statements
torimcd Jun 4, 2024
9fb5af6
add prefix to cnm path and fix gitc response
torimcd Jun 4, 2024
323b567
increase handle gitc response timeout
torimcd Jun 4, 2024
344f54b
Merge branch 'develop' into feature/issue-7
torimcd Jun 4, 2024
0871338
update changelog
torimcd Jun 4, 2024
0543496
add original shortname as cnm prefix
torimcd Jun 4, 2024
267f59c
revert shortname and change collection ref to save cnm & cnm-r in sam…
torimcd Jun 5, 2024
abe609b
remove save cma lambda no longer used
torimcd Jun 5, 2024
b5398f3
remove EDL env params from sendtogitc
torimcd Jun 5, 2024
04e1396
change parsing of granule concept id
torimcd Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move save cnm into map
  • Loading branch information
@torimcd
torimcd committed Jun 4, 2024
commit df784d275b7adca132d9d8ed9faf42df5ca65778
99 changes: 50 additions & 49 deletions terraform/state_machine_definition.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,61 450,62 @@
"TimeoutSeconds": 86400,
"End": "true",
"ResultPath": "$.gitc_response"
}
},
"ResultPath": "$.payload.pobit",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"ResultPath": "$.exception",
"Next": "WorkflowFailed"
}
],
"Retry": [
{
"ErrorEquals": [
"States.ALL"
},
"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
}
],
"IntervalSeconds": 2,
"MaxAttempts": 1
"Next": "WorkflowSucceeded"
}
],
"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": "{$.gitc_response}"
}
},
"ResultPath": "$.payload.pobit",
"Catch": [
{
"ErrorEquals": [
"States.ALL"
],
"ResultPath": "$.exception",
"Next": "WorkflowFailed"
}
}
},
"Retry": [
{
"ErrorEquals": [
"Lambda.ServiceException",
"Lambda.AWSLambdaException",
"Lambda.SdkClientException",
"Lambda.TooManyRequestsException"
],
"Retry": [
{
"ErrorEquals": [
"States.ALL"
],
"IntervalSeconds": 2,
"MaxAttempts": 6,
"BackoffRate": 2
}
],
"Next": "WorkflowSucceeded"
"IntervalSeconds": 2,
"MaxAttempts": 1
}
],
"Next": "SaveCNMMessage"
}
},

"WorkflowSucceeded": {
"Type": "Succeed"
},
Expand Down
Loading