diff --git a/swh/storage/cassandra/storage.py b/swh/storage/cassandra/storage.py --- a/swh/storage/cassandra/storage.py +++ b/swh/storage/cassandra/storage.py @@ -1148,7 +1148,7 @@ try: row = RawExtrinsicMetadataRow( type=metadata_entry.type.value, - id=str(metadata_entry.id), + id=str(metadata_entry.target), authority_type=metadata_entry.authority.type.value, authority_url=metadata_entry.authority.url, discovery_date=metadata_entry.discovery_date, @@ -1226,7 +1226,7 @@ result = RawExtrinsicMetadata( type=MetadataTargetType(entry.type), - id=id, + target=id, authority=MetadataAuthority( type=MetadataAuthorityType(entry.authority_type), url=entry.authority_url, diff --git a/swh/storage/migrate_extrinsic_metadata.py b/swh/storage/migrate_extrinsic_metadata.py --- a/swh/storage/migrate_extrinsic_metadata.py +++ b/swh/storage/migrate_extrinsic_metadata.py @@ -402,7 +402,7 @@ revision_swhid = SWHID(object_type="revision", object_id=hash_to_hex(revision_id)) obj = RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=revision_swhid, + target=revision_swhid, discovery_date=discovery_date, authority=authority, fetcher=FETCHER, diff --git a/swh/storage/postgresql/converters.py b/swh/storage/postgresql/converters.py --- a/swh/storage/postgresql/converters.py +++ b/swh/storage/postgresql/converters.py @@ -296,12 +296,12 @@ def db_to_raw_extrinsic_metadata(row) -> RawExtrinsicMetadata: type_ = MetadataTargetType(row["raw_extrinsic_metadata.type"]) - id_ = row["raw_extrinsic_metadata.id"] + target = row["raw_extrinsic_metadata.id"] if type_ != MetadataTargetType.ORIGIN: - id_ = parse_swhid(id_) + target = parse_swhid(target) return RawExtrinsicMetadata( type=type_, - id=id_, + target=target, authority=MetadataAuthority( type=MetadataAuthorityType(row["metadata_authority.type"]), url=row["metadata_authority.url"], diff --git a/swh/storage/postgresql/storage.py b/swh/storage/postgresql/storage.py --- a/swh/storage/postgresql/storage.py +++ b/swh/storage/postgresql/storage.py @@ -1246,7 +1246,7 @@ db.raw_extrinsic_metadata_add( type=metadata_entry.type.value, - id=str(metadata_entry.id), + id=str(metadata_entry.target), discovery_date=metadata_entry.discovery_date, authority_id=authority_id, fetcher_id=fetcher_id, diff --git a/swh/storage/tests/migrate_extrinsic_metadata/test_cran.py b/swh/storage/tests/migrate_extrinsic_metadata/test_cran.py --- a/swh/storage/tests/migrate_extrinsic_metadata/test_cran.py +++ b/swh/storage/tests/migrate_extrinsic_metadata/test_cran.py @@ -115,7 +115,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:000361aa33842cbdea5fa6e77db696b937ebd269" ), discovery_date=datetime.datetime( @@ -202,7 +202,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:0000d4ef5e166122aee6862ad38a18ce5386cc3e" ), discovery_date=datetime.datetime( @@ -278,7 +278,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:2e223782ee4ba152e4c886f797976241c39a9aab" ), discovery_date=datetime.datetime( diff --git a/swh/storage/tests/migrate_extrinsic_metadata/test_debian.py b/swh/storage/tests/migrate_extrinsic_metadata/test_debian.py --- a/swh/storage/tests/migrate_extrinsic_metadata/test_debian.py +++ b/swh/storage/tests/migrate_extrinsic_metadata/test_debian.py @@ -431,7 +431,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:0000036c311ef33a281b05688f6eadcfc0943aee" ), discovery_date=datetime.datetime( @@ -546,7 +546,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:000001c28c8fca01b904de92a2640a866ce03cb7" ), discovery_date=datetime.datetime( diff --git a/swh/storage/tests/migrate_extrinsic_metadata/test_deposit.py b/swh/storage/tests/migrate_extrinsic_metadata/test_deposit.py --- a/swh/storage/tests/migrate_extrinsic_metadata/test_deposit.py +++ b/swh/storage/tests/migrate_extrinsic_metadata/test_deposit.py @@ -183,7 +183,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:022310df16fd9e4d4f81fe36a142e82db977c01d" ), discovery_date=datetime.datetime( @@ -201,7 +201,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:022310df16fd9e4d4f81fe36a142e82db977c01d" ), discovery_date=datetime.datetime( @@ -346,7 +346,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:0116cab71964d59c8570b4c5729b28bdd63c9b46" ), discovery_date=datetime.datetime( @@ -364,7 +364,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:0116cab71964d59c8570b4c5729b28bdd63c9b46" ), discovery_date=datetime.datetime( @@ -508,7 +508,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:0122966e509317aece6a41d0f088da733cc09d0f" ), discovery_date=datetime.datetime( @@ -526,7 +526,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:0122966e509317aece6a41d0f088da733cc09d0f" ), discovery_date=datetime.datetime( @@ -669,7 +669,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:4a9d637ba507a2b93365250428e6e3f021f194d0" ), discovery_date=datetime.datetime( @@ -687,7 +687,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:4a9d637ba507a2b93365250428e6e3f021f194d0" ), discovery_date=datetime.datetime( @@ -841,7 +841,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:09356053c49ad0f9e62e51c29d3e617c791140df" ), discovery_date=datetime.datetime( @@ -859,7 +859,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:09356053c49ad0f9e62e51c29d3e617c791140df" ), discovery_date=datetime.datetime( @@ -877,7 +877,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:09356053c49ad0f9e62e51c29d3e617c791140df" ), discovery_date=datetime.datetime( @@ -1054,7 +1054,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:03987f056eaf4596cd20d7b2ee01c9b84ceddfa8" ), discovery_date=datetime.datetime( @@ -1160,7 +1160,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:2d7bce631fc791080311eb835c47428e586a6ea4" ), discovery_date=datetime.datetime( @@ -1291,7 +1291,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:034076f3f41ee1204eb9f64082cbe6e950d7bb8a" ), discovery_date=datetime.datetime( @@ -1309,7 +1309,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:034076f3f41ee1204eb9f64082cbe6e950d7bb8a" ), discovery_date=datetime.datetime( diff --git a/swh/storage/tests/migrate_extrinsic_metadata/test_gnu.py b/swh/storage/tests/migrate_extrinsic_metadata/test_gnu.py --- a/swh/storage/tests/migrate_extrinsic_metadata/test_gnu.py +++ b/swh/storage/tests/migrate_extrinsic_metadata/test_gnu.py @@ -89,7 +89,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:001c71458e405b25baccc80b99f6634dff9d2b18" ), discovery_date=datetime.datetime( diff --git a/swh/storage/tests/migrate_extrinsic_metadata/test_nixguix.py b/swh/storage/tests/migrate_extrinsic_metadata/test_nixguix.py --- a/swh/storage/tests/migrate_extrinsic_metadata/test_nixguix.py +++ b/swh/storage/tests/migrate_extrinsic_metadata/test_nixguix.py @@ -87,7 +87,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:0001ba4dd05394850211d7b3854d9913d23ae379" ), discovery_date=datetime.datetime( @@ -105,7 +105,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:0001ba4dd05394850211d7b3854d9913d23ae379" ), discovery_date=datetime.datetime( diff --git a/swh/storage/tests/migrate_extrinsic_metadata/test_npm.py b/swh/storage/tests/migrate_extrinsic_metadata/test_npm.py --- a/swh/storage/tests/migrate_extrinsic_metadata/test_npm.py +++ b/swh/storage/tests/migrate_extrinsic_metadata/test_npm.py @@ -139,7 +139,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:000002a49bba17ca8cf37f5f3d16aaacf95360fc" ), discovery_date=datetime.datetime( @@ -157,7 +157,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:000002a49bba17ca8cf37f5f3d16aaacf95360fc" ), discovery_date=datetime.datetime( @@ -241,7 +241,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:000004aeed09ee089c781264c04d2564fd58feb5" ), discovery_date=datetime.datetime( @@ -259,7 +259,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:000004aeed09ee089c781264c04d2564fd58feb5" ), discovery_date=datetime.datetime( @@ -339,7 +339,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:00002019c5775874bced007a529bd3b78bf60457" ), discovery_date=datetime.datetime( @@ -357,7 +357,7 @@ [ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=parse_swhid( + target=parse_swhid( "swh:1:rev:00002019c5775874bced007a529bd3b78bf60457" ), discovery_date=datetime.datetime( diff --git a/swh/storage/tests/migrate_extrinsic_metadata/test_pypi.py b/swh/storage/tests/migrate_extrinsic_metadata/test_pypi.py --- a/swh/storage/tests/migrate_extrinsic_metadata/test_pypi.py +++ b/swh/storage/tests/migrate_extrinsic_metadata/test_pypi.py @@ -281,7 +281,7 @@ results=[ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=revision_swhid, + target=revision_swhid, discovery_date=datetime.datetime( 2020, 1, 23, 18, 43, 9, 109407, tzinfo=datetime.timezone.utc, ), @@ -300,7 +300,7 @@ results=[ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=revision_swhid, + target=revision_swhid, discovery_date=datetime.datetime( 2020, 1, 23, 18, 43, 9, 109407, tzinfo=datetime.timezone.utc, ), @@ -401,7 +401,7 @@ results=[ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=revision_swhid, + target=revision_swhid, discovery_date=datetime.datetime( 2019, 1, 23, 22, 10, 55, tzinfo=datetime.timezone.utc, ), @@ -420,7 +420,7 @@ results=[ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=revision_swhid, + target=revision_swhid, discovery_date=datetime.datetime( 2019, 1, 23, 22, 10, 55, tzinfo=datetime.timezone.utc, ), @@ -508,7 +508,7 @@ results=[ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=revision_swhid, + target=revision_swhid, discovery_date=datetime.datetime( 2014, 5, 7, 22, 3, tzinfo=datetime.timezone.utc, ), @@ -618,7 +618,7 @@ results=[ RawExtrinsicMetadata( type=MetadataTargetType.REVISION, - id=revision_swhid, + target=revision_swhid, discovery_date=datetime.datetime( 2014, 5, 7, 22, 3, tzinfo=datetime.timezone.utc, ), diff --git a/swh/storage/tests/storage_data.py b/swh/storage/tests/storage_data.py --- a/swh/storage/tests/storage_data.py +++ b/swh/storage/tests/storage_data.py @@ -464,7 +464,7 @@ content_metadata1 = RawExtrinsicMetadata( type=MetadataTargetType.CONTENT, - id=parse_swhid(f"swh:1:cnt:{hash_to_hex(content.sha1_git)}"), + target=parse_swhid(f"swh:1:cnt:{hash_to_hex(content.sha1_git)}"), origin=origin.url, discovery_date=datetime.datetime( 2015, 1, 1, 21, 0, 0, tzinfo=datetime.timezone.utc @@ -476,7 +476,7 @@ ) content_metadata2 = RawExtrinsicMetadata( type=MetadataTargetType.CONTENT, - id=parse_swhid(f"swh:1:cnt:{hash_to_hex(content.sha1_git)}"), + target=parse_swhid(f"swh:1:cnt:{hash_to_hex(content.sha1_git)}"), origin=origin2.url, discovery_date=datetime.datetime( 2017, 1, 1, 22, 0, 0, tzinfo=datetime.timezone.utc @@ -488,7 +488,7 @@ ) content_metadata3 = RawExtrinsicMetadata( type=MetadataTargetType.CONTENT, - id=parse_swhid(f"swh:1:cnt:{hash_to_hex(content.sha1_git)}"), + target=parse_swhid(f"swh:1:cnt:{hash_to_hex(content.sha1_git)}"), discovery_date=datetime.datetime( 2017, 1, 1, 22, 0, 0, tzinfo=datetime.timezone.utc ), @@ -513,7 +513,7 @@ origin_metadata1 = RawExtrinsicMetadata( type=MetadataTargetType.ORIGIN, - id=origin.url, + target=origin.url, discovery_date=datetime.datetime( 2015, 1, 1, 21, 0, 0, tzinfo=datetime.timezone.utc ), @@ -524,7 +524,7 @@ ) origin_metadata2 = RawExtrinsicMetadata( type=MetadataTargetType.ORIGIN, - id=origin.url, + target=origin.url, discovery_date=datetime.datetime( 2017, 1, 1, 22, 0, 0, tzinfo=datetime.timezone.utc ), @@ -535,7 +535,7 @@ ) origin_metadata3 = RawExtrinsicMetadata( type=MetadataTargetType.ORIGIN, - id=origin.url, + target=origin.url, discovery_date=datetime.datetime( 2017, 1, 1, 22, 0, 0, tzinfo=datetime.timezone.utc ), diff --git a/swh/storage/tests/storage_tests.py b/swh/storage/tests/storage_tests.py --- a/swh/storage/tests/storage_tests.py +++ b/swh/storage/tests/storage_tests.py @@ -3368,7 +3368,7 @@ content1_swhid = SWHID(object_type="content", object_id=content.sha1_git) content2_swhid = SWHID(object_type="content", object_id=content2.sha1_git) - content2_metadata = attr.evolve(content1_metadata2, id=content2_swhid) + content2_metadata = attr.evolve(content1_metadata2, target=content2_swhid) swh_storage.metadata_authority_add([authority, authority2]) swh_storage.metadata_fetcher_add([fetcher, fetcher2]) @@ -3606,7 +3606,7 @@ assert swh_storage.origin_add([origin, origin2]) == {"origin:add": 2} - origin2_metadata = attr.evolve(origin1_metadata2, id=origin2.url) + origin2_metadata = attr.evolve(origin1_metadata2, target=origin2.url) swh_storage.metadata_authority_add([authority, authority2]) swh_storage.metadata_fetcher_add([fetcher, fetcher2]) @@ -3782,7 +3782,7 @@ with pytest.raises(StorageArgumentException, match="SWHID"): swh_storage.raw_extrinsic_metadata_get( - MetadataTargetType.ORIGIN, content_metadata.id, authority, + MetadataTargetType.ORIGIN, content_metadata.target, authority, ) diff --git a/swh/storage/tests/test_retry.py b/swh/storage/tests/test_retry.py --- a/swh/storage/tests/test_retry.py +++ b/swh/storage/tests/test_retry.py @@ -472,13 +472,13 @@ """ origin = sample_data.origin ori_meta = sample_data.origin_metadata1 - assert origin.url == ori_meta.id + assert origin.url == ori_meta.target swh_storage.origin_add([origin]) swh_storage.metadata_authority_add([sample_data.metadata_authority]) swh_storage.metadata_fetcher_add([sample_data.metadata_fetcher]) origin_metadata = swh_storage.raw_extrinsic_metadata_get( - MetadataTargetType.ORIGIN, ori_meta.id, ori_meta.authority + MetadataTargetType.ORIGIN, ori_meta.target, ori_meta.authority ) assert origin_metadata.next_page_token is None assert not origin_metadata.results @@ -486,7 +486,7 @@ swh_storage.raw_extrinsic_metadata_add([ori_meta]) origin_metadata = swh_storage.raw_extrinsic_metadata_get( - MetadataTargetType.ORIGIN, ori_meta.id, ori_meta.authority + MetadataTargetType.ORIGIN, ori_meta.target, ori_meta.authority ) assert origin_metadata @@ -499,7 +499,7 @@ """ origin = sample_data.origin ori_meta = sample_data.origin_metadata1 - assert origin.url == ori_meta.id + assert origin.url == ori_meta.target swh_storage.origin_add([origin]) swh_storage.metadata_authority_add([sample_data.metadata_authority]) swh_storage.metadata_fetcher_add([sample_data.metadata_fetcher]) @@ -541,7 +541,7 @@ origin = sample_data.origin ori_meta = sample_data.origin_metadata1 - assert origin.url == ori_meta.id + assert origin.url == ori_meta.target swh_storage.origin_add([origin]) with pytest.raises(StorageArgumentException, match="Refuse to add"):