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

try to capture better winrm/put_file error (#70508) (#70570)

Browse source 
* try to capture better winrm/put_file error

fixes #70361

* Update lib/ansible/plugins/connection/winrm.py

Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com>
Co-authored-by: Matt Davis <nitzmahone@users.noreply.github.com>
(cherry picked from commit 8789d7968d)
This commit is contained in:
Brian Coca 2020-07-17 15:49:11 -04:00 committed by GitHub
parent 5ea6de4e7d
commit 827c47d9bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/better_winrm_putfile_error.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- winrm - preserve winrm forensic data on put_file failures

9
lib/ansible/plugins/connection/winrm.py
View file

@ -616,9 +616,16 @@ class Connection(ConnectionBase):
if result.status_code != 0: if result.status_code != 0:
raise AnsibleError(to_native(result.std_err)) raise AnsibleError(to_native(result.std_err))
try:
put_output = json.loads(result.std_out) put_output = json.loads(result.std_out)
remote_sha1 = put_output.get("sha1") except ValueError:
# stdout does not contain a valid response
stderr = to_bytes(result.std_err, encoding='utf-8')
if stderr.startswith(b"#< CLIXML"):
stderr = _parse_clixml(stderr)
raise AnsibleError('winrm put_file failed; \nstdout: %s\nstderr %s' % (to_native(result.std_out), to_native(stderr)))
remote_sha1 = put_output.get("sha1")
if not remote_sha1: if not remote_sha1:
raise AnsibleError("Remote sha1 was not returned") raise AnsibleError("Remote sha1 was not returned")