[UpdateServicesServer] Add IGNORE option to UpstreamServerName

CHANGELOG.md

@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Updated inital offline package sync WSUS.cab.
+- Added IGNORE option for UpstreamServerName to prevent it being changed when SCCM is managing the upstream source
 
 ## [1.2.0] - 2020-05-18
 

ReadMe.md

@@ -93,7 +93,7 @@ Windows Server 2008 R2 SP1, Windows Server 2012 and Windows Server 2012 R2.
 * **SQLServer**: SQL Server for the WSUS database, omit for Windows Internal Database.
 * **ContentDir**: Folder for WSUS update files.
 * **UpdateImprovementProgram**: Join the Microsoft Update Improvement Program.
-* **UpstreamServerName**: Upstream WSUS server, omit for Microsoft Update.
+* **UpstreamServerName**: Upstream WSUS server, omit for Microsoft Update. Set to 'IGNORE' to prevent changes being made, for example in a SCCM environment
 * **UpstreamServerPort**: Port of upstream WSUS server.
 * **UpstreamServerSSL**: Use SSL with upstream WSUS server.
 * **UpstreamServerReplica**: Replica of upstream WSUS server.

Tests/Unit/MSFT_UpdateServicesServer.tests.ps1

@@ -214,7 +214,36 @@ try
                 }
             }
 
-        }
+            Context "upstream server difference is ignored" {
+
+                $DSCTestValues.Remove('UpstreamServerName')
+                $DSCTestValues.Add('UpstreamServerName', 'IGNORE')
+
+                Mock -CommandName Get-TargetResource -MockWith {
+                    $GetValues = $DSCTestValues
+                    $GetValues.Remove('UpstreamServerName')
+                    $GetValues.Add('UpstreamServerName', 'SomeOtherServer')
+                    $GetValues
+                } -Verifiable
+
+                $script:result = $null
+
+                It "calling test with change to UpstreamServerName should not throw" {
+                    { $script:result = Test-TargetResource @DSCTestValues -verbose } | Should not throw
+                }
+
+                It "result should be true, even when UpstreamServerName is different" {
+                    $script:result | Should be $true
+                }
+
+                It 'mocks were called' {
+                    Assert-VerifiableMock
+                }
+
+                $DSCTestValues.Remove('UpstreamServerName')
+                $DSCTestValues.Add('UpstreamServerName', 'UpstreamServer')
+                }
+            }
         #endregion
 
         #region Function Set-TargetResource

source/DSCResources/MSFT_UpdateServicesServer/MSFT_UpdateServicesServer.psm1

@@ -849,7 +849,8 @@ function Test-TargetResource
         }
 
         # Test Upstream Server
-        if ($Wsus.UpstreamServerName -ne $UpstreamServerName)
+
+        if ($Wsus.UpstreamServerName -ne $UpstreamServerName -and $UpstreamServerName -ne "IGNORE")
         {
             Write-Verbose -Message $script:localizedData.UpstreamNameTestFailed
             $result = $false