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

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

Browse source
This commit is contained in:
Jordan Borean 2018-11-06 11:10:03 +10:00 committed by GitHub
parent 8787c65b65
commit 8a9d7b3695
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/win_uri-junk-data.yaml Normal file
View file

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

6
lib/ansible/modules/windows/win_uri.ps1
View file

@ -239,7 +239,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 '|')) {
@ -252,7 +252,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) {
@ -268,7 +268,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)