Merge pull request #1185 from ruandersMSFT/master-1161

SPWebAppAuthentication + SPSearchContentSource v4
dsccommunity · Mar 27, 2020 · 450a15c · 450a15c
2 parents 65b2feb + 960b288
commit 450a15c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,10 @@ resources:
 - SPManagedMetaDataServiceAppDefault
   - Updated resource to allow the configuration of default per service application
     proxy groups instead of per farm
+- SPSearchContentSource
+  - Discontinued CrawlEverything, CrawlFirstOnly and null as allowable CrawlSetting
+    values for a SharePoint based content source, requiring CrawlVirtualServers or
+    CrawlSites
 - SPUserProfileServiceApp
   - Changed the MySiteHostLocation parameter to a required parameter
 - SPWebAppAuthentication
@@ -36,6 +40,8 @@ resources:
 - SPFarmSolution
   - Corrected bug running Solution Job wait for an Absent solution.
   - Corrected bug trying to remove an already Absent solution.
+- SPWebAppAuthentication
+  - Updated to support passing of null/empty collections for zones not utilized.
 
 ### Removed
 

diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1
@@ -310,14 +310,8 @@ function Set-TargetResource
             {
                 throw "Parameter LimitServerHops is not valid for SharePoint content sources"
             }
-            # Temporarily allow CrawlEverything, CrawlFirstOnly and Null (mapped to CrawlVirtualServers)
-            # until next major (breaking) version, as these were not previously blocked nor
-            # implemented.  All equate to CrawlVirtualServers (default).
             if ($CrawlSetting -ne "CrawlVirtualServers" -and
-                $CrawlSetting -ne "CrawlSites" -and
-                $CrawlSetting -ne "CrawlEverything" -and # Phaseout Major Release
-                $CrawlSetting -ne "CrawlFirstOnly" -and # Phaseout Major Release
-                $CrawlSetting -ne $null # Phaseout Major Release
+                $CrawlSetting -ne "CrawlSites"
             )
             {
                 throw ("Parameter CrawlSetting can only be set to CrawlVirtualServers or CrawlSites " + `
@@ -415,11 +409,6 @@ function Set-TargetResource
                     {
                         $newType = "SharePoint"
                         $newCrawlSetting = $crawlSetting
-                        # Temporary mapping to CrawlVirtualServers until major (breaking) change
-                        if ($newCrawlSetting -ne "CrawlSites")
-                        {
-                            $newCrawlSetting = "CrawlVirtualServers"
-                        }
                     }
                     "Website"
                     {
@@ -812,14 +801,8 @@ function Test-TargetResource
             {
                 throw "Parameter LimitServerHops is not valid for SharePoint content sources"
             }
-            # Temporarily allow CrawlEverything, CrawlFirstOnly and Null (mapped to CrawlVirtualServers)
-            # until next major (breaking) version, as these were not previously blocked nor
-            # implemented.  All equate to CrawlVirtualServers (default).
             if ($CrawlSetting -ne "CrawlVirtualServers" -and
-                $CrawlSetting -ne "CrawlSites" -and
-                $CrawlSetting -ne "CrawlEverything" -and # Phaseout Major Release
-                $CrawlSetting -ne "CrawlFirstOnly" -and # Phaseout Major Release
-                $CrawlSetting -ne $null # Phaseout Major Release
+                $CrawlSetting -ne "CrawlSites"
             )
             {
                 throw ("Parameter CrawlSetting can only be set to CrawlVirtualServers or CrawlSites " + `

diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1
@@ -391,7 +391,7 @@ function Set-TargetResource
 
     $CurrentValues = Get-TargetResource @PSBoundParameters
 
-    if ($PSBoundParameters.ContainsKey("Default"))
+    if ($Default)
     {
         # Test is current config matches desired config
         $result = Test-ZoneConfiguration -DesiredConfig $Default `
@@ -404,7 +404,7 @@ function Set-TargetResource
         }
     }
 
-    if ($PSBoundParameters.ContainsKey("Intranet"))
+    if ($Intranet)
     {
         # Check if specified zone exists
         if ($CurrentValues.ContainsKey("Intranet") -eq $false)
@@ -423,7 +423,7 @@ function Set-TargetResource
         }
     }
 
-    if ($PSBoundParameters.ContainsKey("Internet"))
+    if ($Internet)
     {
         # Check if specified zone exists
         if ($CurrentValues.ContainsKey("Internet") -eq $false)
@@ -442,7 +442,7 @@ function Set-TargetResource
         }
     }
 
-    if ($PSBoundParameters.ContainsKey("Extranet"))
+    if ($Extranet)
     {
         # Check if specified zone exists
         if ($CurrentValues.ContainsKey("Extranet") -eq $false)
@@ -461,7 +461,7 @@ function Set-TargetResource
         }
     }
 
-    if ($PSBoundParameters.ContainsKey("Custom"))
+    if ($Custom)
     {
         # Check if specified zone exists
         if ($CurrentValues.ContainsKey("Custom") -eq $false)
@@ -533,7 +533,7 @@ function Test-TargetResource
         return $false
     }
 
-    if ($PSBoundParameters.ContainsKey("Default"))
+    if ($Default)
     {
         $result = Test-ZoneConfiguration -DesiredConfig $Default `
             -CurrentConfig $CurrentValues.Default `
@@ -546,7 +546,7 @@ function Test-TargetResource
         }
     }
 
-    if ($PSBoundParameters.ContainsKey("Intranet"))
+    if ($Intranet)
     {
         if ($CurrentValues.ContainsKey("Intranet") -eq $false)
         {
@@ -564,7 +564,7 @@ function Test-TargetResource
         }
     }
 
-    if ($PSBoundParameters.ContainsKey("Internet"))
+    if ($Internet)
     {
         if ($CurrentValues.ContainsKey("Internet") -eq $false)
         {
@@ -582,7 +582,7 @@ function Test-TargetResource
         }
     }
 
-    if ($PSBoundParameters.ContainsKey("Extranet"))
+    if ($Extranet)
     {
         if ($CurrentValues.ContainsKey("Extranet") -eq $false)
         {
@@ -600,7 +600,7 @@ function Test-TargetResource
         }
     }
 
-    if ($PSBoundParameters.ContainsKey("Custom"))
+    if ($Custom)
     {
         if ($CurrentValues.ContainsKey("Custom") -eq $false)
         {

diff --git a/SharePointDsc/Examples/Resources/SPSearchContentSource/1-SharePointSource.ps1 b/SharePointDsc/Examples/Resources/SPSearchContentSource/1-SharePointSource.ps1
@@ -55,7 +55,7 @@ Updated author, copyright notice, and URLs.
                 ServiceAppName       = "Search Service Application"
                 ContentSourceType    = "SharePoint"
                 Addresses            = @("http://sharepointsite1.contoso.com", "http://sharepointsite2.contoso.com")
-                CrawlSetting         = "CrawlEverything"
+                CrawlSetting         = "CrawlSites"
                 ContinuousCrawl      = $true
                 FullSchedule         = $null
                 Priority             = "Normal"