Skip to content

Commit 4590405

Browse files
authored
Merge pull request #7 from gesbeckj/xDescription
Added Check to Avoid returning false and setting the description if i…
2 parents 71cc59e + b8bd4d2 commit 4590405

2 files changed

Lines changed: 14 additions & 11 deletions

File tree

DSCResources/MSFT_xComputer/MSFT_xComputer.psm1

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,13 @@ function Set-TargetResource
117117
$Name = $env:COMPUTERNAME
118118
}
119119

120-
Write-Verbose -Message "Setting computer description to '$($Description)'."
121-
$win32OperatingSystemCimInstance = Get-CimInstance -ClassName Win32_OperatingSystem
122-
$win32OperatingSystemCimInstance.Description = $Description
123-
Set-CimInstance -InputObject $win32OperatingSystemCimInstance
124-
120+
if ($PSBoundParameters.ContainsKey('Description'))
121+
{
122+
Write-Verbose -Message "Setting computer description to '$($Description)'."
123+
$win32OperatingSystemCimInstance = Get-CimInstance -ClassName Win32_OperatingSystem
124+
$win32OperatingSystemCimInstance.Description = $Description
125+
Set-CimInstance -InputObject $win32OperatingSystemCimInstance
126+
}
125127
if ($Credential)
126128
{
127129
if ($DomainName)
@@ -303,13 +305,14 @@ function Test-TargetResource
303305
return $false
304306
}
305307

306-
Write-Verbose -Message 'Checking if description is corerect'
307-
308-
if ($Description -ne (Get-CimInstance -Class 'Win32_OperatingSystem').Description)
308+
if ($PSBoundParameters.ContainsKey('Description'))
309309
{
310-
return $false
310+
Write-Verbose -Message 'Checking if description is corerect'
311+
if ($Description -ne (Get-CimInstance -Class 'Win32_OperatingSystem').Description)
312+
{
313+
return $false
314+
}
311315
}
312-
313316
Assert-DomainOrWorkGroup -DomainName $DomainName -WorkGroupName $WorkGroupName
314317

315318
if ($DomainName)

Tests/Unit/MSFT_xComputer.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ try
556556
}
557557
Set-TargetResource -Name $env:ComputerName | Should BeNullOrEmpty
558558
Set-TargetResource -Name $env:COMPUTERNAME -DomainName 'Contoso.com' -Credential $Credential -UnjoinCredential $Credential -Description 'This is my computer' | Should BeNullOrEmpty
559-
Assert-MockCalled -CommandName Set-CimInstance -Exactly -Times 2 -Scope It
559+
Assert-MockCalled -CommandName Set-CimInstance -Exactly -Times 1 -Scope It
560560
}
561561
}
562562
}

0 commit comments

Comments
 (0)