Fix custom hostvars, error handling, version template (#5)

* Fix issue with user-defined hostvars not being saved to host inventory
file

* Fix issue with incorrect version tag being applied to new project
collections template

* Fix checks showing error on expected states where existing configuration
does not exist

Author: syndr

galaxy.yml

@@ -8,7 +8,7 @@ namespace: influxdata
 name: molecule
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.4.0
+version: 1.4.1
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

molecule/default/molecule.yml

@@ -14,21 +14,24 @@ platforms:
     systemd: True
     modify_image: False
     privileged: False
-    hostvars: {}
+    hostvars:
+      test_hostvar: test
   - name: docker-fedora39
     type: docker
     image: geerlingguy/docker-fedora39-ansible:latest
     systemd: True
     modify_image: False
     privileged: False
-    hostvars: {}
+    hostvars:
+      test_hostvar: test
   - name: docker-ubuntu2204
     type: docker
     image: geerlingguy/docker-ubuntu2204-ansible:latest
     systemd: True
     modify_image: False
     privileged: False
-    hostvars: {}
+    hostvars:
+      test_hostvar: test
 provisioner:
   name: ansible
   log: True

molecule/default/verify.yml

@@ -4,18 +4,10 @@
 - name: Verify
   hosts: molecule
   tasks:
-    - name: Load local host facts
-      ansible.builtin.setup:
-        gather_subset:
-          - '!all'
-          - '!min'
-          - local
-
-    - name: Load test data (example)
-      ansible.builtin.set_fact:
-        test_prepare_fact: "{{ ansible_local.molecule.test_prepare_fact }}"
-
-    - name: Add your verification tasks here
-      ansible.builtin.debug:
-        msg: "IE: For a 'users' role, check that the test user exists"
+    - name: Test hostvar exists
+      ansible.builtin.assert:
+        that:
+          - test_hostvar == "test"
+        fail_msg: "Custom hostvar not found! Possible issue with storing user-defined hostvars!"
+        success_msg: "Custom hostvar found!"
 

roles/init/templates/collections.yml.j2

@@ -5,8 +5,9 @@ collections:
 {% if init_collection_source == 'git' %}
   - name: git+{{ __init_collection_repository }}.git
     type: git
+    version: v{{ init_collection_version }}
 {% elif init_collection_source == 'galaxy' %}
   - name: {{ __init_collection_namespace }}.{{ __init_collection_name }}
-{% endif %}
     version: {{ init_collection_version }}
+{% endif %}
 

roles/platform/tasks/inventory.yml

@@ -7,7 +7,7 @@
       ansible.builtin.slurp:
         src: "{{ platform_molecule_ephemeral_directory }}/instance_config.yml"
       register: __platform_current_instance_config_b64
-      ignore_errors: true
+      failed_when: false
 
     - name: Decode instance configuration data
       ansible.builtin.set_fact:
@@ -54,15 +54,32 @@
         fail_msg: "Instance configuration for {{ platform_name }} failed! Check the platform configuration."
         success_msg: "Instance configuration for {{ platform_name }} is defined"
 
+    - name: Add user-specified hostvars to instance configuration
+      when:
+        - platform_molecule_cfg.hostvars is defined
+        - platform_molecule_cfg.hostvars is truthy
+      ansible.builtin.set_fact:
+        __platform_ansible_hostvars: "{{ __platform_ansible_hostvars | combine(platform_molecule_cfg.hostvars, recursive=true) }}"
+
     - name: 🪲 Current instance config
       ansible.builtin.debug:
         var: __platform_current_instance_config
         verbosity: 1
 
+    - name: 🪲 New instance config
+      ansible.builtin.debug:
+        var: __platform_new_instance_config
+        verbosity: 1
+
+    - name: 🪲 Ansible hostvars
+      ansible.builtin.debug:
+        var: __platform_ansible_hostvars
+        verbosity: 1
+
     - name: Instance name matching this already exists in configuration
       when:
         - __platform_current_instance_config is truthy
-        - platform_name in __platform_current_instance_config | map(attribute='instance') | list 
+        - platform_name in __platform_current_instance_config | map(attribute='instance') | list
       block:
         - name: Mark config update as unneeded
           ansible.builtin.set_fact:
@@ -89,16 +106,6 @@
           __platform_current_instance_config | rejectattr('instance', 'equalto', platform_name) | list }}"
         __platform_instance_config_update_needed: true
 
-- name: dump new instance config
-  ansible.builtin.debug:
-    var: __platform_new_instance_config
-  ignore_errors: true
-
-- name: dump current instance config
-  ansible.builtin.debug:
-    var: __platform_current_instance_config
-  ignore_errors: true
-
 - name: Write {{ platform_name }} instance config file
   when:
     - __platform_instance_config_update_needed
@@ -130,7 +137,7 @@
       ansible.builtin.slurp:
         src: "{{ platform_molecule_ephemeral_directory }}/inventory/molecule_inventory.yml"
       register: __platform_current_molecule_inventory_b64
-      ignore_errors: true
+      failed_when: false
 
     - name: Decode instance configuration data
       ansible.builtin.set_fact: