cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Internally redirect win modules to collection name (#68317)

Browse source 
* Internally redirect win modules to collection name

* Added comment for how this should be fixed in a subsystem plugin

* add collection plugins for base tests
This commit is contained in:
Jordan Borean 2020-03-19 08:41:17 +10:00 committed by Matt Martz
parent 2c7f8bf586
commit aaf575f0b2
8 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/plugins/action/__init__.py
View file

@ -165,14 +165,21 @@ class ActionBase(with_metaclass(ABCMeta, object)):
# Check to determine if PowerShell modules are supported, and apply
# some fixes (hacks) to module name + args.
if mod_type == '.ps1':
# win_stat, win_file, and win_copy are not just like their
# FIXME: This should be temporary and moved to an exec subsystem plugin where we can define the mapping
# for each subsystem.
win_collection = 'ansible.windows'
# async_status, win_stat, win_file, win_copy, and win_ping are not just like their
# python counterparts but they are compatible enough for our
# internal usage
if module_name in ('stat', 'file', 'copy') and self._task.action != module_name:
module_name = 'win_%s' % module_name
if module_name in ('stat', 'file', 'copy', 'ping') and self._task.action != module_name:
module_name = '%s.win_%s' % (win_collection, module_name)
elif module_name in ['async_status']:
module_name = '%s.%s' % (win_collection, module_name)
# Remove extra quotes surrounding path parameters before sending to module.
if module_name in ('win_stat', 'win_file', 'win_copy', 'slurp') and module_args and hasattr(self._connection._shell, '_unquote'):
if module_name.split('.')[-1] in ['win_stat', 'win_file', 'win_copy', 'slurp'] and module_args and \
hasattr(self._connection._shell, '_unquote'):
for key in ('src', 'dest', 'path'):
if key in module_args:
module_args[key] = self._connection._shell._unquote(module_args[key])

6
lib/ansible/plugins/action/wait_for_connection.py
View file

@ -88,11 +88,7 @@ class ActionModule(ActionBase):
except AttributeError:
pass
# Use win_ping on winrm/powershell, else use ping
if getattr(self._connection._shell, "_IS_WINDOWS", False):
ping_result = self._execute_module(module_name='win_ping', module_args=dict(), task_vars=task_vars)
else:
ping_result = self._execute_module(module_name='ping', module_args=dict(), task_vars=task_vars)
ping_result = self._execute_module(module_name='ping', module_args=dict(), task_vars=task_vars)
# Test module output
if ping_result['ping'] != 'pong':

4
test/lib/ansible_test/_data/playbooks/windows_coverage_teardown.yml
View file

@ -2,10 +2,6 @@
- name: collect the coverage files from the Windows host
hosts: windows
gather_facts: no
# The collections keyword is required to allow fetch to work.
# See: https://github.com/ansible/ansible/issues/68269
collections:
- ansible.windows
tasks:
- name: make sure all vars have been set
assert:

1
test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/modules/async_status.ps1 Symbolic link
View file

@ -0,0 +1 @@
../../../../../../plugins/modules/async_status.ps1

1
test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/modules/win_copy.ps1 Symbolic link
View file

@ -0,0 +1 @@
../../../../../../plugins/modules/win_copy.ps1

1
test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/modules/win_copy.py Symbolic link
View file

@ -0,0 +1 @@
../../../../../../plugins/modules/win_copy.py

1
test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/modules/win_stat.ps1 Symbolic link
View file

@ -0,0 +1 @@
../../../../../../plugins/modules/win_stat.ps1

1
test/support/windows-integration/collections/ansible_collections/ansible/windows/plugins/modules/win_stat.py Symbolic link
View file

@ -0,0 +1 @@
../../../../../../plugins/modules/win_stat.py