fix: need to pass token to actual call as well

Author: wphyojpl

cumulus_lambda_functions/uds_api/dapa/granules_dapa_query_es.py

@@ -154,7 +154,7 @@ def get_single_granule(self, granule_id):
         self.__restructure_each_granule_result(each_granules_query_result_stripped)
         return each_granules_query_result_stripped
 
-    def delete_facade(self, current_url: URL):
+    def delete_facade(self, current_url: URL, bearer_token: str):
         actual_path = current_url.path
         actual_path = actual_path if actual_path.endswith('/') else f'{actual_path}/'
         actual_path = f'{actual_path}actual'
@@ -165,12 +165,12 @@ def delete_facade(self, current_url: URL):
             'path': actual_path,
             'httpMethod': 'DELETE',
             'headers': {
-                'Accept': '*/*', 'Accept-Encoding': 'gzip, deflate', 'Authorization': 'Bearer xxx',
+                'Accept': '*/*', 'Accept-Encoding': 'gzip, deflate', 'Authorization': bearer_token,
                 'Host': current_url.hostname, 'User-Agent': 'python-requests/2.28.2',
                 'X-Amzn-Trace-Id': 'Root=1-64a66e90-6fa8b7a64449014639d4f5b4', 'X-Forwarded-For': '44.236.15.58',
                 'X-Forwarded-Port': '443', 'X-Forwarded-Proto': 'https'},
             'multiValueHeaders': {
-                'Accept': ['*/*'], 'Accept-Encoding': ['gzip, deflate'], 'Authorization': ['Bearer xxx'],
+                'Accept': ['*/*'], 'Accept-Encoding': ['gzip, deflate'], 'Authorization': [bearer_token],
                 'Host': [current_url.hostname], 'User-Agent': ['python-requests/2.28.2'],
                 'X-Amzn-Trace-Id': ['Root=1-64a66e90-6fa8b7a64449014639d4f5b4'],
                 'X-Forwarded-For': ['127.0.0.1'], 'X-Forwarded-Port': ['443'], 'X-Forwarded-Proto': ['https']

cumulus_lambda_functions/uds_api/granules_api.py

@@ -308,7 +308,7 @@ async def delete_single_granule_dapa_facade(request: Request, collection_id: str
     try:
         LOGGER.debug(f'deleting granule: {granule_id}')
         granules_dapa_query = GranulesDapaQueryEs(collection_id, -1, -1, None, None, None, '')
-        delete_prep_result = granules_dapa_query.delete_facade(request.url)
+        delete_prep_result = granules_dapa_query.delete_facade(request.url, request.headers.get('Authorization', ''))
     except Exception as e:
         LOGGER.exception('failed during delete_single_granule_dapa')
         raise HTTPException(status_code=500, detail=str(e))

tests/integration_tests/test_granules_deletion.py

@@ -1,6 +1,7 @@
 import base64
 import json
 import os
+from time import sleep
 from unittest import TestCase
 
 import requests
@@ -32,7 +33,7 @@ def setUp(self) -> None:
 
         self.tenant = 'UDS_LOCAL_TEST_3'  # 'uds_local_test'  # 'uds_sandbox'
         self.tenant_venue = 'DEV'  # 'DEV1'  # 'dev'
-        self.collection_name = 'CCC-04'  # 'uds_collection'  # 'sbx_collection'
+        self.collection_name = 'CCC-05'  # 'uds_collection'  # 'sbx_collection'
         self.collection_version = '08'.replace('.', '')  # '2402011200'
         return
 
@@ -79,10 +80,10 @@ def test_delete_all(self):
         query_result = requests.delete(url=post_url,
                                        headers=headers,
                                        )
-        self.assertEqual(query_result.status_code, 200, f'wrong status code. {query_result.text}')
+        self.assertEqual(query_result.status_code, 202, f'wrong status code. {query_result.text}')
         response_json = json.loads(query_result.text)
         print(json.dumps(response_json, indent=4))
-
+        sleep(30)
         post_url = f'{self.uds_url}collections/{collection_id}/items/'  # MCP Dev
         query_result = requests.get(url=post_url, headers=headers,)
         self.assertEqual(query_result.status_code, 200, f'wrong status code. {query_result.text}')