fix: temp disable cumulus delete

Author: wphyojpl

cumulus_lambda_functions/uds_api/granules_api.py

@@ -267,8 +267,8 @@ async def delete_single_granule_dapa(request: Request, collection_id: str, granu
         cumulus_lambda_prefix = os.getenv('CUMULUS_LAMBDA_PREFIX')
         cumulus = GranulesQuery('https://na/dev', 'NA')
         cumulus.with_collection_id(collection_id)
-        cumulus_delete_result = cumulus.delete_entry(cumulus_lambda_prefix, granule_id)  # TODO not sure it is correct granule ID
-        LOGGER.debug(f'cumulus_delete_result: {cumulus_delete_result}')
+        # cumulus_delete_result = cumulus.delete_entry(cumulus_lambda_prefix, granule_id)  # TODO not sure it is correct granule ID
+        # LOGGER.debug(f'cumulus_delete_result: {cumulus_delete_result}')
         es_delete_result = GranulesDbIndex().delete_entry(collection_identifier.tenant,
                                                           collection_identifier.venue,
                                                           granule_id

tests/integration_tests/test_granules_deletion.py

@@ -5,6 +5,7 @@
 
 import requests
 from dotenv import load_dotenv
+from mdps_ds_lib.lib.aws.aws_s3 import AwsS3
 from mdps_ds_lib.lib.cognito_login.cognito_login import CognitoLogin
 
 
@@ -31,10 +32,30 @@ def setUp(self) -> None:
 
         self.tenant = 'UDS_LOCAL_TEST_3'  # 'uds_local_test'  # 'uds_sandbox'
         self.tenant_venue = 'DEV'  # 'DEV1'  # 'dev'
-        self.collection_name = 'AAA-04'  # 'uds_collection'  # 'sbx_collection'
+        self.collection_name = 'CCC-01'  # 'uds_collection'  # 'sbx_collection'
         self.collection_version = '08'.replace('.', '')  # '2402011200'
         return
 
+    def test_01_setup_permissions(self):
+        collection_url = f'{self._url_prefix}/admin/auth'
+        admin_add_body = {
+            "actions": ["READ", "CREATE", "DELETE"],
+            "resources": [f"URN:NASA:UNITY:{self.tenant}:{self.tenant_venue}:.*"],
+            "tenant": self.tenant,
+            "venue": self.tenant_venue,
+            "group_name": "Unity_Viewer"
+        }
+        s = requests.session()
+        s.trust_env = False
+        response = s.put(url=collection_url, headers={
+            'Authorization': f'Bearer {self.cognito_login.token}',
+            'Content-Type': 'application/json',
+        }, verify=False, data=json.dumps(admin_add_body))
+        self.assertEqual(response.status_code, 200, f'wrong status code: {response.text}')
+        response_json = response.content.decode()
+        print(response_json)
+        return
+
     def test_delete_all(self):
         collection_id = f'URN:NASA:UNITY:{self.tenant}:{self.tenant_venue}:{self.collection_name}___001'
         post_url = f'{self.uds_url}collections/{collection_id}/items/'  # MCP Dev
@@ -51,7 +72,9 @@ def test_delete_all(self):
         self.assertTrue(len(response_json['features']) > 0, f'empty collection :(')
         deleting_granule_id = response_json['features'][0]['id']
 
-        post_url = f'{self.uds_url}collections/{collection_id}/items/{deleting_granule_id}'  # MCP Dev
+        asset_urls = [v['href'] for k, v in response_json['features'][0]['assets'].items()]
+        print(asset_urls)
+        post_url = f'{self.uds_url}collections/{collection_id}/items/{deleting_granule_id}/?delete_files=false'  # MCP Dev
         print(post_url)
         query_result = requests.delete(url=post_url,
                                        headers=headers,
@@ -65,4 +88,8 @@ def test_delete_all(self):
         self.assertEqual(query_result.status_code, 200, f'wrong status code. {query_result.text}')
         response_json = json.loads(query_result.text)
         print(json.dumps(response_json, indent=4))
+
+        s3 = AwsS3()
+        for each_url in asset_urls:
+            self.assertTrue(s3.set_s3_url(each_url).exists(s3.target_bucket, s3.target_key), f'file no longer exists: {each_url}')
         return

tests/integration_tests/test_stage_out_ingestion.py

@@ -42,7 +42,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 = 'AAA'  # 'uds_collection'  # 'sbx_collection'
+        self.collection_name = 'CCC'  # 'uds_collection'  # 'sbx_collection'
         self.collection_version = '24.03.20.14.40'.replace('.', '')  # '2402011200'
         return
 
@@ -232,7 +232,7 @@ def test_03_upload_complete_catalog_role_as_key(self):
                                     "type": "Point",
                                     "coordinates": [0.0, 0.0]
                                  },
-                                 bbox=[0.0, 0.1, 0.1, 0.0],
+                                 bbox=[0.0, 0.0, 0.1, 0.1],
                                  datetime=TimeUtils().parse_from_unix(0, True).get_datetime_obj(),
                                  properties={
                                      "start_datetime": "2016-01-31T18:00:00.009057Z",