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

pulp_ansible/app/__init__.py

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

pulp_ansible/app/migrations/0057_collectionversion_sha256_migrate.py

@@ -16,11 +16,11 @@ def add_sha256_to_current_models(apps, schema_editor):
 
     for collection_version in (
         CollectionVersion.objects.prefetch_related(
-            "content_artifacts", "content_artifacts__artifact"
+            "contentartifact_set", "contentartifact_set__artifact"
         )
         .filter(sha256="")
         .only("pk", "sha256")
-        .iterator()
+        .iterator(chunk_size=2000)
     ):
         content_artifact = collection_version.contentartifact_set.get()
         if content_artifact.artifact:

pulp_ansible/app/serializers.py

@@ -665,22 +665,6 @@ 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

@@ -77,6 +77,13 @@ from pulp_ansible.app.tasks.utils import (
     parse_metadata,
 )
 
+
+try:
+    from pulpcore.plugin.serializers import RepositoryVersionSerializer
+except ImportError:
+    RepositoryVersionSerializer = None
+
+
 log = logging.getLogger(__name__)
 
 aget_url = sync_to_async(get_url)
@@ -215,26 +222,25 @@ def sync(remote_pk, repository_pk, mirror, optimize):
     remote = CollectionRemote.objects.get(pk=remote_pk)
     repository = AnsibleRepository.objects.get(pk=repository_pk)
 
-    is_repo_remote = False
-    if repository.remote:
-        is_repo_remote = remote.pk == repository.remote.pk
+    is_repo_remote = repository.remote is not None and remote.pk == repository.remote.pk
 
     if not remote.url:
         raise ValueError(_("A CollectionRemote must have a 'url' specified to synchronize."))
 
     first_stage = CollectionSyncFirstStage(remote, repository, is_repo_remote, optimize)
-    if first_stage.should_sync is False:
+    if first_stage.should_sync:
+        d_version = AnsibleDeclarativeVersion(first_stage, repository, mirror=mirror)
+        repository_version = d_version.create()
+
+        if repository_version is not None:
+            repository.last_synced_metadata_time = first_stage.last_synced_metadata_time
+            repository.save(update_fields=["last_synced_metadata_time"])
+            if RepositoryVersionSerializer is not None:
+                return RepositoryVersionSerializer(
+                    instance=repository_version, context={"request": None}
+                ).data
+    else:
         log.debug(_("no-op: remote wasn't updated since last sync."))
-        return
-
-    d_version = AnsibleDeclarativeVersion(first_stage, repository, mirror=mirror)
-    repo_version = d_version.create()
-
-    if not repo_version:
-        return
-
-    repository.last_synced_metadata_time = first_stage.last_synced_metadata_time
-    repository.save(update_fields=["last_synced_metadata_time"])
 
 
 def import_collection(

pulp_ansible/app/tasks/git.py

@@ -18,6 +18,12 @@ from pulp_ansible.app.tasks.collections import (
     AnsibleContentSaver,
 )
 
+try:
+    from pulpcore.plugin.serializers import RepositoryVersionSerializer
+except ImportError:
+    RepositoryVersionSerializer = None
+
+
 log = logging.getLogger(__name__)
 
 
@@ -47,7 +53,11 @@ def synchronize(remote_pk, repository_pk, mirror=False):
     )
     first_stage = GitFirstStage(remote)
     d_version = GitDeclarativeVersion(first_stage, repository, mirror=mirror)
-    return d_version.create()
+    repository_version = d_version.create()
+    if RepositoryVersionSerializer is not None and repository_version:
+        return RepositoryVersionSerializer(
+            instance=repository_version, context={"request": None}
+        ).data
 
 
 class GitDeclarativeVersion(DeclarativeVersion):

pulp_ansible/app/tasks/roles.py

@@ -16,6 +16,11 @@ from pulp_ansible.app.constants import PAGE_SIZE
 from pulp_ansible.app.models import AnsibleRepository, RoleRemote, Role
 from pulp_ansible.app.tasks.utils import get_api_version, get_page_url, parse_metadata
 
+try:
+    from pulpcore.plugin.serializers import RepositoryVersionSerializer
+except ImportError:
+    RepositoryVersionSerializer = None
+
 
 log = logging.getLogger(__name__)
 
@@ -50,7 +55,11 @@ def synchronize(remote_pk, repository_pk, mirror=False):
     )
     first_stage = RoleFirstStage(remote)
     d_version = DeclarativeVersion(first_stage, repository, mirror=mirror)
-    return d_version.create()
+    repository_version = d_version.create()
+    if RepositoryVersionSerializer is not None and repository_version:
+        return RepositoryVersionSerializer(
+            instance=repository_version, context={"request": None}
+        ).data
 
 
 class RoleFirstStage(Stage):

pulp_ansible/tests/functional/api/test_export_import.py

@@ -18,7 +18,6 @@ from pulp_ansible.tests.functional.constants import ANSIBLE_FIXTURE_URL
 
 
 pytestmark = [
-    pytest.mark.skipif(settings.DOMAIN_ENABLED, reason="Domains do not support export."),
     pytest.mark.skipif(
         "/tmp" not in settings.ALLOWED_EXPORT_PATHS,
         reason="Cannot run export-tests unless /tmp is in ALLOWED_EXPORT_PATHS "

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-ansible
-Version: 0.28.3
+Version: 0.29.1
 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
@@ -20,8 +20,8 @@ License-File: LICENSE
 Requires-Dist: galaxy_importer<0.5,>=0.4.27
 Requires-Dist: GitPython<3.2,>=3.1.24
 Requires-Dist: jsonschema<4.26,>=4.9
-Requires-Dist: Pillow<11.4,>=10.3
-Requires-Dist: pulpcore<3.100,>=3.63.0
+Requires-Dist: Pillow<12.2,>=10.3
+Requires-Dist: pulpcore<3.115,>=3.63.0
 Requires-Dist: PyYAML<7.0,>=6.0.2
 Requires-Dist: semantic_version<2.11,>=2.9
 Dynamic: license-file

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

@@ -1,6 +1,6 @@
 pulp_ansible/__init__.py,sha256=WXL3JyOZzh4tALN4OBNgqj412O2LXVr8iYSn14Av0_o,67
 pulp_ansible/pytest_plugin.py,sha256=hi9crI7QGghXCItNx27pW6KoXMzZqhAqAUstpJrsmlA,9105
-pulp_ansible/app/__init__.py,sha256=jYEeRCAWn3Dqzmuv8IfFm_r3Zvr2UiYeE7qBEymSow8,308
+pulp_ansible/app/__init__.py,sha256=DlQqEittrF2Jo8PViJ6N1-Le8POHexS_JGvJDWp96ok,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 +8,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=28lwMvLa3D-i4cekaIx50ffHUU78OfoDBlwdcTSTWyI,36670
+pulp_ansible/app/serializers.py,sha256=5_NM1tpMLrZ2QsNCWanaHhscGCS_QDLubXCTh5xwm8E,35981
 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
@@ -84,7 +84,7 @@ pulp_ansible/app/migrations/0053_collectiondownloadcount.py,sha256=XK3FJf2P9XX7i
 pulp_ansible/app/migrations/0054_split_collection_version_numbers.py,sha256=QdJkJ48A_ZcgD2WyyRrAdPMmQe8OWkEgs4FtMFa-rDg,2369
 pulp_ansible/app/migrations/0055_alter_collectionversion_version_alter_role_version.py,sha256=g_4p81Owqi6sY0-KAv_mSPya1MNlj8pbJkMpHZ4hLpc,904
 pulp_ansible/app/migrations/0056_collectionversion_sha256.py,sha256=6gLDAEcULJag1_L3jpbmrA42EeP5wsWhlq0VALK_Lpg,487
-pulp_ansible/app/migrations/0057_collectionversion_sha256_migrate.py,sha256=VnFl99Wywslr53VKwfd6RNBB5HEBaUCsqX0awEVOkMU,2395
+pulp_ansible/app/migrations/0057_collectionversion_sha256_migrate.py,sha256=MoMVQ2wnSmJqu826yqCKf3VGXmJCCiAXbUluWO8wMAY,2414
 pulp_ansible/app/migrations/0058_fix_0056_regression.py,sha256=VTmiG_VlpC6wXb4R28TDC4rbd1KLTuPItgzcrq0R28w,1021
 pulp_ansible/app/migrations/0059_collectionversion_unique_sha256.py,sha256=_4MAElCkv5OUjv7v9eL43h9PhtLl85vOfMiTZKEGD-Q,1291
 pulp_ansible/app/migrations/0060_remove_collectionversion_unique_is_highest_and_more.py,sha256=GDaBq6YPznAxjObBmP3YRHsdUtUjTAHpnShpkICe9J8,586
@@ -97,13 +97,13 @@ 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=J8cC9zLJYRvYEkl6n4sAePLKrvoDrS9s4aibNxSTxEA,50709
+pulp_ansible/app/tasks/collections.py,sha256=NrYz79x_woRJOXzpEnNj8xPngLNkPykUIO9RMbbVKxQ,51048
 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
-pulp_ansible/app/tasks/git.py,sha256=J-AO8avMf0Jx0xDf3_eVzDYao2Wop3JnfbW7my7TtHo,2991
+pulp_ansible/app/tasks/git.py,sha256=GjkEWH-SnBHHTWOhZjRVIMDG8KhrGBJ1E41ba74Ngpo,3340
 pulp_ansible/app/tasks/mark.py,sha256=yO1a_jPAC-Um5ZsTr0J6HGR1lBm0XcGV5SOu2iEsvJw,2292
-pulp_ansible/app/tasks/roles.py,sha256=xi7S8IXmUf77YEJ_lLHWw4GVbJvaDK589cBeXeumQy0,5506
+pulp_ansible/app/tasks/roles.py,sha256=ohieaXY4DRyw5mzYyem8s42P53fgc165uz5g3SUiY90,5854
 pulp_ansible/app/tasks/signature.py,sha256=JxMNcOS24Mug8RL1eNlObsZZi4plDJDwac32aSobzhk,7497
 pulp_ansible/app/tasks/test_tasks.py,sha256=GkUH7MwwsT-rTtEbvv7UjQyvT7ZrWehb2sO1xgUqGVc,6978
 pulp_ansible/app/tasks/upload.py,sha256=X6lnQoKVlyOlb_hDMkOBc4oqxVqLeTtA-Q0mxrfxC9A,2972
@@ -117,7 +117,7 @@ pulp_ansible/tests/functional/constants.py,sha256=FFcqEvmHWruxdogf4uCFG2EjukLbzT
 pulp_ansible/tests/functional/utils.py,sha256=R-AtOclbV7WVmq4XhPdmWi7mgy3wmw_DK76uOCP_0KI,945
 pulp_ansible/tests/functional/api/__init__.py,sha256=Ta9oLgSwgsaC_7uiGBrJqduMwckzRv-W_Rfcl9UOZNY,65
 pulp_ansible/tests/functional/api/test_domain.py,sha256=a6MfKkk-9u77iViGX9F-lgkogyy56jAvZlygbYRknUM,2368
-pulp_ansible/tests/functional/api/test_export_import.py,sha256=sEK-ps6-SbSktvYt2slWW4NU9PsOCFpjmABv6Yp7KM8,8062
+pulp_ansible/tests/functional/api/test_export_import.py,sha256=kow9_CxMEpVgAetb69gFhgQlYgWO6PzJhwJdvloXjIs,7972
 pulp_ansible/tests/functional/api/test_rbac.py,sha256=amzg4CK_JXhKe_cK5KBNQRdnNGNT7AG1_PPj9cC83cg,19362
 pulp_ansible/tests/functional/api/collection/__init__.py,sha256=pSlDs09OjDZCGKAf_SttWeyiCUXT-Fady4ywZ9sppQo,74
 pulp_ansible/tests/functional/api/collection/test_copy_and_move.py,sha256=Oih3fMcLIh9ZRspO-Wz3BQ0GhomRXRhzVv-8bqchj20,10094
@@ -167,9 +167,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.28.3.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pulp_ansible-0.28.3.dist-info/METADATA,sha256=f9OeQy6QCFytDpjGNCtblU1h9-wsj1C0EAjJEmrJNOU,3125
-pulp_ansible-0.28.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pulp_ansible-0.28.3.dist-info/entry_points.txt,sha256=6PFqCdT7Yn7U5MlioYRsyyWbJDcZI2aAJuzc7yXHqGk,119
-pulp_ansible-0.28.3.dist-info/top_level.txt,sha256=5Rrg5DSM_F9wH8vu8Fxjb5EmroC-I8RVKp05fhXH6kQ,13
-pulp_ansible-0.28.3.dist-info/RECORD,,
+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,,