Removed molecule ansible filters

molecule/constants.py

@@ -3,3 +3,5 @@
 
 RC_SUCCESS = 0
 RC_TIMEOUT = 3
+
+MOLECULE_HEADER = "# Molecule managed"

molecule/cookiecutter/scenario/driver/delegated/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/create.yml

@@ -28,6 +28,9 @@
 
         - name: Dump instance config
           copy:
-            content: "{{ instance_conf | to_json | from_json | molecule_to_yaml | molecule_header }}"
+            content: |
+              # Molecule managed
+
+              {{ instance_conf | to_json | from_json | to_yaml }}
             dest: "{{ molecule_instance_config }}"
 {%- endraw %}

molecule/cookiecutter/scenario/driver/delegated/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/destroy.yml

@@ -16,7 +16,10 @@
 
     - name: Dump instance config
       copy:
-        content: "{{ instance_conf | to_json | from_json | molecule_to_yaml | molecule_header }}"
+        content: |
+          # Molecule managed
+
+          {{ instance_conf | to_json | from_json | to_yaml }}
         dest: "{{ molecule_instance_config }}"
       when: server.changed | default(false) | bool
 {%- endraw %}

molecule/provisioner/ansible.py

@@ -596,7 +596,7 @@ def inventory(self):
                     "molecule_file": "{{ lookup('env', 'MOLECULE_FILE') }}",
                     "molecule_ephemeral_directory": "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}",
                     "molecule_scenario_directory": "{{ lookup('env', 'MOLECULE_SCENARIO_DIRECTORY') }}",
-                    "molecule_yml": "{{ lookup('file', molecule_file) | molecule_from_yaml }}",
+                    "molecule_yml": "{{ lookup('file', molecule_file) | from_yaml }}",
                     "molecule_instance_config": "{{ lookup('env', 'MOLECULE_INSTANCE_CONFIG') }}",
                     "molecule_no_log": "{{ lookup('env', 'MOLECULE_NO_LOG') or not "
                     "molecule_yml.provisioner.log|default(False) | bool }}",

molecule/test/unit/test_util.py

@@ -29,6 +29,7 @@
 import sh
 
 from molecule import util
+from molecule.constants import MOLECULE_HEADER
 
 colorama.init(autoreset=True)
 
@@ -233,7 +234,7 @@ def test_write_file(temp_dir):
 
 
 def molecule_prepender(content):
-    x = "# Molecule managed\n\nfoo bar"
+    x = f"{MOLECULE_HEADER}\nfoo bar"
 
     assert x == util.file_prepender("foo bar")
 

molecule/util.py

@@ -33,6 +33,7 @@
 import jinja2
 import yaml
 
+from molecule.constants import MOLECULE_HEADER
 from molecule.logger import get_logger
 
 LOG = get_logger(__name__)
@@ -164,7 +165,7 @@ def write_file(filename, content):
 
 def molecule_prepender(content):
     """Return molecule identification header."""
-    return "# Molecule managed\n\n" + content
+    return MOLECULE_HEADER + "\n\n" + content
 
 
 def file_prepender(filename):