psrp - do not display bootstrap wrapper for eachach task (#51779)
(cherry picked from commit 146a89b612
)
This commit is contained in:
parent
0708c80c40
commit
718e011168
2 changed files with 22 additions and 19 deletions
2
changelogs/fragments/psrp-display-exec-output.yaml
Normal file
2
changelogs/fragments/psrp-display-exec-output.yaml
Normal file
|
@ -0,0 +1,2 @@
|
|||
bugfixes:
|
||||
- psrp - do not display bootstrap wrapper for each module exec run
|
|
@ -255,14 +255,15 @@ class Connection(ConnectionBase):
|
|||
super(Connection, self).exec_command(cmd, in_data=in_data,
|
||||
sudoable=sudoable)
|
||||
|
||||
if cmd == "-" and not in_data.startswith(b"#!"):
|
||||
# The powershell plugin sets cmd to '-' when we are executing a
|
||||
# PowerShell script with in_data being the script to execute.
|
||||
script = in_data
|
||||
in_data = None
|
||||
display.vvv("PSRP: EXEC (via pipeline wrapper)",
|
||||
host=self._psrp_host)
|
||||
elif cmd == "-":
|
||||
if cmd.startswith(" ".join(_common_args) + " -EncodedCommand"):
|
||||
# This is a PowerShell script encoded by the shell plugin, we will
|
||||
# decode the script and execute it in the runspace instead of
|
||||
# starting a new interpreter to save on time
|
||||
b_command = base64.b64decode(cmd.split(" ")[-1])
|
||||
script = to_text(b_command, 'utf-16-le')
|
||||
in_data = to_text(in_data, errors="surrogate_or_strict", nonstring="passthru")
|
||||
|
||||
if in_data and in_data.startswith(u"#!"):
|
||||
# ANSIBALLZ wrapper, we need to get the interpreter and execute
|
||||
# that as the script - note this won't work as basic.py relies
|
||||
# on packages not available on Windows, once fixed we can enable
|
||||
|
@ -272,13 +273,13 @@ class Connection(ConnectionBase):
|
|||
# in_data = to_text(in_data)
|
||||
raise AnsibleError("cannot run the interpreter '%s' on the psrp "
|
||||
"connection plugin" % interpreter)
|
||||
elif cmd.startswith(" ".join(_common_args) + " -EncodedCommand"):
|
||||
# This is a PowerShell script encoded by the shell plugin, we will
|
||||
# decode the script and execute it in the runspace instead of
|
||||
# starting a new interpreter to save on time
|
||||
b_command = base64.b64decode(cmd.split(" ")[-1])
|
||||
script = to_text(b_command, 'utf-16-le')
|
||||
in_data = to_text(in_data, errors="surrogate_or_strict", nonstring="passthru")
|
||||
|
||||
# call build_module_command to get the bootstrap wrapper text
|
||||
bootstrap_wrapper = self._shell.build_module_command('', '', '')
|
||||
if bootstrap_wrapper == cmd:
|
||||
# Do not display to the user each invocation of the bootstrap wrapper
|
||||
display.vvv("PSRP: EXEC (via pipeline wrapper)")
|
||||
else:
|
||||
display.vvv("PSRP: EXEC %s" % script, host=self._psrp_host)
|
||||
else:
|
||||
# in other cases we want to execute the cmd as the script
|
||||
|
|
Loading…
Reference in a new issue