diff --git a/CHANGES/+flatpak-domain-name.bugfix b/CHANGES/+flatpak-domain-name.bugfix deleted file mode 100644 index 68ac2909b..000000000 --- a/CHANGES/+flatpak-domain-name.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed flatpak index response to include the domain prefix in image names when domains are enabled. diff --git a/pulp_container/app/registry_api.py b/pulp_container/app/registry_api.py index 4fc542a74..cb1d5807f 100644 --- a/pulp_container/app/registry_api.py +++ b/pulp_container/app/registry_api.py @@ -81,7 +81,6 @@ determine_media_type, extract_data_from_signature, filter_resource, - get_full_path, has_task_completed, validate_manifest, ) @@ -702,7 +701,7 @@ def get(self, request): if images: results.append( { - "Name": get_full_path(distribution.base_path, distribution.pulp_domain), + "Name": distribution.base_path, "Images": images, } ) diff --git a/pulp_container/tests/functional/api/test_flatpak.py b/pulp_container/tests/functional/api/test_flatpak.py index 5f9d706b9..59893664f 100644 --- a/pulp_container/tests/functional/api/test_flatpak.py +++ b/pulp_container/tests/functional/api/test_flatpak.py @@ -66,21 +66,16 @@ def test_flatpak_install( container_manifest_api, pulp_settings, bindings_cfg, - full_path, ): if not pulp_settings.FLATPAK_INDEX: pytest.skip("This test requires FLATPAK_INDEX to be enabled") image_path1 = f"{REGISTRY_V2}/pulp/oci-net.fishsoup.busyboxplatform:latest" registry_client.pull(image_path1) - local_registry.tag_and_push( - image_path1, full_path("pulptest/oci-net.fishsoup.busyboxplatform") + ":latest" - ) + local_registry.tag_and_push(image_path1, "pulptest/oci-net.fishsoup.busyboxplatform:latest") image_path2 = f"{REGISTRY_V2}/pulp/oci-net.fishsoup.hello:latest" registry_client.pull(image_path2) - local_registry.tag_and_push( - image_path2, full_path("pulptest/oci-net.fishsoup.hello") + ":latest" - ) + local_registry.tag_and_push(image_path2, "pulptest/oci-net.fishsoup.hello:latest") namespace = container_namespace_api.list(name="pulptest").results[0] add_to_cleanup(container_namespace_api, namespace.pulp_href)