Update glue

.github/workflows/test.yml

@@ -18,13 +18,13 @@ jobs:
       matrix:
         include:
           - python: "3.11"
-            ansible: "stable-2.18"
+            ansible: "stable-2.19"
             lower_bounds: true
             image_tag: "latest"
           - python: "3.13"
-            ansible: "stable-2.19"
-          - python: "3.14"
             ansible: "stable-2.20"
+          - python: "3.14"
+            ansible: "stable-2.21"
             image_tag: "nightly"
             lower_bounds: true
     steps:

meta/runtime.yml

@@ -43,5 +43,5 @@ action_groups:
   - task
   - user
   - x509_cert_guard
-requires_ansible: '>=2.16.0,<2.21'
+requires_ansible: '>=2.16.0,<2.22'
 ...

plugins/module_utils/pulp_glue.py

@@ -10,8 +10,8 @@
 
 from ansible.module_utils.basic import AnsibleModule, env_fallback, missing_required_lib
 
-GLUE_VERSION_SPEC = ">=0.29.2,<0.37"
-GLUE_DEB_VERSION_SPEC = ">=0.3.0,<0.4"
+GLUE_VERSION_SPEC = ">=0.29.2,<0.40"
+GLUE_DEB_VERSION_SPEC = ">=0.3.0,<0.5"
 
 
 def assert_version(spec, version, name):
@@ -23,7 +23,11 @@ def assert_version(spec, version, name):
     from packaging.requirements import SpecifierSet
     from pulp_glue.common import __version__ as pulp_glue_version
     from pulp_glue.common.context import PulpContext, PulpException, PulpNoWait
-    from pulp_glue.common.openapi import BasicAuthProvider
+
+    if SpecifierSet(">=0.38").contains(pulp_glue_version):
+        from pulp_glue.common.authentication import BasicAuthProvider
+    else:
+        from pulp_glue.common.openapi import BasicAuthProvider
 
     assert_version(GLUE_VERSION_SPEC, pulp_glue_version, "pulp-glue")
     PULP_CLI_IMPORT_ERR = None

plugins/modules/ansible_sync.py

@@ -113,11 +113,17 @@ def main():
         repository_version = repository["latest_version_href"]
         # In check_mode, assume nothing changed
         if not module.check_mode:
-            sync_task = repository_ctx.sync(body=payload)
-
-            if sync_task["created_resources"]:
+            old_repository_version = repository_version
+            sync_result = repository_ctx.sync(body=payload)
+
+            if "content_summary" in sync_result:
+                # Looks like a repository version.
+                repository_version = sync_result["pulp_href"]
+            elif sync_result["created_resources"]:
+                # Assume it's a task.
+                repository_version = sync_result["created_resources"][0]
+            if old_repository_version != repository_version:
                 module.set_changed()
-                repository_version = sync_task["created_resources"][0]
 
         module.set_result("repository_version", repository_version)
 

plugins/modules/container_sync.py

@@ -98,11 +98,17 @@ def main():
         repository_version = repository["latest_version_href"]
         # In check_mode, assume nothing changed
         if not module.check_mode:
-            sync_task = repository_ctx.sync(body=payload)
-
-            if sync_task["created_resources"]:
+            old_repository_version = repository_version
+            sync_result = repository_ctx.sync(body=payload)
+
+            if "content_summary" in sync_result:
+                # Looks like a repository version.
+                repository_version = sync_result["pulp_href"]
+            elif sync_result["created_resources"]:
+                # Assume it's a task.
+                repository_version = sync_result["created_resources"][0]
+            if old_repository_version != repository_version:
                 module.set_changed()
-                repository_version = sync_task["created_resources"][0]
 
         module.set_result("repository_version", repository_version)
 

plugins/modules/deb_sync.py

@@ -116,11 +116,17 @@ def main():
         repository_version = repository["latest_version_href"]
         # In check_mode, assume nothing changed
         if not module.check_mode:
-            sync_task = repository_ctx.sync(body=payload)
-
-            if sync_task["created_resources"]:
+            old_repository_version = repository_version
+            sync_result = repository_ctx.sync(body=payload)
+
+            if "content_summary" in sync_result:
+                # Looks like a repository version.
+                repository_version = sync_result["pulp_href"]
+            elif sync_result["created_resources"]:
+                # Assume it's a task.
+                repository_version = sync_result["created_resources"][0]
+            if old_repository_version != repository_version:
                 module.set_changed()
-                repository_version = sync_task["created_resources"][0]
 
         module.set_result("repository_version", repository_version)
 

plugins/modules/file_sync.py

@@ -105,11 +105,17 @@ def main():
         repository_version = repository["latest_version_href"]
         # In check_mode, assume nothing changed
         if not module.check_mode:
-            sync_task = repository_ctx.sync(body=payload)
-
-            if sync_task["created_resources"]:
+            old_repository_version = repository_version
+            sync_result = repository_ctx.sync(body=payload)
+
+            if "content_summary" in sync_result:
+                # Looks like a repository version.
+                repository_version = sync_result["pulp_href"]
+            elif sync_result["created_resources"]:
+                # Assume it's a task.
+                repository_version = sync_result["created_resources"][0]
+            if old_repository_version != repository_version:
                 module.set_changed()
-                repository_version = sync_task["created_resources"][0]
 
         module.set_result("repository_version", repository_version)
 

plugins/modules/python_sync.py

@@ -92,11 +92,17 @@ def main():
         repository_version = repository["latest_version_href"]
         # In check_mode, assume nothing changed
         if not module.check_mode:
-            sync_task = repository_ctx.sync(body=payload)
-
-            if sync_task["created_resources"]:
+            old_repository_version = repository_version
+            sync_result = repository_ctx.sync(body=payload)
+
+            if "content_summary" in sync_result:
+                # Looks like a repository version.
+                repository_version = sync_result["pulp_href"]
+            elif sync_result["created_resources"]:
+                # Assume it's a task.
+                repository_version = sync_result["created_resources"][0]
+            if old_repository_version != repository_version:
                 module.set_changed()
-                repository_version = sync_task["created_resources"][0]
 
         module.set_result("repository_version", repository_version)
 

plugins/modules/rpm_sync.py

@@ -155,11 +155,17 @@ def main():
         repository_version = repository["latest_version_href"]
         # In check_mode, assume nothing changed
         if not module.check_mode:
-            sync_task = repository_ctx.sync(body=payload)
-
-            if sync_task["created_resources"]:
+            old_repository_version = repository_version
+            sync_result = repository_ctx.sync(body=payload)
+
+            if "content_summary" in sync_result:
+                # Looks like a repository version.
+                repository_version = sync_result["pulp_href"]
+            elif sync_result["created_resources"]:
+                # Assume it's a task.
+                repository_version = sync_result["created_resources"][0]
+            if old_repository_version != repository_version:
                 module.set_changed()
-                repository_version = sync_task["created_resources"][0]
 
         module.set_result("repository_version", repository_version)
 

requirements-lint.txt

@@ -1,4 +1,4 @@
-ansible
+ansible-core
 black
 galaxy-importer
 isort

requirements-test.txt

@@ -1,6 +1,7 @@
-pulp-glue<0.37,>=0.29.2
-pulp-glue-deb<0.4.0,>=0.3.0
+pulp-glue<0.40,>=0.29.2
+pulp-glue-deb<0.5,>=0.3.0
 
+ansible-core
 ansible_runner
 flake8
 pylint