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

Fix #1107: Use Get-Attr in win_regedit

Browse source
This commit is contained in:
Brian Geihsler 2015-10-14 11:04:07 -07:00 committed by Matt Clay
parent 9b9464ab89
commit 6fed60c1bd
1 changed files with 8 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
lib/ansible/modules/extras/windows/win_regedit.ps1
View file

@ -25,60 +25,17 @@ $params = Parse-Args $args;
$result = New-Object PSObject; $result = New-Object PSObject;
Set-Attr $result "changed" $false; Set-Attr $result "changed" $false;
If ($params.key) $registryKey = Get-Attr -obj $params -name "key" -failifempty $true
{ $registryValue = Get-Attr -obj $params -name "value" -default $null
$registryKey = $params.key $state = Get-Attr -obj $params -name "state" -validateSet "present","absent" -default "present"
} $registryData = Get-Attr -obj $params -name "data" -default $null
Else $registryDataType = Get-Attr -obj $params -name "datatype" -validateSet "binary","dword","expandstring","multistring","string","qword" -default "string"
{
Fail-Json $result "missing required argument: key"
}
If ($params.value) If ($state -eq "present" -and $registryData -eq $null -and $registryValue -ne $null)
{
$registryValue = $params.value
}
Else
{
$registryValue = $null
}
If ($params.state)
{
$state = $params.state.ToString().ToLower()
If (($state -ne "present") -and ($state -ne "absent"))
{
Fail-Json $result "state is $state; must be present or absent"
}
}
Else
{
$state = "present"
}
If ($params.data)
{
$registryData = $params.data
}
ElseIf ($state -eq "present" -and $registryValue -ne $null)
{ {
Fail-Json $result "missing required argument: data" Fail-Json $result "missing required argument: data"
} }
If ($params.datatype)
{
$registryDataType = $params.datatype.ToString().ToLower()
$validRegistryDataTypes = "binary", "dword", "expandstring", "multistring", "string", "qword"
If ($validRegistryDataTypes -notcontains $registryDataType)
{
Fail-Json $result "type is $registryDataType; must be binary, dword, expandstring, multistring, string, or qword"
}
}
Else
{
$registryDataType = "string"
}
Function Test-RegistryValueData { Function Test-RegistryValueData {
Param ( Param (
[parameter(Mandatory=$true)] [parameter(Mandatory=$true)]
@ -115,7 +72,7 @@ if($state -eq "present") {
} }
} }
# Changes Only Data # Changes Only Data
elseif ((Get-ItemProperty -Path $registryKey | Select-Object -ExpandProperty $registryValue) -ne $registryData) elseif ((Get-ItemProperty -Path $registryKey | Select-Object -ExpandProperty $registryValue) -ne $registryData)
{ {
Try { Try {
Set-ItemProperty -Path $registryKey -Name $registryValue -Value $registryData Set-ItemProperty -Path $registryKey -Name $registryValue -Value $registryData
@ -142,7 +99,7 @@ if($state -eq "present") {
} }
elseif(-not (Test-Path $registryKey)) elseif(-not (Test-Path $registryKey))
{ {
Try Try
{ {
$newRegistryKey = New-Item $registryKey -Force $newRegistryKey = New-Item $registryKey -Force
$result.changed = $true $result.changed = $true