Skip to content

py/envoy.base.utils: Fix archive url #5367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phlax merged 1 commit into from
Oct 2, 2026
Merged

py/envoy.base.utils: Fix archive url #5367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions py/envoy.base.utils/envoy/base/utils/abstract/project/inventory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
Expand Down Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions py/envoy.base.utils/tests/test_abstract_project_inventories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down