Skip to content

Commit 8f706be

Browse files
committed
fix: get executions for collection
1 parent 45c5b06 commit 8f706be

File tree

2 files changed

+35
-0
lines changed

2 files changed

+35
-0
lines changed

cumulus_lambda_functions/cumulus_wrapper/query_collections.py

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,38 @@ def delete_executions(self, new_collection: dict, private_api_prefix: str):
229229
return {'server_error': f'error while invoking:{str(e)}'}
230230
return {'status': query_result}
231231

232+
def list_executions(self, new_collection: dict, private_api_prefix: str):
233+
# $ curl --request DELETE https://example.com/rules/repeat_test --header 'Authorization: Bearer ReplaceWithTheToken'
234+
payload = {
235+
'httpMethod': 'GET',
236+
'resource': '/{proxy+}',
237+
'path': f'/executions',
238+
'queryStringParameters': {'limit': '100', 'collectionId': f'{new_collection["name"]}___{new_collection["version"]}'},
239+
'headers': {
240+
'Content-Type': 'application/json',
241+
}
242+
}
243+
LOGGER.debug(f'payload: {payload}')
244+
try:
245+
query_result = self._invoke_api(payload, private_api_prefix)
246+
"""
247+
{'statusCode': 500, 'body': '', 'headers': {}}
248+
"""
249+
if query_result['statusCode'] >= 500:
250+
LOGGER.error(f'server error status code: {query_result["statusCode"]}. details: {query_result}')
251+
return {'server_error': query_result}
252+
if query_result['statusCode'] >= 400:
253+
LOGGER.error(f'client error status code: {query_result["statusCode"]}. details: {query_result}')
254+
return {'client_error': query_result}
255+
query_result = json.loads(query_result['body'])
256+
LOGGER.debug(f'json query_result: {query_result}')
257+
if 'id' not in query_result:
258+
return {'server_error': f'invalid response: {query_result}'}
259+
except Exception as e:
260+
LOGGER.exception('error while invoking')
261+
return {'server_error': f'error while invoking:{str(e)}'}
262+
return {'status': query_result}
263+
232264
def create_sqs_rules(self, new_collection: dict, private_api_prefix: str, sqs_url: str, provider_name: str = '', workflow_name: str = 'CatalogGranule', visibility_timeout: int = 1800):
233265
"""
234266
curl --request POST "$CUMULUS_BASEURL/rules" --header "Authorization: Bearer $cumulus_token" --header 'Content-Type: application/json' --data '{

cumulus_lambda_functions/uds_api/dapa/collections_dapa_creation.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,15 @@ def __create_collection_uds(self, cumulus_collection_doc):
139139
def delete(self):
140140
deletion_result = {}
141141
try:
142+
142143
cumulus_collection_doc = self.__collection_transformer.from_stac(self.__request_body)
143144
self.__provider_id = self.__provider_id if self.__collection_transformer.output_provider is None else self.__collection_transformer.output_provider
144145
LOGGER.debug(f'__provider_id: {self.__provider_id}')
145146
creation_result = 'NA'
146147

147148
if self.__include_cumulus:
149+
result = self.__cumulus_collection_query.delete_executions(cumulus_collection_doc, self.__cumulus_lambda_prefix)
150+
print(f'execution list result: {result}')
148151
self.__delete_collection_execution(cumulus_collection_doc, deletion_result)
149152
self.__delete_collection_rule(cumulus_collection_doc, deletion_result)
150153
delete_result = self.__cumulus_collection_query.delete_collection(self.__cumulus_lambda_prefix, cumulus_collection_doc['name'], cumulus_collection_doc['version'])

0 commit comments

Comments
 (0)