diff --git a/requirements-swh.txt b/requirements-swh.txt --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,7 +1,7 @@ swh.auth[django] >= 0.5.3 swh.core >= 0.0.95 swh.counters >= 0.5.1 -swh.indexer >= 0.4.1 +swh.indexer >= 2.0.0 swh.model >= 6.2.0 swh.scheduler >= 0.7.0 swh.search >= 0.2.0 diff --git a/swh/web/common/archive.py b/swh/web/common/archive.py --- a/swh/web/common/archive.py +++ b/swh/web/common/archive.py @@ -416,7 +416,7 @@ for origin, match in zip(origins, matches): if not origin: continue - match["from_revision"] = hashutil.hash_to_hex(match["from_revision"]) + match["from_directory"] = hashutil.hash_to_hex(match["from_directory"]) del match["id"] results.append(OriginMetadataInfo(url=origin.url, metadata=match)) diff --git a/swh/web/tests/api/views/test_origin.py b/swh/web/tests/api/views/test_origin.py --- a/swh/web/tests/api/views/test_origin.py +++ b/swh/web/tests/api/views/test_origin.py @@ -23,6 +23,7 @@ from swh.web.tests.api.views.utils import scroll_results from swh.web.tests.data import ( INDEXER_TOOL, + ORIGIN_MASTER_DIRECTORY, ORIGIN_MASTER_REVISION, ORIGIN_METADATA_KEY, ORIGIN_METADATA_VALUE, @@ -696,7 +697,7 @@ { "url": origin_url, "metadata": { - "from_revision": ORIGIN_MASTER_REVISION[origin_url], + "from_directory": ORIGIN_MASTER_DIRECTORY[origin_url], "tool": { "name": INDEXER_TOOL["tool_name"], "version": INDEXER_TOOL["tool_version"], @@ -730,12 +731,12 @@ oimsft.side_effect = lambda conjunction, limit: [ OriginIntrinsicMetadataRow( id=origin_url, - from_revision=hash_to_bytes(master_rev), + from_directory=hash_to_bytes(directory), indexer_configuration_id=INDEXER_TOOL["id"], metadata={ORIGIN_METADATA_KEY: ORIGIN_METADATA_VALUE}, mappings=[], ) - for origin_url, master_rev in ORIGIN_MASTER_REVISION.items() + for origin_url, directory in ORIGIN_MASTER_DIRECTORY.items() ] url = reverse( diff --git a/swh/web/tests/data.py b/swh/web/tests/data.py --- a/swh/web/tests/data.py +++ b/swh/web/tests/data.py @@ -204,6 +204,7 @@ ORIGIN_METADATA_VALUE = "git" ORIGIN_MASTER_REVISION = {} +ORIGIN_MASTER_DIRECTORY = {} def _add_origin( @@ -325,9 +326,10 @@ # Add some origin intrinsic metadata for tests metadata = common_metadata metadata.update(origin.get("metadata", {})) + revision = storage.revision_get([branch_data.target])[0] origin_metadata = OriginIntrinsicMetadataRow( id=origin["url"], - from_revision=branch_data.target, + from_directory=revision.directory, indexer_configuration_id=idx_tool["id"], metadata=metadata, mappings=[], @@ -340,6 +342,9 @@ ORIGIN_MASTER_REVISION[origin["url"]] = hash_to_hex( branch_data.target ) + ORIGIN_MASTER_DIRECTORY[origin["url"]] = hash_to_hex( + revision.directory + ) elif target_type == "release": release = storage.release_get([branch_data.target])[0] origin_revisions.add(release.target)