From fad2068fc87cfe52fbac06de3f6b342550eca740 Mon Sep 17 00:00:00 2001
From: Bobby Reed <Bobby.Reed@microsoft.com>
Date: Tue, 30 May 2017 08:45:49 -0400
Subject: [PATCH 1/2] Added support for Exclusive flag parameter which ensures
 the a value is the EXCLUSIVE value in a given key.

---
 .../MSFT_RegistryResource.psm1                |  95 ++++++++-
 .../MSFT_RegistryResource.schema.mof          | Bin 1751 -> 3852 bytes
 .../en-US/MSFT_RegistryResource.strings.psd1  |   6 +
 README.md                                     |   1 +
 .../MSFT_RegistryResource.EndToEnd.Tests.ps1  |  74 +++++++
 ...source_KeyAndNameOnly_Exclusive.config.ps1 |  48 +++++
 Tests/Unit/MSFT_RegistryResource.Tests.ps1    | 191 +++++++++++++++++-
 7 files changed, 411 insertions(+), 4 deletions(-)
 create mode 100644 Tests/Integration/MSFT_RegistryResource_KeyAndNameOnly_Exclusive.config.ps1

diff --git a/DscResources/MSFT_RegistryResource/MSFT_RegistryResource.psm1 b/DscResources/MSFT_RegistryResource/MSFT_RegistryResource.psm1
index 462d426..d35648d 100644
--- a/DscResources/MSFT_RegistryResource/MSFT_RegistryResource.psm1
+++ b/DscResources/MSFT_RegistryResource/MSFT_RegistryResource.psm1
@@ -118,6 +118,20 @@ function Get-TargetResource
         {
             $registryResource['Ensure'] = 'Present'
         }
+
+        $valueNames = Get-RegistryKeyValueNames -RegistryKey $registryKey
+        $otherValueNames = @($valueNames | Where-Object {$_ -ne $ValueName})
+
+        if ($otherValueNames.Count -gt 0)
+        {
+            Write-Verbose -Message ($script:localizedData.Exclusive_IsNotExclusive -f $Key, $ValueName)
+            $registryResource['Exclusive'] = $false
+        }
+        elseif ($valueNames -eq $valueName)
+        {
+            Write-Verbose -Message ($script:localizedData.Exclusive_IsExclusive -f $Key, $ValueName)
+            $registryResource['Exclusive'] = $true
+        }
     }
 
     Write-Verbose -Message ($script:localizedData.GetTargetResourceEndMessage -f $Key)
@@ -206,7 +220,10 @@ function Set-TargetResource
         $Hex = $false,
 
         [Boolean]
-        $Force = $false
+        $Force = $false,
+
+        [Boolean]
+        $Exclusive = $false
     )
 
     Write-Verbose -Message ($script:localizedData.SetTargetResourceStartMessage -f $Key)
@@ -259,6 +276,20 @@ function Set-TargetResource
                 # Retrieve the name of the registry key
                 $registryKeyName = Get-RegistryKeyName -RegistryKey $registryKey
 
+                # Retrieve other registry key value names.
+                $valueNames = Get-RegistryKeyValueNames -RegistryKey $registryKey
+
+                if ($Exclusive)
+                {
+                    $otherValueNames = $valueNames | Where-Object {$_ -ne $ValueName}
+
+                    foreach ($name in $otherValueNames)
+                    {
+                        Write-Verbose -Message ($script:localizedData.Exclusive_RemovingRegistryValueName -f $Key, $Name)
+                        $null = Remove-ItemProperty -Path $Key -Name $name -Force
+                    }
+                }
+                
                 # Check if the registry key value exists
                 if ($null -eq $actualRegistryKeyValue)
                 {
@@ -332,6 +363,20 @@ function Set-TargetResource
                     $null = Remove-Item -Path $Key -Recurse -Force
                 }
             }
+            else
+            {
+                if ($Exclusive)
+                {
+                    # Retrieve other registry key value names.
+                    $valueNames = Get-RegistryKeyValueNames -RegistryKey $registryKey
+
+                    foreach ($name in $valueNames)
+                    {
+                        Write-Verbose -Message ($script:localizedData.Exclusive_RemovingRegistryValueName -f $Key, $Name)
+                        $null = Remove-ItemProperty -Path $Key -Name $name -Force
+                    }
+                }
+            }
         }
     }
 
@@ -410,7 +455,10 @@ function Test-TargetResource
         $Hex = $false,
 
         [Boolean]
-        $Force = $false
+        $Force = $false,
+
+        [Boolean]
+        $Exclusive = $false
     )
 
     Write-Verbose -Message ($script:localizedData.TestTargetResourceStartMessage -f $Key)
@@ -512,6 +560,27 @@ function Test-TargetResource
         }
     }
 
+    if ($Exclusive)
+    {
+        # Need to get the actual registry key value since Get-TargetResource returns
+        $registryKey = Get-RegistryKey -RegistryKeyPath $Key
+                
+        # Retrieve other registry key value names.
+        $valueNames = Get-RegistryKeyValueNames -RegistryKey $registryKey
+
+        $otherValueNames = @($valueNames | Where-Object {$_ -ne $ValueName})
+
+        if ($otherValueNames.Count -gt 0)
+        {
+            Write-Verbose -Message ($script:localizedData.Exclusive_TESTIsNotExclusive -f $key, $ValueName)
+            $registryResourceInDesiredState = $false
+        }
+        else
+        {
+            Write-Verbose -Message ($script:localizedData.Exclusive_TESTIsExclusive -f $key, $ValueName)
+        }
+    }
+
     Write-Verbose -Message ($script:localizedData.TestTargetResourceEndMessage -f $Key)
 
     return $registryResourceInDesiredState
@@ -793,6 +862,28 @@ function Get-RegistryKeyValueDisplayName
     return $registryKeyValueDisplayName
 }
 
+<#
+    .SYNOPSIS
+        Retrieves all the values in a Registry Key.
+
+    .PARAMETER RegistryKey
+        The registry key to retrieve the values from.
+#>
+function Get-RegistryKeyValueNames
+{
+    [OutputType([Object[]])]
+    [CmdletBinding()]
+    param
+    (
+        [Parameter(Mandatory = $true)]
+        [Microsoft.Win32.RegistryKey]
+        $RegistryKey
+    )
+
+    $registryKeyValue = $RegistryKey.GetValueNames()
+    return ,$registryKeyValue
+}
+
 <#
     .SYNOPSIS
         Retrieves the registry key value with the specified name from the specified registry key.
diff --git a/DscResources/MSFT_RegistryResource/MSFT_RegistryResource.schema.mof b/DscResources/MSFT_RegistryResource/MSFT_RegistryResource.schema.mof
index e547e1cdc6e0bec7c1b5e8935a0794a487f19e7a..68bb28dbb9867025c2db92ae639e96d2dd75f46a 100644
GIT binary patch
literal 3852
zcmd5<U2hUm5S?ce|HEeELouf6t3FxVMx$+28X7~4;bXBxSjaBW64Sq~o^xl1dly(R
zEmlKVmfiWfXU@!>`|D>@UdupQlH=2mL^AyLWhANWNi5H0U!J*dEH!x|ksL#!54lvj
z(3{ICbcgs)=}-9mhPSy)AT`I6ntXxILwO*bg_lT9qz*gh@^wXn7IJu>LcfFiNM7K3
z2939nK5%g+PAin6{U6Rt1nH){gXY{td+6+ST+Cxc<yUqtm(KneHYd1`;I)S<@98(g
zHC#(1-|=MbBu2Qlu>P*|F@$CpmV1TI5p-3bZ)VWi$A9`GGLd+XL#&fnMR=1sgr=}W
z@6}Pz3T-}xBr~D*4e2^G`7}lBQGvtDTOyMdnca@e43Yz^#a8O^q3$vo#I71&ax4c%
z3Gh%%6%E5KgGIj0uu^7&%;h!3H31WuWj<F98WLBqMNG*o;$8M&QjNtr&S8UIEPnsy
z5Hb^dHK$x@n17Qedo24to6Kzwx>KOVC_HY4@xMTZj2gJLGK;LM-QcsHlO9Ry93ek1
z9D65-hCJ9_z1<=k9^){x>{DIXsjlTP19`!Zfz!E!W!9Ew*fOV-*~+{Yd}Pod^R$nI
z{3Ap6(8DzEeRRLDO4)1KNo(NLHq4BDP4v~f;KmwJep{#6HEy~VX3=N-1PG1MspAp?
zvCDOg?#?<SlH56{8G`{Az%xTe?8(QKC+l%F`6Ic8PiCpR<n;zVd~ErD6c_i*GDm!z
z)|qaT{kqG!_Epvfd3ojbJ7obowX!<JFFTa6qq>4rzPgSQ;I9*b@0hxGny+&I+|&V0
z!+X=+B3Z;*wM$H}o=84`NnACjmr2mU%ia2J5wK&7;itSyssC5f4!pD0tLmd1sc|{f
zk7XTy|4eU{Uq?VBM}Hy`_sgtxeaBb5W!zW&rf%+cgOCR^@Q*t$cLH`8oj*9`U867X
z4J%@Z`vKndTm|r-GUT+V1mzqpnGCB#yD003^+KDhA>Qe}5UxafP$YgWS`j*LZki2r
zHILlvz#W=%mhBV=@H}$+w|acz)^%SwWL4>mo1v3%^5ov_`^LKLR`(KL*US{BaoS_P
z29BA`7I#>pt5e_d3`O*}bu`9Iv^n!=w3{nlv&lHjFDs>8oCorvkL)&!$3Rt2Kz}Qf
z*4Y~lUC!<{kCmrCo1x0nQQKviRYD}0Z=$MC&GH#6zL(E<Ud}5k&}8(a#_5Qx;5jXU
vO*^NNTV%mwd^BTfi4{0SC3hB*WC*#!DXOY6I0^6+$}^Xqn-trdqT~GrUFxFD

literal 1751
zcmb_d!A=`75WOSu52IBNAgxk*ZBM0uT2-MfL~uX|nRvol-CeJ2Z^#Pq?|ox$LN-tu
zp&k-Bwr1wdoA)MHUrOcu1v_tSy_bC$9gGgL{hUsm;aZp7sj7G{JL5a!gX^;WYueqJ
zN(hb5PbN3ZhcouJbyKE~^ke+(=1_TFUhVEY?Cua<edjKxBlc5gnh=Xk3Z_Pdg6xa}
z&aSUQzqzAeNok!^Wwn_h(mK3XcFrT36vn5(s`Y_PJuO?!!xV*?^Ly>^JrdC8!I}Dw
zfZ@|CU}`k`49r}WtrU%To?ws~;LXW5JOxs~5OmHq>_SJ%ld6fU24^rRAnr{lY#WvV
za&;j!CS8N-F8w%CLB*n}|Fycpl;)Xg%RmvEAbvZT!jw#^^mYq8YfMJOB96r8r89wF
z7_UYfaWIJ;!+OA4-+%`nrKUp70R@CDnF1LgPdTSLX)^KWX>W|)O+Qjwm)-vQj3Y9k
z@9O$>Y(e-IHn+uwDtVgDSTzq>0+8jD9hzFf95@|aTBqgkYk641D)+~WM%B6xeas_R
z|6g*gL>_aBnEu}WdDN<5Pxl3b0w?;aZ5Vn;Y>4~0h?Dvm@dArr-3`4yhXP!M!4@o8
z*DV2O|8(rRPI;26Hx&FV0XD_bQi%V28^ee5=#vV|={<Ym_l36=U&pm?-CN0e(oP(`
z;Etmo$~@X2aWFR;CNPjS6}(UyOQTXH&8({w2sy<NK)BIzLn2X6HcluM@IopA1*Iyo
z3pcj`%DkJw&}s1<T3a##zw+WOa<GJr>+Z$f|F(*mkqOu(j+O4<W^r;74_et2n#B?;
c8EH3^gEm8q_3bSL=(lh2#NrPKO+MoD2kH7_;Q#;t

diff --git a/DscResources/MSFT_RegistryResource/en-US/MSFT_RegistryResource.strings.psd1 b/DscResources/MSFT_RegistryResource/en-US/MSFT_RegistryResource.strings.psd1
index 23188b0..21a78cd 100644
--- a/DscResources/MSFT_RegistryResource/en-US/MSFT_RegistryResource.strings.psd1
+++ b/DscResources/MSFT_RegistryResource/en-US/MSFT_RegistryResource.strings.psd1
@@ -35,4 +35,10 @@ ConvertFrom-StringData @'
     InvalidRegistryDrive = The registry drive {0} is invalid. Please update the Key parameter to include a valid registry drive.
     InvalidRegistryDriveAbbreviation = The registry drive abbreviation {0} is invalid. Please update the Key parameter to include a valid registry drive.
     RegistryDriveCouldNotBeMounted = The registry drive with the abbreviation {0} could not be mounted.
+    
+    Exclusive_RemovingRegistryValueName = Enforcing Exclusive Flag by removing Value Name ({1}) from key ({0}).
+    Exclusive_IsExclusive = ValueName ({1}) IS EXCLUSIVE within key ({0}).
+    Exclusive_IsNotExclusive = ValueName ({1}) IS NOT EXCLUSIVE within key ({0}).
+    Exclusive_TESTIsExclusive = ValueName ({1}) IS EXCLUSIVE within Key ({0}).
+    Exclusive_TESTIsNotExclusive = The ValueName ({1}) IS NOT EXCLUSIVE within Key ({0}).
 '@
diff --git a/README.md b/README.md
index e414f8c..10e3e4b 100644
--- a/README.md
+++ b/README.md
@@ -235,6 +235,7 @@ None
 * **[String] ValueType** _(Write)_: The type the specified registry key value should have. { *String* | Binary | DWord | QWord | MultiString | ExpandString }
 * **[Boolean] Hex** _(Write)_: Specifies whether or not the specified DWord or QWord registry key data is provided in a hexadecimal format. Not valid for types other than DWord and QWord. The default value is $false.
 * **[Boolean] Force** _(Write)_: Specifies whether or not to overwrite the specified registry key value if it already has a value or whether or not to delete a registry key that has subkeys. The default value is $false.
+* **[Boolean] Exclusive** _(Write)_: Specifies whether the specified value should be made to be the ONLY value in a Key (support for **delvals). The default value is $false.
 
 #### Read-Only Properties from Get-TargetResource
 
diff --git a/Tests/Integration/MSFT_RegistryResource.EndToEnd.Tests.ps1 b/Tests/Integration/MSFT_RegistryResource.EndToEnd.Tests.ps1
index 91c1e9e..793f13c 100644
--- a/Tests/Integration/MSFT_RegistryResource.EndToEnd.Tests.ps1
+++ b/Tests/Integration/MSFT_RegistryResource.EndToEnd.Tests.ps1
@@ -40,6 +40,7 @@ try
 
             # Force is specified as true for both of these configurations
             $script:confgurationFilePathKeyAndNameOnly = Join-Path -Path $PSScriptRoot -ChildPath 'MSFT_RegistryResource_KeyAndNameOnly.config.ps1'
+            $script:confgurationFilePathKeyAndNameOnlyExclusive = Join-Path -Path $PSScriptRoot -ChildPath 'MSFT_RegistryResource_KeyAndNameOnly_Exclusive.config.ps1'
             $script:confgurationFilePathWithDataAndType = Join-Path -Path $PSScriptRoot -ChildPath 'MSFT_RegistryResource_WithDataAndType.config.ps1'
         }
 
@@ -316,6 +317,79 @@ try
             }
         }
 
+        Context 'Enforce Exclusivity using Flag Specifying ValueName' {
+            $configurationName = 'EnforceExclusivity'
+
+            New-ItemProperty -Path $script:testRegistryKeyPath -Name "Test" -Value 1
+            New-ItemProperty -Path $script:testRegistryKeyPath -Name "Test2" -Value 1
+
+            $registryParameters = @{
+                Key = $script:testRegistryKeyPath
+                Ensure = 'Present'
+                ValueName = 'Test_Exclusive'
+                Exclusive = $true
+                Force = $true
+            }
+
+            It 'Should compile and run configuration' {
+                { 
+                    . $script:confgurationFilePathKeyAndNameOnlyExclusive -ConfigurationName $configurationName
+                    & $configurationName -OutputPath $TestDrive @registryParameters
+                    Start-DscConfiguration -Path $TestDrive -ErrorAction 'Stop' -Wait -Force
+                } | Should Not Throw
+            }
+
+            It 'Should be able to call Get-DscConfiguration without throwing' {
+                { Get-DscConfiguration -ErrorAction 'Stop' } | Should Not Throw
+            }
+
+            $registryKeyValues = Get-ItemProperty -Path $registryParameters.Key -Name Test1, Test2 -ErrorAction SilentlyContinue
+
+            It 'Should have removed all the registry key value names' {
+                $registryKeyValues | Should Be $null
+            }
+
+            It 'Should return true from Test-TargetResource with the same parameters' {
+                MSFT_RegistryResource\Test-TargetResource @registryParameters | Should Be $true
+            }
+        }
+
+        Context 'Enforce Exclusivity using Flag Specifying Empty ValueName' {
+            $configurationName = 'EnforceExclusivity'
+
+            New-ItemProperty -Path $script:testRegistryKeyPath -Name "Test" -Value 1
+            New-ItemProperty -Path $script:testRegistryKeyPath -Name "Test2" -Value 1
+
+            $registryParameters = @{
+                Key = $script:testRegistryKeyPath
+                Ensure = 'Present'
+                ValueName = ''
+                Exclusive = $true
+            }
+
+            It 'Should compile and run configuration' {
+                { 
+                    . $script:confgurationFilePathKeyAndNameOnlyExclusive -ConfigurationName $configurationName
+                    & $configurationName -OutputPath $TestDrive @registryParameters
+                    Start-DscConfiguration -Path $TestDrive -ErrorAction 'Stop' -Wait -Force
+                } | Should Not Throw
+            }
+
+            It 'Should be able to call Get-DscConfiguration without throwing' {
+                { Get-DscConfiguration -ErrorAction 'Stop' } | Should Not Throw
+            }
+
+            $registryKeyValues = Get-ItemProperty -Path $registryParameters.Key -Name * -ErrorAction 'SilentlyContinue' | Where-Object {$_.Name -ne "Test_Exclusive"}
+
+            It 'Should have removed all the registry key value names' {
+                $registryKeyValues | Should Be $null
+            }
+
+            It 'Should return true from Test-TargetResource with the same parameters' {
+                MSFT_RegistryResource\Test-TargetResource @registryParameters | Should Be $true
+            }
+        }
+        
         Context 'Remove a registry key' {
             $configurationName = 'RemoveRegistryKey'
 
diff --git a/Tests/Integration/MSFT_RegistryResource_KeyAndNameOnly_Exclusive.config.ps1 b/Tests/Integration/MSFT_RegistryResource_KeyAndNameOnly_Exclusive.config.ps1
new file mode 100644
index 0000000..1686301
--- /dev/null
+++ b/Tests/Integration/MSFT_RegistryResource_KeyAndNameOnly_Exclusive.config.ps1
@@ -0,0 +1,48 @@
+param
+(
+    [Parameter(Mandatory = $true)]
+    [String]
+    $ConfigurationName
+)
+
+Configuration $ConfigurationName
+{
+    param
+    (
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullOrEmpty()]
+        [String]
+        $Key,
+
+        [ValidateSet('Present', 'Absent')]
+        [String]
+        $Ensure = 'Present',
+
+        [Parameter(Mandatory = $true)]
+        [String]
+        [AllowEmptyString()]
+        $ValueName,
+
+        [Parameter()]
+        [Boolean]
+        $Exclusive=$false,
+
+        [Parameter()]
+        [Boolean]
+        $Force=$true
+    )
+
+    Import-DscResource -ModuleName 'PSDscResources'
+
+    Node localhost
+    {
+        Registry Registry1
+        {
+            Key = $Key
+            Ensure = $Ensure
+            ValueName = $ValueName
+            Force = $Force
+            Exclusive = $Exclusive
+        }
+    }
+}
\ No newline at end of file
diff --git a/Tests/Unit/MSFT_RegistryResource.Tests.ps1 b/Tests/Unit/MSFT_RegistryResource.Tests.ps1
index fd64def..d7118f9 100644
--- a/Tests/Unit/MSFT_RegistryResource.Tests.ps1
+++ b/Tests/Unit/MSFT_RegistryResource.Tests.ps1
@@ -432,6 +432,61 @@ try
                     $getTargetResourceResult.ValueData | Should Be $testRegistryKeyValue
                 }
             }
+
+            $testRegistryKeyValueNames = "One", "Two", "Three"
+            Mock -CommandName 'Get-RegistryKeyValueNames' -MockWith { return $testRegistryKeyValueNames }
+            
+            Context 'Determines Exclusivity' {
+                $getTargetResourceParameters = @{
+                    Key = 'TestRegistryKey'
+                    ValueName = 'Test_Exclusive'
+                }
+                
+                It 'Should not throw' {
+                    { $null = Get-TargetResource @getTargetResourceParameters } | Should Not Throw
+                }
+
+                It 'Should retrieve the registry key' {
+                    $getRegistryKeyParameterFilter = {
+                        $registryKeyPathParameterCorrect = $RegistryKeyPath -eq $getTargetResourceParameters.Key
+                        return $registryKeyPathParameterCorrect
+                    }
+
+                    Assert-MockCalled -CommandName 'Get-RegistryKey' -ParameterFilter $getRegistryKeyParameterFilter -Times 1 -Scope 'Context'
+                }
+
+                It 'Should retrieve the registry key value names' {
+                    $getRegistryKeyValueParameterFilter = {
+                        $registryKeyParameterCorrect = $null -eq (Compare-Object -ReferenceObject $script:testRegistryKey -DifferenceObject $RegistryKey)
+                        
+                        return $registryKeyParameterCorrect
+                    }
+
+                    Assert-MockCalled -CommandName 'Get-RegistryKeyValueNames' -ParameterFilter $getRegistryKeyValueParameterFilter -Times 1 -Scope 'Context'
+                }
+
+                $getTargetResourceResult = Get-TargetResource @getTargetResourceParameters
+
+                It 'Should return a hashtable' {
+                    $getTargetResourceResult -is [Hashtable] | Should Be $true
+                }
+
+                It 'Should return 6 hashtable properties' {
+                    $getTargetResourceResult.Keys.Count | Should Be 6
+                }
+
+                It 'Should return the Key property as the given registry key path' {
+                    $getTargetResourceResult.Key | Should Be $getTargetResourceParameters.Key
+                }
+
+                It 'Should return the Ensure property as Present' {
+                    $getTargetResourceResult.Ensure | Should Be 'Present'
+                }
+
+                It 'Should return Exclusivity' {
+                    $getTargetResourceResult.Exclusive | Should Be $False
+                }
+            }
         }
 
         Describe 'Registry\Set-TargetResource' {
@@ -451,6 +506,8 @@ try
             Mock -CommandName 'Remove-DefaultRegistryKeyValue' -MockWith { }
             Mock -CommandName 'Get-RegistryKeySubKeyCount' -MockWith { return 0 }
             Mock -CommandName 'Remove-Item' -MockWith { }
+            $testRegistryKeyValueNames = "One", "Two", "Three", 'Test_Exclusive'
+            Mock -CommandName 'Get-RegistryKeyValueNames' -MockWith { return $testRegistryKeyValueNames }
             
 
             Context 'Registry key does not exist and Ensure specified as Absent' {
@@ -1852,13 +1909,44 @@ try
                     Set-TargetResource @setTargetResourceParameters | Should Be $null
                 }
             }
+
+            Context 'Registry key exists. Ensure specified as Present, ValueName exists. Enforce Exclusivity and OverWrite Value' {
+                $setTargetResourceParameters = @{
+                    Key = 'TestRegistryKey'
+                    ValueName = 'Test_Exclusive'
+                    Ensure = 'Present'
+                    Exclusive = $true
+                    Force = $true
+                }
+
+                It 'Should not throw' {
+                    { Set-TargetResource @setTargetResourceParameters } | Should Not Throw
+                }
+
+                It 'Should retrieve the registry key' {
+                    $getRegistryKeyParameterFilter = {
+                        $registryKeyPathParameterCorrect = $RegistryKeyPath -eq $setTargetResourceParameters.Key
+                        return $registryKeyPathParameterCorrect
+                    }
+
+                    Assert-MockCalled -CommandName 'Get-RegistryKey' -ParameterFilter $getRegistryKeyParameterFilter -Times 1 -Scope 'Context'
+                }
+
+                It 'Should remove all registry key values' {
+                    Assert-MockCalled -CommandName 'Remove-ItemProperty' -Times 3 -Scope 'Context'
+                }
+
+                It 'Should not return' {
+                    Set-TargetResource @setTargetResourceParameters | Should Be $null
+                }
+            }
         }
         
         Describe 'Registry\Test-TargetResource' {
             Mock -CommandName 'Get-RegistryKeyValueDisplayName' -MockWith { return $RegistryKeyValueName }
             Mock -CommandName 'Test-RegistryKeyValuesMatch' -MockWith { return $true }
             Mock -CommandName 'Get-RegistryKey' -MockWith { return $script:testRegistryKey }
-
+            
             $testRegistryKeyValue = 'Something'
 
             Mock -CommandName 'Get-RegistryKeyValue' -MockWith { return $testRegistryKeyValue }
@@ -2332,6 +2420,105 @@ try
                 }
             }
 
+            Mock -CommandName 'Get-TargetResource' -MockWith {
+                return @{
+                    Ensure ='Present'
+                    ValueName = 'TestRegistryKeyValueName'
+                    ValueData = 'TestValueData'
+                    ValueType = 'String'
+                }
+            }
+
+            Context 'Registry Key exists, ValueName exists, Exclusive is True and ValueNames are present' {
+
+                $testRegistryKeyValueNames = "One", "Two", "Three", "TestRegistryKeyValueName"
+                Mock -CommandName 'Get-RegistryKeyValueNames' -MockWith { return $testRegistryKeyValueNames }
+
+                $testTargetResourceParameters = @{
+                    Key = 'TestRegistryKey'
+                    ValueName = 'TestRegistryKeyValueName'
+                    Ensure = 'Present'
+                    Exclusive = $true
+                }
+
+                It 'Should not throw' {
+                    { $null = Test-TargetResource @testTargetResourceParameters } | Should Not Throw
+                }
+
+                It 'Should retrieve the registry resource with the specified reigstry key' {
+                    $getTargetResourceParameterFilter = {
+                        $keyParameterCorrect = $Key -eq $testTargetResourceParameters.Key
+                        
+                        return $keyParameterCorrect
+                    }
+
+                    Assert-MockCalled -CommandName 'Get-TargetResource' -ParameterFilter $getTargetResourceParameterFilter -Times 1 -Scope 'Context'
+                }               
+
+                It 'Should not attempt to test if the specified registry key value matches the retrieved registry key value' {
+                    Assert-MockCalled -CommandName 'Test-RegistryKeyValuesMatch' -Times 0 -Scope 'Context'
+                }
+
+                It 'Should attempt to retrieve ValueNames' {
+                    Assert-MockCalled -CommandName 'Get-RegistryKeyValueNames' -Times 1 -Scope 'Context'
+                }
+
+                $testTargetResourceResult = Test-TargetResource @testTargetResourceParameters
+
+                It 'Should return a boolean' {
+                    $testTargetResourceResult -is [Boolean] | Should Be $true
+                }
+
+                It 'Should return False' {
+                    $testTargetResourceResult | Should Be $false
+                }
+            }
+
+            Context 'Registry Key exists, ValueName exists, Exclusive is True and ValueNames are absent' {
+
+                $testRegistryKeyValueNames = @("TestRegistryKeyValueName")
+                Mock -CommandName 'Get-RegistryKeyValueNames' -MockWith { return $testRegistryKeyValueNames }
+
+                $testTargetResourceParameters = @{
+                    Key = 'TestRegistryKey'
+                    ValueName = 'TestRegistryKeyValueName'
+                    Ensure = 'Present'
+                    Exclusive = $true
+                }
+
+                It 'Should not throw' {
+                    { $null = Test-TargetResource @testTargetResourceParameters } | Should Not Throw
+                }
+
+                It 'Should retrieve the registry resource with the specified registry key' {
+                    $getTargetResourceParameterFilter = {
+                        $keyParameterCorrect = $Key -eq $testTargetResourceParameters.Key
+                        
+                        return $keyParameterCorrect
+                    }
+
+                    Assert-MockCalled -CommandName 'Get-TargetResource' -ParameterFilter $getTargetResourceParameterFilter -Times 1 -Scope 'Context'
+                }
+
+                It 'Should not attempt to test if the specified registry key value matches the retrieved registry key value' {
+                    Assert-MockCalled -CommandName 'Test-RegistryKeyValuesMatch' -Times 0 -Scope 'Context'
+                }
+
+                It 'Should attempt to retrieve ValueNames' {
+                    Assert-MockCalled -CommandName 'Get-RegistryKeyValueNames' -Times 1 -Scope 'Context'
+                }
+
+                $testTargetResourceResult = Test-TargetResource @testTargetResourceParameters
+
+                It 'Should return a boolean' {
+                    $testTargetResourceResult -is [Boolean] | Should Be $true
+                }
+
+                It 'Should return True' {
+                    $testTargetResourceResult | Should Be $true
+                }
+            }
+
             Mock -CommandName 'Get-TargetResource' -MockWith {
                 return @{
                     Ensure = 'Present'
@@ -2518,7 +2705,7 @@ try
 
             Mock -CommandName 'Test-RegistryKeyValuesMatch' -MockWith { return $false }
 
-            Context 'Registry key value exists, Enusre set to Present, and mismatching registry key value data specified' {
+            Context 'Registry key value exists, Ensure set to Present, and mismatching registry key value data specified' {
                 $testTargetResourceParameters = @{
                     Key = 'TestRegistryKey'
                     ValueName = ''

From 0ddd240f800abf9aa41b87daf754f22b7d517a3d Mon Sep 17 00:00:00 2001
From: Bobby Reed <Bobby.Reed@microsoft.com>
Date: Tue, 30 May 2017 09:09:28 -0400
Subject: [PATCH 2/2] Added support for Exclusive flag parameter which ensures
 the a value is the EXCLUSIVE value in a given key.

---
 .../MSFT_RegistryResource.schema.mof          | Bin 3852 -> 1925 bytes
 ...source_KeyAndNameOnly_Exclusive.config.ps1 |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/DscResources/MSFT_RegistryResource/MSFT_RegistryResource.schema.mof b/DscResources/MSFT_RegistryResource/MSFT_RegistryResource.schema.mof
index 68bb28dbb9867025c2db92ae639e96d2dd75f46a..79586a8b2666a9b3e1302c478795c06f08cc08b7 100644
GIT binary patch
literal 1925
zcmb_d!A=`75WOSu52IBN35rsBZBM0uTD5_eM4$>GWa0^Hb$7k8y&)^azxR#3fh15$
zQ4fh6JL7rt=DqRxr$Tvu%FY{G^|E)v-QjN5AJCyQT<M}cQYH7Y6TUV+xHjuw(Dv3;
zLTEHToLnvsPT1SVO_|=)@#xFtp7Olh+TOa|-Xc2x%I$#m*-xFRLrgZwnQ9esvNH-;
zyDkg;;+BFXrS*VHtIZ6N*5SOga~{$pH$DZHjSpn1Y0+q2zalqteybh6hXQ&WoT;t}
z7(P4$rb4lgz|2+ANYaSs0S2ixyaVzzPk|IL1f8=ryU>#Iq$=XF#u^L?h#M1f+k|C+
zY@JGuNn0bkOF#BiP%&w$e<iOlrFo{BB2dI8h+hvTHwBX_ynO+l6(%EM5l7<l%$dMX
zv{$2y*qFqQVZFv$SAYi}g{EB10R@CDnF1LgPdTSrDKhcrsW(FHrfaFKinhPn<A_Y?
zJHL1yTM)j5&6i?BmO<*yNY%Gl0+0<T+cTAdIk4J4vrfz6$8xcPRrU`SwW@R%dN+t*
z{eQXZUgYsk5!0W`A4jbk_H>goC~%^$%7%3hi4Czo7jaV8BVJ$-th%Ao=ehvz!(a=R
zTURXsXMcC>xk~pWS8piz(FK?kOG_dC<5dh_??-p3u$<1b2Y#P8yXWhm@{M~fSr6KY
ztry&}_3JW^Hb@-IjfM#fWKB6Ql*Z5~RY5cBN(DlW&;$@}wCs>b)RT=J3OT%xl0ZQz
zi_F5!X@E3uW-xRbe0$awjKI&lc#Rw^VdA<QarfV?VrFClW{G2^Tew-AoWz4tHic#}
z#0ti>8_GeMA;$XV3Ig;mFY(ag0s5CB#rx4LGRIb?KqvJprV{;;mk3Mw^YPKQpIt?0
wpzPp5p`PO@N|rZGrqs?33Pag6YpSViqMM=Z%j{e><6wao%j0bV+B<xH134t1&j0`b

literal 3852
zcmd5<U2hUm5S?ce|HEeELouf6t3FxVMx$+28X7~4;bXBxSjaBW64Sq~o^xl1dly(R
zEmlKVmfiWfXU@!>`|D>@UdupQlH=2mL^AyLWhANWNi5H0U!J*dEH!x|ksL#!54lvj
z(3{ICbcgs)=}-9mhPSy)AT`I6ntXxILwO*bg_lT9qz*gh@^wXn7IJu>LcfFiNM7K3
z2939nK5%g+PAin6{U6Rt1nH){gXY{td+6+ST+Cxc<yUqtm(KneHYd1`;I)S<@98(g
zHC#(1-|=MbBu2Qlu>P*|F@$CpmV1TI5p-3bZ)VWi$A9`GGLd+XL#&fnMR=1sgr=}W
z@6}Pz3T-}xBr~D*4e2^G`7}lBQGvtDTOyMdnca@e43Yz^#a8O^q3$vo#I71&ax4c%
z3Gh%%6%E5KgGIj0uu^7&%;h!3H31WuWj<F98WLBqMNG*o;$8M&QjNtr&S8UIEPnsy
z5Hb^dHK$x@n17Qedo24to6Kzwx>KOVC_HY4@xMTZj2gJLGK;LM-QcsHlO9Ry93ek1
z9D65-hCJ9_z1<=k9^){x>{DIXsjlTP19`!Zfz!E!W!9Ew*fOV-*~+{Yd}Pod^R$nI
z{3Ap6(8DzEeRRLDO4)1KNo(NLHq4BDP4v~f;KmwJep{#6HEy~VX3=N-1PG1MspAp?
zvCDOg?#?<SlH56{8G`{Az%xTe?8(QKC+l%F`6Ic8PiCpR<n;zVd~ErD6c_i*GDm!z
z)|qaT{kqG!_Epvfd3ojbJ7obowX!<JFFTa6qq>4rzPgSQ;I9*b@0hxGny+&I+|&V0
z!+X=+B3Z;*wM$H}o=84`NnACjmr2mU%ia2J5wK&7;itSyssC5f4!pD0tLmd1sc|{f
zk7XTy|4eU{Uq?VBM}Hy`_sgtxeaBb5W!zW&rf%+cgOCR^@Q*t$cLH`8oj*9`U867X
z4J%@Z`vKndTm|r-GUT+V1mzqpnGCB#yD003^+KDhA>Qe}5UxafP$YgWS`j*LZki2r
zHILlvz#W=%mhBV=@H}$+w|acz)^%SwWL4>mo1v3%^5ov_`^LKLR`(KL*US{BaoS_P
z29BA`7I#>pt5e_d3`O*}bu`9Iv^n!=w3{nlv&lHjFDs>8oCorvkL)&!$3Rt2Kz}Qf
z*4Y~lUC!<{kCmrCo1x0nQQKviRYD}0Z=$MC&GH#6zL(E<Ud}5k&}8(a#_5Qx;5jXU
vO*^NNTV%mwd^BTfi4{0SC3hB*WC*#!DXOY6I0^6+$}^Xqn-trdqT~GrUFxFD

diff --git a/Tests/Integration/MSFT_RegistryResource_KeyAndNameOnly_Exclusive.config.ps1 b/Tests/Integration/MSFT_RegistryResource_KeyAndNameOnly_Exclusive.config.ps1
index 1686301..0d79bed 100644
--- a/Tests/Integration/MSFT_RegistryResource_KeyAndNameOnly_Exclusive.config.ps1
+++ b/Tests/Integration/MSFT_RegistryResource_KeyAndNameOnly_Exclusive.config.ps1
@@ -45,4 +45,4 @@ Configuration $ConfigurationName
             Exclusive = $Exclusive
         }
     }
-}
\ No newline at end of file
+}