ansible_mitogen: Respect ansible_facts.discovered_interpreter_python more

fixes #1097

ansible_mitogen/planner.py

@@ -216,9 +216,12 @@ class ScriptPlanner(BinaryPlanner):
     """
     def _rewrite_interpreter(self, path):
         """
-        Given the original interpreter binary extracted from the script's
+        Given the interpreter path (from the script's hashbang line), return
-        interpreter line, look up the associated `ansible_*_interpreter`
+        the desired interpreter path. This tries, in order
-        variable, render it and return it.
+
+        1. Look up & render the `ansible_*_interpreter` variable, if set
+        2. Look up the `discovered_interpreter_*` fact, if present
+        3. The unmodified path from the hashbang line.
 
         :param str path:
             Absolute path to original interpreter (e.g. '/usr/bin/python').
@@ -229,7 +232,8 @@ class ScriptPlanner(BinaryPlanner):
             involved here, the vanilla implementation uses it and that use is
             exploited in common playbooks.
         """
-        key = u'ansible_%s_interpreter' % os.path.basename(path).strip()
+        interpreter_name = os.path.basename(path).strip()
+        key = u'ansible_%s_interpreter' % interpreter_name
         try:
             template = self._inv.task_vars[key]
         except KeyError:
@@ -238,6 +242,14 @@ class ScriptPlanner(BinaryPlanner):
             configured_interpreter = self._inv.templar.template(template)
             return ansible_mitogen.utils.unsafe.cast(configured_interpreter)
 
+        key = u'discovered_interpreter_%s' % interpreter_name
+        try:
+            discovered_interpreter = self._inv.task_vars['ansible_facts'][key]
+        except KeyError:
+            pass
+        else:
+            return ansible_mitogen.utils.unsafe.cast(discovered_interpreter)
+
         return path
 
     def _get_interpreter(self):
@@ -253,7 +265,8 @@ class ScriptPlanner(BinaryPlanner):
         if arg:
             fragment += ' ' + arg
 
-        return fragment, path.startswith('python')
+        is_python = path.startswith('python')
+        return fragment, is_python
 
     def get_kwargs(self, **kwargs):
         interpreter_fragment, is_python = self._get_interpreter()

docs/changelog.rst

@@ -21,6 +21,8 @@ To avail of fixes in an unreleased version, please download a ZIP file
 Unreleased
 ----------
 
+* :gh:issue:`1097` Respect `ansible_facts.discovered_interpreter_python` when
+  executing non new-style modules (e.g. JSONARGS style, WANT_JSON style).
 
 
 v0.3.8 (2024-07-30)

tests/ansible/integration/module_utils/adjacent_to_role.yml

@@ -1,7 +1,7 @@
 # external2 is loaded from config path.
 # external1 is loaded from integration/module_utils/roles/modrole/module_utils/..
 
-- name: integration/module_utils/adjacent_to_playbook.yml
+- name: integration/module_utils/adjacent_to_role.yml
   hosts: test-targets
   roles:
   - modrole

tests/ansible/integration/module_utils/roles/modrole/library/uses_external3.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils import external3

tests/ansible/integration/module_utils/roles/overrides_modrole/library/uses_custom_known_hosts.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 
 import json
 import ansible.module_utils.basic

tests/ansible/lib/modules/custom_python_json_args_module.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # I am an Ansible Python JSONARGS module. I should receive an encoding string.
 
 json_arguments = """<<INCLUDE_ANSIBLE_MODULE_JSON_ARGS>>"""

tests/ansible/lib/modules/custom_python_os_getcwd.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # #591: call os.getcwd() before AnsibleModule ever gets a chance to fix up the
 # process environment.
 

tests/ansible/lib/modules/custom_python_want_json_module.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # I am an Ansible Python WANT_JSON module. I should receive a JSON-encoded file.
 
 import json