From ae122172d4425b9787f308b7a7df611e2141e161 Mon Sep 17 00:00:00 2001 From: Russell Anderson Date: Thu, 26 Mar 2020 21:34:29 -0600 Subject: [PATCH 1/5] #1161 --- .../MSFT_SPWebAppAuthentication.psm1 | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 index bd69e2a99..8238708d6 100644 --- a/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 +++ b/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 @@ -363,7 +363,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 ` @@ -376,7 +376,7 @@ function Set-TargetResource } } - if ($PSBoundParameters.ContainsKey("Intranet")) + if ($Intranet) { # Check if specified zone exists if ($CurrentValues.ContainsKey("Intranet") -eq $false) @@ -395,7 +395,7 @@ function Set-TargetResource } } - if ($PSBoundParameters.ContainsKey("Internet")) + if ($Internet) { # Check if specified zone exists if ($CurrentValues.ContainsKey("Internet") -eq $false) @@ -414,7 +414,7 @@ function Set-TargetResource } } - if ($PSBoundParameters.ContainsKey("Extranet")) + if ($Extranet) { # Check if specified zone exists if ($CurrentValues.ContainsKey("Extranet") -eq $false) @@ -433,7 +433,7 @@ function Set-TargetResource } } - if ($PSBoundParameters.ContainsKey("Custom")) + if ($Custom) { # Check if specified zone exists if ($CurrentValues.ContainsKey("Custom") -eq $false) @@ -505,7 +505,7 @@ function Test-TargetResource return $false } - if ($PSBoundParameters.ContainsKey("Default")) + if ($Default) { $result = Test-ZoneConfiguration -DesiredConfig $Default ` -CurrentConfig $CurrentValues.Default ` @@ -518,7 +518,7 @@ function Test-TargetResource } } - if ($PSBoundParameters.ContainsKey("Intranet")) + if ($Intranet) { if ($CurrentValues.ContainsKey("Intranet") -eq $false) { @@ -536,7 +536,7 @@ function Test-TargetResource } } - if ($PSBoundParameters.ContainsKey("Internet")) + if ($Internet) { if ($CurrentValues.ContainsKey("Internet") -eq $false) { @@ -554,7 +554,7 @@ function Test-TargetResource } } - if ($PSBoundParameters.ContainsKey("Extranet")) + if ($Extranet) { if ($CurrentValues.ContainsKey("Extranet") -eq $false) { @@ -572,7 +572,7 @@ function Test-TargetResource } } - if ($PSBoundParameters.ContainsKey("Custom")) + if ($Custom) { if ($CurrentValues.ContainsKey("Custom") -eq $false) { From 9eb15ee63ca9a11d5c0ca47e1cff3aac52fc7604 Mon Sep 17 00:00:00 2001 From: Russell Anderson Date: Thu, 26 Mar 2020 21:37:19 -0600 Subject: [PATCH 2/5] #1161 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3010f6ac..d542ff454 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - 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. ## [3.8.0] - 2020-02-27 From 403aaf7bc03d2f8022ddeb4d37444688b96bb8a9 Mon Sep 17 00:00:00 2001 From: Russell Anderson Date: Thu, 26 Mar 2020 21:34:29 -0600 Subject: [PATCH 3/5] #1161 --- .../MSFT_SPWebAppAuthentication.psm1 | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 b/SharePointDsc/DSCResources/MSFT_SPWebAppAuthentication/MSFT_SPWebAppAuthentication.psm1 index 27cffe74a..9ca47914b 100644 --- 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) { From 6141b8f11b4145502ff298f5211c9d50c26c1ae0 Mon Sep 17 00:00:00 2001 From: Russell Anderson Date: Thu, 26 Mar 2020 21:37:19 -0600 Subject: [PATCH 4/5] #1161 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 602858f1a..cabfcd426 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,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 From 960b288bb91d3041504da3247ccabde2c8e2bfa1 Mon Sep 17 00:00:00 2001 From: Russell Anderson Date: Fri, 27 Mar 2020 07:37:07 -0600 Subject: [PATCH 5/5] #1134 --- CHANGELOG.md | 4 ++++ .../MSFT_SPSearchContentSource.psm1 | 21 ++----------------- .../1-SharePointSource.ps1 | 2 +- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cabfcd426..ca56fa88c 100644 --- 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 diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchContentSource/MSFT_SPSearchContentSource.psm1 index 2afe1be74..26318a2f2 100644 --- 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/Examples/Resources/SPSearchContentSource/1-SharePointSource.ps1 b/SharePointDsc/Examples/Resources/SPSearchContentSource/1-SharePointSource.ps1 index 82792f2a7..e5b96820d 100644 --- 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"