win_regedit: fix extra info coming into stdout (#31813)
This commit is contained in:
parent
87db43afce
commit
888de842b3
2 changed files with 39 additions and 2 deletions
|
@ -243,7 +243,7 @@ if ($state -eq "present") {
|
||||||
if (-not (Test-Path -path $path)) {
|
if (-not (Test-Path -path $path)) {
|
||||||
# the key doesn't exist, create it so the next steps work
|
# the key doesn't exist, create it so the next steps work
|
||||||
try {
|
try {
|
||||||
New-Item -Path $path -Type directory -Force -WhatIf:$check_mode
|
$null = New-Item -Path $path -Type directory -Force -WhatIf:$check_mode
|
||||||
} catch {
|
} catch {
|
||||||
Fail-Json $result "failed to create registry key at $($path): $($_.Exception.Message)"
|
Fail-Json $result "failed to create registry key at $($path): $($_.Exception.Message)"
|
||||||
}
|
}
|
||||||
|
@ -330,7 +330,7 @@ $key_prefix[$path]
|
||||||
if ($delete_key -and $name -eq $null) {
|
if ($delete_key -and $name -eq $null) {
|
||||||
# the clear_key flag is set and name is null so delete the entire key
|
# the clear_key flag is set and name is null so delete the entire key
|
||||||
try {
|
try {
|
||||||
Remove-Item -Path $path -Force -Recurse -WhatIf:$check_mode
|
$null = Remove-Item -Path $path -Force -Recurse -WhatIf:$check_mode
|
||||||
} catch {
|
} catch {
|
||||||
Fail-Json $result "failed to delete registry key at $($path): $($_.Exception.Message)"
|
Fail-Json $result "failed to delete registry key at $($path): $($_.Exception.Message)"
|
||||||
}
|
}
|
||||||
|
|
|
@ -421,3 +421,40 @@
|
||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- not create_hkcr_key_again|changed
|
- not create_hkcr_key_again|changed
|
||||||
|
|
||||||
|
# https://github.com/ansible/ansible/issues/31782
|
||||||
|
- name: create property like a json string
|
||||||
|
win_regedit:
|
||||||
|
path: '{{test_win_regedit_local_key}}\NewKey'
|
||||||
|
name: '{7f51bda7-bcea-465a-9eb6-5a2bcd9cb52f}'
|
||||||
|
data: test data
|
||||||
|
type: string
|
||||||
|
state: present
|
||||||
|
register: create_prop_with_json
|
||||||
|
|
||||||
|
- name: get result of create property like a json string
|
||||||
|
win_reg_stat:
|
||||||
|
path: '{{test_win_regedit_local_key}}\NewKey'
|
||||||
|
name: '{7f51bda7-bcea-465a-9eb6-5a2bcd9cb52f}'
|
||||||
|
register: create_prop_with_json_result
|
||||||
|
|
||||||
|
- name: assert results of create property like a json string
|
||||||
|
assert:
|
||||||
|
that:
|
||||||
|
- create_prop_with_json|changed
|
||||||
|
- create_prop_with_json_result.exists == True
|
||||||
|
- create_prop_with_json_result.value == 'test data'
|
||||||
|
|
||||||
|
- name: create property like a json string (idempotent)
|
||||||
|
win_regedit:
|
||||||
|
path: '{{test_win_regedit_local_key}}\NewKey'
|
||||||
|
name: '{7f51bda7-bcea-465a-9eb6-5a2bcd9cb52f}'
|
||||||
|
data: test data
|
||||||
|
type: string
|
||||||
|
state: present
|
||||||
|
register: create_prop_with_json_again
|
||||||
|
|
||||||
|
- name: assert results of create property like a json string (idempotent)
|
||||||
|
assert:
|
||||||
|
that:
|
||||||
|
- not create_prop_with_json_again|changed
|
||||||
|
|
Loading…
Reference in a new issue