starred/ansible
1
0
Fork 0
mirror of https://github.com/ansible/ansible.git synced 2026-08-03 08:03:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix up sanity problems

Browse Source
This commit is contained in:
Jordan Borean
2022-11-02 08:18:38 +10:00
parent 4ad02dc6e3
commit 6def4a3180
11 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ansible/executor/powershell/async_wrapper.ps1
+5 -5
View File
@@ -135,11 +135,11 @@ try {
# populate initial results before we send the async data to avoid result race
$result = @{
started = 1;
finished = 0;
results_file = $results_path;
ansible_job_id = $local_jid;
_ansible_suppress_tmpdir_delete = $true;
started = 1
finished = 0
results_file = $results_path
ansible_job_id = $local_jid
_ansible_suppress_tmpdir_delete = $true
ansible_async_watchdog_pid = $watchdog_pid
}
lib/ansible/module_utils/powershell/Ansible.ModuleUtils.Backup.psm1
+1 -1
View File
@@ -18,7 +18,7 @@ Function Backup-File {
Process {
$backup_path = $null
if (Test-Path -LiteralPath $path -PathType Leaf) {
$backup_path = "$path.$pid." + [DateTime]::Now.ToString("yyyyMMdd-HHmmss") + ".bak";
$backup_path = "$path.$pid." + [DateTime]::Now.ToString("yyyyMMdd-HHmmss") + ".bak"
Try {
Copy-Item -LiteralPath $path -Destination $backup_path
}
lib/ansible/module_utils/powershell/Ansible.ModuleUtils.Legacy.psm1
+5 -5
View File
@@ -354,16 +354,16 @@ Function Get-FileChecksum($path, $algorithm = 'sha1') {
$hash = $raw_hash.Hash.ToLower()
}
Else {
$fp = [System.IO.File]::Open($path, [System.IO.Filemode]::Open, [System.IO.FileAccess]::Read, [System.IO.FileShare]::ReadWrite);
$hash = [System.BitConverter]::ToString($sp.ComputeHash($fp)).Replace("-", "").ToLower();
$fp.Dispose();
$fp = [System.IO.File]::Open($path, [System.IO.Filemode]::Open, [System.IO.FileAccess]::Read, [System.IO.FileShare]::ReadWrite)
$hash = [System.BitConverter]::ToString($sp.ComputeHash($fp)).Replace("-", "").ToLower()
$fp.Dispose()
}
}
ElseIf (Test-Path -LiteralPath $path -PathType Container) {
$hash = "3";
$hash = "3"
}
Else {
$hash = "1";
$hash = "1"
}
return $hash
}
test/integration/targets/win_script/files/test_script_with_args.ps1
+1 -1
View File
@@ -2,5 +2,5 @@
# passed to the script.
foreach ($i in $args) {
Write-Host $i;
Write-Host $i
}
test/integration/targets/win_script/files/test_script_with_errors.ps1
+1 -1
View File
@@ -2,7 +2,7 @@
trap {
Write-Error -ErrorRecord $_
exit 1;
exit 1
}
throw "Oh noes I has an error"
test/integration/targets/windows-minimal/library/win_ping_set_attr.ps1
+4 -4
View File
@@ -16,16 +16,16 @@
# POWERSHELL_COMMON
$params = Parse-Args $args $true;
$params = Parse-Args $args $true
$data = Get-Attr $params "data" "pong";
$data = Get-Attr $params "data" "pong"
$result = @{
changed = $false
ping = "pong"
};
}
# Test that Set-Attr will replace an existing attribute.
Set-Attr $result "ping" $data
Exit-Json $result;
Exit-Json $result
test/integration/targets/windows-minimal/library/win_ping_strict_mode_error.ps1
+4 -4
View File
@@ -16,15 +16,15 @@
# POWERSHELL_COMMON
$params = Parse-Args $args $true;
$params = Parse-Args $args $true
$params.thisPropertyDoesNotExist
$data = Get-Attr $params "data" "pong";
$data = Get-Attr $params "data" "pong"
$result = @{
changed = $false
ping = $data
};
}
Exit-Json $result;
Exit-Json $result
test/integration/targets/windows-minimal/library/win_ping_syntax_error.ps1
+4 -4
View File
@@ -18,13 +18,13 @@
$blah = 'I can't quote my strings correctly.'
$params = Parse-Args $args $true;
$params = Parse-Args $args $true
$data = Get-Attr $params "data" "pong";
$data = Get-Attr $params "data" "pong"
$result = @{
changed = $false
ping = $data
};
}
Exit-Json $result;
Exit-Json $result
test/integration/targets/windows-minimal/library/win_ping_throw.ps1
+4 -4
View File
@@ -18,13 +18,13 @@
throw
$params = Parse-Args $args $true;
$params = Parse-Args $args $true
$data = Get-Attr $params "data" "pong";
$data = Get-Attr $params "data" "pong"
$result = @{
changed = $false
ping = $data
};
}
Exit-Json $result;
Exit-Json $result
test/integration/targets/windows-minimal/library/win_ping_throw_string.ps1
+4 -4
View File
@@ -18,13 +18,13 @@
throw "no ping for you"
$params = Parse-Args $args $true;
$params = Parse-Args $args $true
$data = Get-Attr $params "data" "pong";
$data = Get-Attr $params "data" "pong"
$result = @{
changed = $false
ping = $data
};
}
Exit-Json $result;
Exit-Json $result
test/lib/ansible_test/_util/controller/sanity/pslint/settings.psd1
+25 -25
View File
@@ -1,40 +1,40 @@
@{
Rules = @{
PSAvoidLongLines = @{
Enable = $true
Rules = @{
PSAvoidLongLines = @{
Enable = $true
MaximumLineLength = 160
}
PSAvoidSemicolonsAsLineTerminators = @{
Enable = $true
}
PSPlaceOpenBrace = @{
Enable = $true
OnSameLine = $true
PSPlaceOpenBrace = @{
Enable = $true
OnSameLine = $true
IgnoreOneLineBlock = $true
NewLineAfter = $true
NewLineAfter = $true
}
PSPlaceCloseBrace = @{
Enable = $true
PSPlaceCloseBrace = @{
Enable = $true
IgnoreOneLineBlock = $true
NewLineAfter = $true
NoEmptyLineBefore = $false
NewLineAfter = $true
NoEmptyLineBefore = $false
}
PSUseConsistentIndentation = @{
Enable = $true
IndentationSize = 4
PSUseConsistentIndentation = @{
Enable = $true
IndentationSize = 4
PipelineIndentation = 'IncreaseIndentationForFirstPipeline'
Kind = 'space'
Kind = 'space'
}
PSUseConsistentWhitespace = @{
Enable = $true
CheckInnerBrace = $true
CheckOpenBrace = $true
CheckOpenParen = $true
CheckOperator = $true
CheckPipe = $true
CheckPipeForRedundantWhitespace = $false
CheckSeparator = $true
CheckParameter = $false
PSUseConsistentWhitespace = @{
Enable = $true
CheckInnerBrace = $true
CheckOpenBrace = $true
CheckOpenParen = $true
CheckOperator = $true
CheckPipe = $true
CheckPipeForRedundantWhitespace = $false
CheckSeparator = $true
CheckParameter = $false
IgnoreAssignmentOperatorInsideHashTable = $false
}
}