From 84594da552f02daf7adf6b047500061f384db6cc Mon Sep 17 00:00:00 2001
From: Daniel Sotirhos <dsotirho@ucsc.edu>
Date: Wed, 2 Oct 2024 13:54:21 -0700
Subject: [PATCH] fixup! Fix: Invalid columns in compact manifest for AnVIL
 (#6110)

---
 test/integration_test.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/test/integration_test.py b/test/integration_test.py
index ee66f595c..584998288 100644
--- a/test/integration_test.py
+++ b/test/integration_test.py
@@ -749,6 +749,14 @@ def _project_type(self, catalog: CatalogName) -> EntityType:
         else:
             assert False, catalog
 
+    def _uuid_column_name(self, catalog: CatalogName) -> str:
+        if config.is_hca_enabled(catalog):
+            return 'bundle_uuid'
+        elif config.is_anvil_enabled(catalog):
+            return 'bundles.bundle_uuid'
+        else:
+            assert False, catalog
+
     def _test_dos_and_drs(self, catalog: CatalogName):
         if config.is_dss_enabled(catalog) and config.dss_direct_access:
             _, file = self._get_one_inner_file(catalog)
@@ -928,7 +936,7 @@ def _assertResponseStatus(self,
         )
 
     def _check_compact_manifest(self, _catalog: CatalogName, response: bytes):
-        self.__check_csv_manifest(BytesIO(response), 'bundle_uuid')
+        self.__check_csv_manifest(BytesIO(response), self._uuid_column_name(_catalog))
 
     def _check_terra_bdbag_manifest(self, catalog: CatalogName, response: bytes):
         with ZipFile(BytesIO(response)) as zip_fh:
@@ -1047,14 +1055,14 @@ def _read_csv_manifest(self, file: IO[bytes]) -> csv.DictReader:
 
     def __check_csv_manifest(self,
                              file: IO[bytes],
-                             uuid_field_name: str
+                             uuid_column_name: str
                              ) -> list[Mapping[str, str]]:
         reader = self._read_csv_manifest(file)
         rows = list(reader)
         log.info(f'Manifest contains {len(rows)} rows.')
         self.assertGreater(len(rows), 0)
-        self.assertIn(uuid_field_name, reader.fieldnames)
-        bundle_uuids = rows[0][uuid_field_name].split(ManifestGenerator.padded_joiner)
+        self.assertIn(uuid_column_name, reader.fieldnames)
+        bundle_uuids = rows[0][uuid_column_name].split(ManifestGenerator.padded_joiner)
         self.assertGreater(len(bundle_uuids), 0)
         for bundle_uuid in bundle_uuids:
             self.assertEqual(bundle_uuid, str(uuid.UUID(bundle_uuid)))
@@ -1605,9 +1613,10 @@ def bundle_uuids(hit: JSON) -> set[str]:
         def test_compact_manifest(expected_bundles):
             manifest = BytesIO(self._get_url_content(PUT, manifest_url))
             manifest_rows = self._read_csv_manifest(manifest)
+            uuid_column_name = self._uuid_column_name(catalog)
             all_found_bundles = set()
             for row in manifest_rows:
-                row_bundles = set(row['bundle_uuid'].split(ManifestGenerator.padded_joiner))
+                row_bundles = set(row[uuid_column_name].split(ManifestGenerator.padded_joiner))
                 # It's possible for one file to be present in multiple
                 # bundles (e.g. due to stitching), so each row may include
                 # additional bundles besides those included in the filters.