Merge branch 'devel' into fix/error-handle

.github/workflows/ci_standalone_versioned.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Set environment variables
         working-directory: galaxy_ng
         run: |
-          echo "OCI_ENV_PATH=${HOME}/work/ah_configuration/ah_configuration/oci_env" >> $GITHUB_ENV
+          echo "OCI_ENV_PATH=${GITHUB_WORKSPACE}/oci_env" >> $GITHUB_ENV
           echo "COMPOSE_INTERACTIVE_NO_CLI=1" >> $GITHUB_ENV
           echo "OCI_VERBOSE=1" >> $GITHUB_ENV
           echo "GH_DUMP_LOGS=1" >> $GITHUB_ENV

changelogs/fragments/bug_collection_delete.yml

@@ -0,0 +1,5 @@
+---
+bugfixes:
+  - Fixed an issue where if version was not specified in ah_collection and state=absent then the module will fail
+  - Fixed an issue where if the collection version has a '-' then it would not be referenced properly from the file path
+...

plugins/modules/ah_collection.py

@@ -142,8 +142,8 @@ def main():
     if auto_approve:
         if version:
             pass
-        else:
-            version = path.split("-")[-1].replace('.tar.gz', '')
+        elif path:
+            version = "-".join(path.split("-")[2:]).replace('.tar.gz', '')
 
     # Attempt to look up an existing item based on the provided data
     if version:

tests/playbooks/ah_configs/ah_collections.yml

@@ -18,6 +18,11 @@ ah_collections_overwrite:
     timeout: 180
     overwrite_existing: true
 
+ah_collections_delete:
+  - namespace: galaxy
+    name: galaxy
+    state: absent
+
 ah_git_collections:
   - collection_name: collection_test
     git_url: https://github.com/sean-m-sullivan/collection_test

tests/playbooks/testing_collections_playbook.yml

@@ -62,6 +62,12 @@
       vars:
         ah_collections: "{{ ah_collections_overwrite }}"
 
+    - name: Delete Collection
+      ansible.builtin.include_role:
+        name: collection
+      vars:
+        ah_collections: "{{ ah_collections_delete }}"
+
     - name: Publish Collections
       ansible.builtin.include_role:
         name: publish