Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ansible/ansible.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Borean <jborean93@gmail.com>2022-11-02 00:44:46 +0300
committerJordan Borean <jborean93@gmail.com>2022-11-02 01:18:38 +0300
commit6def4a3180fe03981ba64c6d8db28fed3bb39c0c (patch)
tree395306c79307e28e53510a48171ce17ab2ad61f1
parent4ad02dc6e3103e49fb6a54a98c254c12922e3042 (diff)
Fix up sanity problems
-rw-r--r--lib/ansible/executor/powershell/async_wrapper.ps110
-rw-r--r--lib/ansible/module_utils/powershell/Ansible.ModuleUtils.Backup.psm12
-rw-r--r--lib/ansible/module_utils/powershell/Ansible.ModuleUtils.Legacy.psm110
-rw-r--r--test/integration/targets/win_script/files/test_script_with_args.ps12
-rw-r--r--test/integration/targets/win_script/files/test_script_with_errors.ps12
-rw-r--r--test/integration/targets/windows-minimal/library/win_ping_set_attr.ps18
-rw-r--r--test/integration/targets/windows-minimal/library/win_ping_strict_mode_error.ps18
-rw-r--r--test/integration/targets/windows-minimal/library/win_ping_syntax_error.ps18
-rw-r--r--test/integration/targets/windows-minimal/library/win_ping_throw.ps18
-rw-r--r--test/integration/targets/windows-minimal/library/win_ping_throw_string.ps18
-rw-r--r--test/lib/ansible_test/_util/controller/sanity/pslint/settings.psd150
11 files changed, 58 insertions, 58 deletions
diff --git a/lib/ansible/executor/powershell/async_wrapper.ps1 b/lib/ansible/executor/powershell/async_wrapper.ps1
index 0cd640fd16f..dd5a9becc5b 100644
--- a/lib/ansible/executor/powershell/async_wrapper.ps1
+++ b/lib/ansible/executor/powershell/async_wrapper.ps1
@@ -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
}
diff --git a/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.Backup.psm1 b/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.Backup.psm1
index ca4f5ba5b07..c2b80b011bd 100644
--- a/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.Backup.psm1
+++ b/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.Backup.psm1
@@ -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
}
diff --git a/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.Legacy.psm1 b/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.Legacy.psm1
index f0cb440f687..4aea98b24f8 100644
--- a/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.Legacy.psm1
+++ b/lib/ansible/module_utils/powershell/Ansible.ModuleUtils.Legacy.psm1
@@ -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
}
diff --git a/test/integration/targets/win_script/files/test_script_with_args.ps1 b/test/integration/targets/win_script/files/test_script_with_args.ps1
index 01bb37f5d78..669c6410080 100644
--- a/test/integration/targets/win_script/files/test_script_with_args.ps1
+++ b/test/integration/targets/win_script/files/test_script_with_args.ps1
@@ -2,5 +2,5 @@
# passed to the script.
foreach ($i in $args) {
- Write-Host $i;
+ Write-Host $i
}
diff --git a/test/integration/targets/win_script/files/test_script_with_errors.ps1 b/test/integration/targets/win_script/files/test_script_with_errors.ps1
index 56f97735482..bdf7ee481ff 100644
--- a/test/integration/targets/win_script/files/test_script_with_errors.ps1
+++ b/test/integration/targets/win_script/files/test_script_with_errors.ps1
@@ -2,7 +2,7 @@
trap {
Write-Error -ErrorRecord $_
- exit 1;
+ exit 1
}
throw "Oh noes I has an error"
diff --git a/test/integration/targets/windows-minimal/library/win_ping_set_attr.ps1 b/test/integration/targets/windows-minimal/library/win_ping_set_attr.ps1
index f17049643b4..d23bbc74a81 100644
--- a/test/integration/targets/windows-minimal/library/win_ping_set_attr.ps1
+++ b/test/integration/targets/windows-minimal/library/win_ping_set_attr.ps1
@@ -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
diff --git a/test/integration/targets/windows-minimal/library/win_ping_strict_mode_error.ps1 b/test/integration/targets/windows-minimal/library/win_ping_strict_mode_error.ps1
index 508174afcc6..09400d08b43 100644
--- a/test/integration/targets/windows-minimal/library/win_ping_strict_mode_error.ps1
+++ b/test/integration/targets/windows-minimal/library/win_ping_strict_mode_error.ps1
@@ -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
diff --git a/test/integration/targets/windows-minimal/library/win_ping_syntax_error.ps1 b/test/integration/targets/windows-minimal/library/win_ping_syntax_error.ps1
index d4c9f07ad55..6932d5380b8 100644
--- a/test/integration/targets/windows-minimal/library/win_ping_syntax_error.ps1
+++ b/test/integration/targets/windows-minimal/library/win_ping_syntax_error.ps1
@@ -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
diff --git a/test/integration/targets/windows-minimal/library/win_ping_throw.ps1 b/test/integration/targets/windows-minimal/library/win_ping_throw.ps1
index 7306f4d2808..2fba2092d7e 100644
--- a/test/integration/targets/windows-minimal/library/win_ping_throw.ps1
+++ b/test/integration/targets/windows-minimal/library/win_ping_throw.ps1
@@ -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
diff --git a/test/integration/targets/windows-minimal/library/win_ping_throw_string.ps1 b/test/integration/targets/windows-minimal/library/win_ping_throw_string.ps1
index 09e3b7cb458..62de8263dde 100644
--- a/test/integration/targets/windows-minimal/library/win_ping_throw_string.ps1
+++ b/test/integration/targets/windows-minimal/library/win_ping_throw_string.ps1
@@ -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
diff --git a/test/lib/ansible_test/_util/controller/sanity/pslint/settings.psd1 b/test/lib/ansible_test/_util/controller/sanity/pslint/settings.psd1
index 41be367404b..7beb38c1d8f 100644
--- a/test/lib/ansible_test/_util/controller/sanity/pslint/settings.psd1
+++ b/test/lib/ansible_test/_util/controller/sanity/pslint/settings.psd1
@@ -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
}
}