Merge pull request #1383 from ykuijs/master

Adding example and fixing issues
dsccommunity · Feb 23, 2022 · 4c78a21 · 4c78a21
2 parents 5e52862 + 0c65129
commit 4c78a21
Show file tree

Hide file tree

Showing 15 changed files with 4,274 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,12 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - SharePointDsc
   - Added generic unit tests files to quickly run all or a specific unit test
   - Updated pipeline scripts to a recent version
+  - Added an extensive flexible configuration to deploy a SharePoint environment
+- SPDistributedCacheService
+  - Added documentation to clarify the use of the ServerProvisionOrder parameter
 - SPTrustedIdentityTokenIssuer
   - Added parameters to support OIDC authentication in SharePoint Server Subscription Edition
 - SPWebAppPeoplePickerSettings
   - Added the PeopleEditorOnlyResolveWithinSiteCollection parameter to the resource
-- SPDistributedCacheService
-  - Added documentation to clarify the use of the ServerProvisionOrder parameter
 
 ### Changed
 
@@ -28,6 +29,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- SPSearchIndexPartition
+  - Fixed issue where the Get method returned multiple values when using multiple
+    index components
+  - Fixed issue the Export would place quotes around a variable in the output
+- SPSearchTopology
+  - Fixed issue the Export would place quotes around a variable in the output
 - SPTrustedRootAuthority
   - Fixed issue where certificates not in the Personal store could not be used
 - Add-SPDscConfigDBLock

diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchIndexPartition/MSFT_SPSearchIndexPartition.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchIndexPartition/MSFT_SPSearchIndexPartition.psm1
@@ -35,7 +35,7 @@ function Get-TargetResource
                 Where-Object -FilterScript {
                 ($_.GetType().Name -eq "IndexComponent") `
                     -and ($_.IndexPartitionOrdinal -eq $params.Index)
-            }
+            } | Select-Object -First 1
 
         $IndexComponents = $searchComponent.ServerName
         $rootDirectory = $searchComponent.RootDirectory
@@ -286,7 +286,7 @@ function Export-TargetResource
                 $ssa = Get-SPEnterpriseSearchServiceApplication -Identity $ssa
                 $currentTopology = $ssa.ActiveTopology
                 $indexComponents = Get-SPEnterpriseSearchComponent -SearchTopology $currentTopology | `
-                    Where-Object -FilterScript {
+                        Where-Object -FilterScript {
                         $_.GetType().Name -eq "IndexComponent"
                     }
 
@@ -318,6 +318,7 @@ function Export-TargetResource
 
                             $currentBlock = Get-DSCBlock -Params $results -ModulePath $module
                             $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "PsDscRunAsCredential"
+                            $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "Servers"
                             $PartialContent += $currentBlock
                             $PartialContent += "        }`r`n"
                             $Content += $PartialContent

diff --git a/SharePointDsc/DSCResources/MSFT_SPSearchTopology/MSFT_SPSearchTopology.psm1 b/SharePointDsc/DSCResources/MSFT_SPSearchTopology/MSFT_SPSearchTopology.psm1
@@ -638,6 +638,12 @@ function Export-TargetResource
 
                 $currentBlock = Get-DSCBlock -Params $results -ModulePath $module
                 $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "PsDscRunAsCredential"
+                $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "Admin"
+                $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "AnalyticsProcessing"
+                $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "ContentProcessing"
+                $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "Crawler"
+                $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "IndexPartition"
+                $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "QueryProcessing"
                 $PartialContent += $currentBlock
                 $PartialContent += "        }`r`n"
                 $Content += $PartialContent