win_uri: stop output from mixing with module result (#48140)

(cherry picked from commit 8a9d7b3695)
pull/48365/head
Jordan Borean 6 years ago committed by Toshio Kuratomi
parent d12dcfc3f6
commit 90fe1be33a

@ -0,0 +1,2 @@
bugfixes:
- win_uri - stop junk output from being returned to Ansible - https://github.com/ansible/ansible/issues/47998

@ -231,7 +231,7 @@ if ($return_content -or $dest) {
$resp_st.Close() $resp_st.Close()
if ($return_content) { if ($return_content) {
$memory_st.Seek(0, [System.IO.SeekOrigin]::Begin) $memory_st.Seek(0, [System.IO.SeekOrigin]::Begin) > $null
$content_bytes = $memory_st.ToArray() $content_bytes = $memory_st.ToArray()
$result.content = [System.Text.Encoding]::UTF8.GetString($content_bytes) $result.content = [System.Text.Encoding]::UTF8.GetString($content_bytes)
if ($result.ContainsKey("content_type") -and $result.content_type -Match ($JSON_CANDIDATES -join '|')) { if ($result.ContainsKey("content_type") -and $result.content_type -Match ($JSON_CANDIDATES -join '|')) {
@ -244,7 +244,7 @@ if ($return_content -or $dest) {
} }
if ($dest) { if ($dest) {
$memory_st.Seek(0, [System.IO.SeekOrigin]::Begin) $memory_st.Seek(0, [System.IO.SeekOrigin]::Begin) > $null
$changed = $true $changed = $true
if (Test-AnsiblePath -Path $dest) { if (Test-AnsiblePath -Path $dest) {
@ -260,7 +260,7 @@ if ($return_content -or $dest) {
$result.changed = $changed $result.changed = $changed
if ($changed -and (-not $check_mode)) { if ($changed -and (-not $check_mode)) {
$memory_st.Seek(0, [System.IO.SeekOrigin]::Begin) $memory_st.Seek(0, [System.IO.SeekOrigin]::Begin) > $null
$file_stream = [System.IO.File]::Create($dest) $file_stream = [System.IO.File]::Create($dest)
try { try {
$memory_st.CopyTo($file_stream) $memory_st.CopyTo($file_stream)

Loading…
Cancel
Save