fix: brute force delete retry

Author: wphyojpl

cumulus_lambda_functions/cumulus_wrapper/query_collections.py

@@ -222,12 +222,12 @@ def delete_executions(self, new_collection: dict, private_api_prefix: str):
                 return {'client_error': query_result}
             query_result = json.loads(query_result['body'])
             LOGGER.debug(f'json query_result: {query_result}')
-            if 'message' not in query_result:
+            if 'id' not in query_result:
                 return {'server_error': f'invalid response: {query_result}'}
         except Exception as e:
             LOGGER.exception('error while invoking')
             return {'server_error': f'error while invoking:{str(e)}'}
-        return {'status': query_result['message']}
+        return {'status': query_result}
 
     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):
         """

cumulus_lambda_functions/uds_api/dapa/collections_dapa_creation.py

@@ -179,12 +179,23 @@ def delete(self):
                 exec_delete_err, exec_delete_result = self.analyze_cumulus_result(executions_delete_result)
                 deletion_result['cumulus_executions_deletion'] = exec_delete_err if exec_delete_err is not None else exec_delete_result
                 sleep(10)
-                rule_deletion_result = self.__cumulus_collection_query.delete_sqs_rules(cumulus_collection_doc, self.__cumulus_lambda_prefix)
-                rule_delete_err, rule_delete_result = self.analyze_cumulus_result(rule_deletion_result)
-                deletion_result['cumulus_rule_deletion'] = rule_delete_err if rule_delete_err is not None else rule_delete_result
                 delete_result = self.__cumulus_collection_query.delete_collection(self.__cumulus_lambda_prefix, cumulus_collection_doc['name'], cumulus_collection_doc['version'])
                 delete_err, delete_result = self.analyze_cumulus_result(delete_result)
+                if delete_err is not None:
+                    executions_delete_result = self.__cumulus_collection_query.delete_executions(cumulus_collection_doc,
+                                                                                                 self.__cumulus_lambda_prefix)
+                    exec_delete_err, exec_delete_result = self.analyze_cumulus_result(executions_delete_result)
+                    deletion_result[
+                        'cumulus_executions_deletion'] = exec_delete_err if exec_delete_err is not None else exec_delete_result
+                    sleep(10)
+                    delete_result = self.__cumulus_collection_query.delete_collection(self.__cumulus_lambda_prefix,
+                                                                                      cumulus_collection_doc['name'],
+                                                                                      cumulus_collection_doc['version'])
+                    delete_err, delete_result = self.analyze_cumulus_result(delete_result)
                 deletion_result['cumulus_collection_deletion'] = delete_err if delete_err is not None else delete_result
+                rule_deletion_result = self.__cumulus_collection_query.delete_sqs_rules(cumulus_collection_doc, self.__cumulus_lambda_prefix)
+                rule_delete_err, rule_delete_result = self.analyze_cumulus_result(rule_deletion_result)
+                deletion_result['cumulus_rule_deletion'] = rule_delete_err if rule_delete_err is not None else rule_delete_result
             else:
                 deletion_result['cumulus_executions_deletion'] = 'NA'
                 deletion_result['cumulus_rule_deletion'] = 'NA'