Fix module loading for Windows jobs5.2.2

The recent security fix that caused loading ansible.bultin.command
to load the normal command module was a little too aggressive since
the same mechanism is used by Ansible to load Windows powershell
support code, which is under the Ansible.ModuleUtils.* hierarchy.

This would result in an error from Ansible when attempting to run
the setup playbook:

  Could not find imported module support code for 'Ansible.ModuleUtils.Legacy'"'

This is corrected by reducing the scope of the mutation to just
ansible.builtin and ansible.legacy.

Change-Id: I70e9481478a3326692cb848ce0782f5331dc4758

1 files changed, 6 insertions, 2 deletions

diff --git a/zuul/ansible/base/callback/zuul_json.py b/zuul/ansible/base/callback/zuul_json.py
index 6b8b957bb..1d7059871 100644
--- a/zuul/ansible/base/callback/zuul_json.py
+++ b/zuul/ansible/base/callback/zuul_json.py
@@ -220,13 +220,17 @@ orig_find_plugin = PluginLoader.find_plugin
 
 
 def mp_get(self, name, *args, **kwargs):
-    name = name.rsplit('.', 1)[-1]
+    if (name.startswith('ansible.builtin.') or
+        name.startswith('ansible.legacy.')):
+        name = name.rsplit('.', 1)[-1]
     ret = orig_get(self, name, *args, **kwargs)
     return ret
 
 
 def mp_find_plugin(self, name, *args, **kwargs):
-    name = name.rsplit('.', 1)[-1]
+    if (name.startswith('ansible.builtin.') or
+        name.startswith('ansible.legacy.')):
+        name = name.rsplit('.', 1)[-1]
     ret = orig_find_plugin(self, name, *args, **kwargs)
     return ret