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

win_slurp: Small cleanup (#21363)

Browse source 
* win_slurp: Small cleanup

Included changes:
- Rewriting the parameter handling (aliases and type)
- Modified the $result hash for both Exit-Json and Fail-Json
- Changed the Test-Path statement

* Revert to original formatting
This commit is contained in:
Dag Wieers 2017-02-24 07:38:17 +01:00 committed by Matt Davis
parent a64fb3eebf
commit 371f9fa90d
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/ansible/modules/windows/slurp.ps1
View file

@ -17,30 +17,25 @@
# WANT_JSON # WANT_JSON
# POWERSHELL_COMMON # POWERSHELL_COMMON
$params = Parse-Args $args $true; $params = Parse-Args $args -supports_check_mode $true;
$src = Get-AnsibleParam -obj $params -name "src" -type "path" -aliases "path" -failifempty $true;
$src = Get-Attr $params "src" (Get-Attr $params "path" $FALSE); $result = @{
If (-not $src) changed = $false;
{
Fail-Json (New-Object psobject) "missing required argument: src";
} }
If (Test-Path -PathType Leaf $src) If (Test-Path -Path $src -PathType Leaf)
{ {
$bytes = [System.IO.File]::ReadAllBytes($src); $bytes = [System.IO.File]::ReadAllBytes($src);
$content = [System.Convert]::ToBase64String($bytes); $result.content = [System.Convert]::ToBase64String($bytes);
$result = New-Object psobject @{ $result.encoding = "base64";
changed = $false
encoding = "base64"
content = $content
};
Exit-Json $result; Exit-Json $result;
} }
ElseIf (Test-Path -PathType Container $src) ElseIf (Test-Path -Path $src -PathType Container)
{ {
Fail-Json (New-Object psobject) ("is a directory: " + $src); Fail-Json $result "Path $src is a directory";
} }
Else Else
{ {
Fail-Json (New-Object psobject) ("file not found: " + $src); Fail-Json $result "Path $src is not found";
} }