1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

fix Ansible.ModuleUtils.FileUtil to respect ErrorAction if running in a try/catch (#45451)

This commit is contained in:
Jordan Borean 2018-09-11 09:47:56 +10:00 committed by GitHub
parent c9c141fb6a
commit d4ce1b9f31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions

View file

@ -38,7 +38,16 @@ Function Get-AnsibleItem {
[Parameter(Mandatory=$true)][string]$Path
)
# Replacement for Get-Item
$file_attributes = [System.IO.File]::GetAttributes($Path)
try {
$file_attributes = [System.IO.File]::GetAttributes($Path)
} catch {
# if -ErrorAction SilentlyCotinue is set on the cmdlet and we failed to
# get the attributes, just return $null, otherwise throw the error
if ($ErrorActionPreference -ne "SilentlyContinue") {
throw $_
}
return $null
}
if ([Int32]$file_attributes -eq -1) {
throw New-Object -TypeName System.Management.Automation.ItemNotFoundException -ArgumentList "Cannot find path '$Path' because it does not exist."
} elseif ($file_attributes.HasFlag([System.IO.FileAttributes]::Directory)) {

View file

@ -96,5 +96,13 @@ Assert-Equals -actual $actual.FullName -expected C:\Windows
Assert-Equals -actual $actual.Attributes.HasFlag([System.IO.FileAttributes]::Directory) -expected $true
Assert-Equals -actual $actual.Exists -expected $true
# ensure Get-AnsibleItem doesn't fail in a try/catch and -ErrorAction SilentlyContinue - stop's a trap from trapping it
try {
$actual = Get-AnsibleItem -Path C:\fakepath -ErrorAction SilentlyContinue
} catch {
Fail-Json -obj $result -message "this should not fire"
}
Assert-Equals -actual $actual -expected $null
$result.data = "success"
Exit-Json -obj $result