diff --git a/py/envoy.base.utils/envoy/base/utils/abstract/project/inventory.py b/py/envoy.base.utils/envoy/base/utils/abstract/project/inventory.py index 09c5b300cc..4459b6812a 100644 --- a/py/envoy.base.utils/envoy/base/utils/abstract/project/inventory.py +++ b/py/envoy.base.utils/envoy/base/utils/abstract/project/inventory.py @@ -20,7 +20,7 @@ INVENTORY_PATH_FMT = "docs/inventories/v{minor_version}/objects.inv" INVENTORY_VERSIONS_PATH = "docs/versions.yaml" INVENTORY_BASE_URL_DEFAULT = ( - "https://storage.googleapis.com/envoy-docs-archive") + "https://storage.googleapis.com/envoy-cncf-archive") INVENTORY_BASE_URL_ENV = "ENVOY_DOCS_ARCHIVE_URL" INVENTORY_URL_FMT = "{base_url}/envoy/docs/v{version}/objects.inv" INVENTORY_LEGACY_URL_FMT = ( @@ -107,7 +107,7 @@ def changes_for_commit(self, change: typing.ProjectChangeDict) -> set[str]: async def fetch(self, version: _version.Version) -> bytes | None: for url in (self.inventory_url, self.legacy_inventory_url): response = await self.project.session.get(url(version)) - if response.status != 404: + if response.status == 200: return await response.read() return None diff --git a/py/envoy.base.utils/tests/test_abstract_project_inventories.py b/py/envoy.base.utils/tests/test_abstract_project_inventories.py index 1633c8ddf1..7ffa2beaae 100644 --- a/py/envoy.base.utils/tests/test_abstract_project_inventories.py +++ b/py/envoy.base.utils/tests/test_abstract_project_inventories.py @@ -305,8 +305,8 @@ def test_abstract_inventories_changes(patches, items, sync): in items.items() if v]) -@pytest.mark.parametrize("response", [None, 404, "OTHER"]) -@pytest.mark.parametrize("legacy_response", [None, 404, "OTHER"]) +@pytest.mark.parametrize("response", [200, 301, 403, 404, 500]) +@pytest.mark.parametrize("legacy_response", [200, 301, 403, 404, 500]) async def test_abstract_inventories_fetch( patches, response, legacy_response): project = MagicMock() @@ -331,7 +331,7 @@ async def test_abstract_inventories_fetch( assert ( m_url.call_args == [(version, ), {}]) - if response != 404: + if response == 200: assert result == primary.read.return_value assert ( get.call_args_list @@ -350,7 +350,7 @@ async def test_abstract_inventories_fetch( assert ( m_legacy.call_args == [(version, ), {}]) - if legacy_response == 404: + if legacy_response != 200: assert result is None assert not legacy.read.called return @@ -430,7 +430,7 @@ def test_abstract_inventories_inventory_url_default(monkeypatch): version.base_version = "1.36.3" assert ( inventories.inventory_url(version) - == ("https://storage.googleapis.com/envoy-docs-archive/" + == ("https://storage.googleapis.com/envoy-cncf-archive/" "envoy/docs/v1.36.3/objects.inv")) assert ( inventories.legacy_inventory_url(version)