pulp-ansible 0.29.1__py3-none-any.whl → 0.29.3__py3-none-any.whl

pulp_ansible/app/__init__.py

@@ -8,6 +8,6 @@ class PulpAnsiblePluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_ansible.app"
     label = "ansible"
-    version = "0.29.1"
+    version = "0.29.3"
     python_package_name = "pulp-ansible"
     domain_compatible = True

pulp_ansible/app/serializers.py

@@ -665,6 +665,22 @@ class CollectionVersionSerializer(ContentChecksumSerializer, CollectionVersionUp
 
     creating = True
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        try:
+            request = self.context["request"]
+            if request.method != "GET":
+                return
+        except (AttributeError, TypeError, KeyError):
+            # The serializer was not initialized with request context.
+            return
+        query_params = request.query_params
+        if self.include_arg_name in query_params or self.exclude_arg_name in query_params:
+            return
+        for fieldname in ["files", "manifest", "docs_blob", "contents"]:
+            # Redact these fields by default as they have no size limit.
+            self.fields.pop(fieldname)
+
     def validate(self, data):
         """Run super() validate if creating, else return data."""
         # This validation is for creating CollectionVersions

pulp_ansible/app/tasks/collections.py

@@ -57,6 +57,7 @@ from semantic_version import SimpleSpec, Version
 from semantic_version.base import Always
 
 from pulp_ansible.app.constants import PAGE_SIZE
+from pulp_ansible.exceptions import CollectionNotFound
 from pulp_ansible.app.models import (
     AnsibleCollectionDeprecated,
     AnsibleNamespace,
@@ -841,9 +842,7 @@ class CollectionSyncFirstStage(Stage):
             namespace not in self._unpaginated_collection_metadata
             or name not in self._unpaginated_collection_metadata[namespace]
         ):
-            raise FileNotFoundError(
-                f"Collection {namespace}.{name} does not exist on {self.remote.url}"
-            )
+            raise CollectionNotFound(namespace, name, self.remote.url)
 
         if self._unpaginated_collection_metadata[namespace][name]["deprecated"]:
             d_content = DeclarativeContent(

pulp_ansible/exceptions.py

@@ -0,0 +1,26 @@
+from gettext import gettext as _
+
+from pulpcore.plugin.exceptions import PulpException
+
+
+class CollectionNotFound(PulpException):
+    error_code = "PLPAN01"
+
+    def __init__(self, namespace, name, url):
+        """
+        :param url: The full URL that failed validation.
+        :type url: str
+        """
+        # Work around a sudden api change in pulpcore 3.103.
+        try:
+            super().__init__()
+        except BaseException:
+            super().__init__(self.error_code)
+        self.namespace = namespace
+        self.name = name
+        self.url = url
+
+    def __str__(self):
+        return f"[{self.error_code}] " + _(
+            "Collection {namespace}.{name} does not exist on {url}"
+        ).format(namespace=self.namespace, name=self.name, url=self.url)

pulp_ansible/tests/functional/api/collection/v3/test_proxy.py

@@ -77,6 +77,7 @@ def test_sync_through_http_proxy_with_auth(
 
 @pytest.mark.parallel
 def test_sync_through_http_proxy_with_auth_but_auth_not_configured(
+    has_pulp_plugin,
     ansible_bindings,
     ansible_repo,
     ansible_collection_remote_factory,
@@ -101,4 +102,7 @@ def test_sync_through_http_proxy_with_auth_but_auth_not_configured(
             monitor_task,
         )
     except PulpTaskError as exc:
-        assert "407, message='Proxy Authentication Required'" in exc.task.error["description"]
+        if has_pulp_plugin("core", min="3.102"):
+            assert "[PLP0010]" in exc.task.error["description"]
+        else:
+            assert "407, message='Proxy Authentication Required'" in exc.task.error["description"]

pulp_ansible/tests/functional/api/collection/v3/test_sync.py

@@ -72,6 +72,7 @@ class TestSync:
     @pytest.mark.parametrize("mirror", (True, False))
     def test_sync_absent_collection_from_pulp_fails(
         self,
+        has_pulp_plugin,
         ansible_bindings,
         monitor_task,
         ansible_repository_factory,
@@ -89,10 +90,11 @@ class TestSync:
         result = ansible_bindings.RepositoriesAnsibleApi.sync(
             repository.pulp_href, {"mirror": mirror}
         )
-        message = "Collection absent.not_present does not exist on"
         with pytest.raises(Exception) as exc_info:
             monitor_task(result.task)
-        assert message in exc_info.value.task.error["description"]
+        if has_pulp_plugin("core", min="3.102"):
+            assert "[PLPAN01]" in exc_info.value.task.error["description"]
+        assert "absent.not_present" in exc_info.value.task.error["description"]
 
     @pytest.mark.parametrize("mirror", (True, False))
     def test_resync_is_noop(

pulp_ansible/tests/functional/api/role/test_sync.py

@@ -30,12 +30,23 @@ def test_role_sync(
 
 
 @pytest.mark.parallel
-def test_role_sync_invalid(ansible_repo_factory, ansible_role_remote_factory, ansible_sync_factory):
+def test_role_sync_invalid(
+    has_pulp_plugin,
+    ansible_repo_factory,
+    ansible_role_remote_factory,
+    ansible_sync_factory,
+):
+    # Note this is not a DNS lookup error.
+    # This url fails a check before even reaching out overthe network.
     remote = ansible_role_remote_factory(url="http://i-am-an-invalid-url.com/invalid/")
 
     with pytest.raises(PulpTaskError) as exc_info:
         ansible_sync_factory(remote=remote.pulp_href)
-    assert (
-        exc_info.value.task.error["description"]
-        == "Could not determine API version for: http://i-am-an-invalid-url.com/invalid/"
-    )
+    if has_pulp_plugin("core", min="3.102"):
+        # This should actually have been caught by validation of the remote.
+        assert "[PLP0000]" in exc_info.value.task.error["description"]
+    else:
+        assert (
+            exc_info.value.task.error["description"]
+            == "Could not determine API version for: http://i-am-an-invalid-url.com/invalid/"
+        )

{pulp_ansible-0.29.1.dist-info → pulp_ansible-0.29.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-ansible
-Version: 0.29.1
+Version: 0.29.3
 Summary: Pulp plugin to manage Ansible content, e.g. roles
 Author-email: Pulp Ansible Plugin Project Developers <pulp-dev@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulp_ansible-0.29.1.dist-info → pulp_ansible-0.29.3.dist-info}/RECORD

@@ -1,6 +1,7 @@
 pulp_ansible/__init__.py,sha256=WXL3JyOZzh4tALN4OBNgqj412O2LXVr8iYSn14Av0_o,67
+pulp_ansible/exceptions.py,sha256=UsmjGBmQwv6XiRn-IwhnQdRf926FmaMyX2wwGNgCUmM,781
 pulp_ansible/pytest_plugin.py,sha256=hi9crI7QGghXCItNx27pW6KoXMzZqhAqAUstpJrsmlA,9105
-pulp_ansible/app/__init__.py,sha256=DlQqEittrF2Jo8PViJ6N1-Le8POHexS_JGvJDWp96ok,308
+pulp_ansible/app/__init__.py,sha256=0ZkB7eXaS8_K7Z2rTjiuVmduN-Dh4aqbI1Nhmcp4avQ,308
 pulp_ansible/app/constants.py,sha256=cRrWMbJU-v1nCY2CjmGTOFGzz5aggn4ZKIs4-zeYADQ,78
 pulp_ansible/app/downloaders.py,sha256=0xrAXzhTMJ6ywvs6XyYNAKvRzYb_UZR6A5_WgaHvuiE,8331
 pulp_ansible/app/fields.py,sha256=yV3FL-47K-nxbiBxgzWi1hk3tfLsRdgic59LiwT2Fvs,624
@@ -8,7 +9,7 @@ pulp_ansible/app/global_access_conditions.py,sha256=ayV_LbQIa4ReuDYQycdDY7WysfGk
 pulp_ansible/app/logutils.py,sha256=My4XivZMYLKeJqPHFwk3pIZSGlspALhI93vZxwWzlSY,846
 pulp_ansible/app/modelresource.py,sha256=fJ_njrSWdftFQpA54e6mdoIWG_zqBjpp2TkkyU8Y7D4,7181
 pulp_ansible/app/models.py,sha256=CrEcVxQUlb6V_d9l7_as7_Gi6TrBuJ_xJLhFCR_5jew,22709
-pulp_ansible/app/serializers.py,sha256=5_NM1tpMLrZ2QsNCWanaHhscGCS_QDLubXCTh5xwm8E,35981
+pulp_ansible/app/serializers.py,sha256=28lwMvLa3D-i4cekaIx50ffHUU78OfoDBlwdcTSTWyI,36670
 pulp_ansible/app/settings.py,sha256=ArDsI7VezOpKM9iFqxXb6VmEDOtRUS5lfB_oklkcxds,1244
 pulp_ansible/app/urls.py,sha256=gpMqsYPgHfc_6-EySR9ezUnI1F5yklzOVlSz9nlppmY,8697
 pulp_ansible/app/utils.py,sha256=ClI_WvVy73kOZQB2mS8Gftf80Vye7pOxrbodTmPQgmk,1686
@@ -97,7 +98,7 @@ pulp_ansible/app/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 pulp_ansible/app/schema/__init__.py,sha256=eGi2QVJ0kJgXwiDNjQsvqWDSr3EA8TFqFZATTY8xwT8,207
 pulp_ansible/app/schema/copy_config.json,sha256=AJz8riON7_rh-L7jM5iev2Imc5UKjlNvGfwF7KrFH7Y,568
 pulp_ansible/app/tasks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pulp_ansible/app/tasks/collections.py,sha256=NrYz79x_woRJOXzpEnNj8xPngLNkPykUIO9RMbbVKxQ,51048
+pulp_ansible/app/tasks/collections.py,sha256=5mkOCS-FnT7Y69yahuUij-sduMoSKObhxMZtGQMGm4k,51038
 pulp_ansible/app/tasks/collectionversion_index.py,sha256=_cnQeWRpFXrreTJM9aaEc2HuknTksZa0lLZ7XUfmQ_c,9401
 pulp_ansible/app/tasks/copy.py,sha256=dO_DnLT5hck6GpZomEHurrDHJM0Wkh2B0_wgHHOtbuY,5563
 pulp_ansible/app/tasks/deletion.py,sha256=f-VNTMzDMQiJpCLN34fY5gwhAGlh3RACj4VWc_tOaP0,3579
@@ -135,17 +136,17 @@ pulp_ansible/tests/functional/api/collection/v3/test_content_guard.py,sha256=lid
 pulp_ansible/tests/functional/api/collection/v3/test_deletion.py,sha256=V25G4VgJybNeMbElunE1cOSm_6KRk8FkYBAW-L1ZLWc,11620
 pulp_ansible/tests/functional/api/collection/v3/test_deprecation.py,sha256=n8khr_JySTXWDl-SiSDt4SLcdncMBGa5lBMIGyItyak,4185
 pulp_ansible/tests/functional/api/collection/v3/test_namespace.py,sha256=6eOazDAQXnx3rxwhSX1cpSjWMrqj63DFtNnsHrswpGA,8828
-pulp_ansible/tests/functional/api/collection/v3/test_proxy.py,sha256=Yb6BOZu0bnSGcy9zC57W5a-ohh7MpKRVJhZ6tgSS_LY,2817
+pulp_ansible/tests/functional/api/collection/v3/test_proxy.py,sha256=-QFZu3f4mx4jimiTSZhf0MFYo9y4YOwSyXqLAarxERM,2969
 pulp_ansible/tests/functional/api/collection/v3/test_redirects.py,sha256=ffolGXCJUp20YWk-ix_dWmCxtLN5yePHVywys3yDEZI,5170
 pulp_ansible/tests/functional/api/collection/v3/test_serializers.py,sha256=uO2puJL-4K1HQz9oAmo828RavpiKFfFa4xR7_f7K3SQ,3036
-pulp_ansible/tests/functional/api/collection/v3/test_sync.py,sha256=eGqYm7zxdtfrSDlV33Ah8v58UOZ20FXXejiQH5k7GLE,5230
+pulp_ansible/tests/functional/api/collection/v3/test_sync.py,sha256=Hkb_D9g1tdMq9-Dap35BsENMcPJWAO1MQ4aSVtQRO1A,5324
 pulp_ansible/tests/functional/api/git/__init__.py,sha256=_Ea-UgDCAz6Vl60TS1y0IrKZgRhNgIpgIzTsaXpqhrc,90
 pulp_ansible/tests/functional/api/git/test_crud_remotes.py,sha256=2si9SV_VUmLtjQ01xUxn1d0kgTfyZxTgr9kAbamWKQk,1728
 pulp_ansible/tests/functional/api/git/test_sync.py,sha256=DLYB2CJELz6IpEfbVLm1bLMjTcHmdeZ9NeETdhlId5c,6354
 pulp_ansible/tests/functional/api/role/__init__.py,sha256=zfzTtnHbggPn45K_BOt_UGw89qYGrS-FFsU7SbaSPqw,68
 pulp_ansible/tests/functional/api/role/test_crud_distribution.py,sha256=ws-uf1NZ9ozpAbeo0KJQOaCrGYmMSu4fYh2__gfmmps,3377
 pulp_ansible/tests/functional/api/role/test_crud_remote.py,sha256=fQqIk2hc5jz-xcepP9qNWO_tpvuq8jpX2oLLOpbmjTQ,1816
-pulp_ansible/tests/functional/api/role/test_sync.py,sha256=JIIcCLk6lR7ySyHvKMS0Pwt5iNbCZLRICiRvRHi03Rg,1622
+pulp_ansible/tests/functional/api/role/test_sync.py,sha256=StiOo1XpDmyPy3mTbItSLPDXskykZE6f0zRiSBICFlk,1991
 pulp_ansible/tests/functional/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_ansible/tests/functional/cli/test_collection_download_count.py,sha256=jG6hW40k_bH-gpPV2mnpvSJm0FXPkjxFbOCnWaZOPKI,3499
 pulp_ansible/tests/functional/cli/test_collection_install.py,sha256=n0lQ-SkrbX4etsvjYjzs4z81gqZvtb84qo_Ph7N5Z2E,3772
@@ -167,9 +168,9 @@ pulp_ansible/tests/unit/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 pulp_ansible/tests/unit/migrations/conftest.py,sha256=61n56aJuwEuAcUS27xnmnEDx6Ie7M5zxh851doWm7Ok,438
 pulp_ansible/tests/unit/migrations/test_0057_collection_version_sha256_migrate.py,sha256=NmU-frZNO1qHvhdxfw-bwPTEkqN4Wdc3dEs9dWME47o,2174
 pulp_ansible/tests/unit/migrations/test_x_repo_search_migration.py,sha256=IrC_V_Gss4nqhkdL-60upcEzGcz8IsiI2d-MfUtFY-g,657
-pulp_ansible-0.29.1.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pulp_ansible-0.29.1.dist-info/METADATA,sha256=z6rjQU_vE0Cjz_gqaP0w4llWBymaPHJWqONEe7Nx1nE,3125
-pulp_ansible-0.29.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pulp_ansible-0.29.1.dist-info/entry_points.txt,sha256=6PFqCdT7Yn7U5MlioYRsyyWbJDcZI2aAJuzc7yXHqGk,119
-pulp_ansible-0.29.1.dist-info/top_level.txt,sha256=5Rrg5DSM_F9wH8vu8Fxjb5EmroC-I8RVKp05fhXH6kQ,13
-pulp_ansible-0.29.1.dist-info/RECORD,,
+pulp_ansible-0.29.3.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pulp_ansible-0.29.3.dist-info/METADATA,sha256=R4Ms9JM3R9aTLb94bGxKtPjzG-tcc2_OYguUZwtLrr8,3125
+pulp_ansible-0.29.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pulp_ansible-0.29.3.dist-info/entry_points.txt,sha256=6PFqCdT7Yn7U5MlioYRsyyWbJDcZI2aAJuzc7yXHqGk,119
+pulp_ansible-0.29.3.dist-info/top_level.txt,sha256=5Rrg5DSM_F9wH8vu8Fxjb5EmroC-I8RVKp05fhXH6kQ,13
+pulp_ansible-0.29.3.dist-info/RECORD,,