Updated DSC resource modules (#10)

* Updated DSC resource modules * Fixed changelog typo
raandree · Mar 12, 2023 · 405e45c · 405e45c
1 parent 10ff946
commit 405e45c
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- These modules have been updated:
+  - ComputerManagementDsc to '9.0.0'
+  - NetworkingDsc to '9.0.0'
+  - WebAdministrationDsc to '4.1.0'
+
 ## [0.8.2] - 2023-01-15
 
 ### Fixed

diff --git a/RequiredModules.psd1 b/RequiredModules.psd1
@@ -16,6 +16,7 @@
     ChangelogManagement          = 'latest'
     Sampler                      = 'latest'
     'Sampler.GitHubTasks'        = 'latest'
+    'Sampler.AzureDevOpsTasks'   = 'latest'
     Datum                        = 'latest'
     'Datum.ProtectedData'        = 'latest'
     DscBuildHelpers              = 'latest'
@@ -26,10 +27,10 @@
 
     #DSC Resources
     xPSDesiredStateConfiguration = '9.1.0'
-    ComputerManagementDsc        = '8.5.0'
-    NetworkingDsc                = '8.2.0'
+    ComputerManagementDsc        = '9.0.0'
+    NetworkingDsc                = '9.0.0'
     JeaDsc                       = '0.7.2'
-    xWebAdministration           = '3.2.0'
+    WebAdministrationDsc         = '4.1.0'
     FileSystemDsc                = '1.1.1'
     SecurityPolicyDsc            = '2.10.0.0'
 

diff --git a/source/DSCResources/SmbShares/SmbShares.schema.psm1 b/source/DSCResources/SmbShares/SmbShares.schema.psm1
@@ -47,7 +47,7 @@ configuration SmbShares
 
         $ServerConfiguration.IsSingleInstance = 'Yes'
 
-        (Get-DscSplattedResource -ResourceName SmbServerConfiguration -ExecutionName "smbServerConfig" -Properties $ServerConfiguration -NoInvoke).Invoke($ServerConfiguration)
+        (Get-DscSplattedResource -ResourceName SmbServerConfiguration -ExecutionName 'smbServerConfig' -Properties $ServerConfiguration -NoInvoke).Invoke($ServerConfiguration)
     }
 
     if ($null -ne $Shares)
@@ -94,14 +94,14 @@ configuration SmbShares
                 $share.Path = 'Unused'
             }
 
-            # remove duplicates from access rights 
-            $share.FullAccess   = $() + $share.FullAccess
+            # remove duplicates from access rights
+            $share.FullAccess = $() + $share.FullAccess
             $share.ChangeAccess = $() + ($share.ChangeAccess | Where-Object { $share.FullAccess -notcontains $_ })
-            $share.ReadAccess   = $() + ($share.ReadAccess   | Where-Object { $share.FullAccess -notcontains $_ -and `
-                                                                              $share.ChangeAccess -notcontains $_ })
-            $share.NoAccess     = $() + ($share.NoAccess     | Where-Object { $share.FullAccess -notcontains $_ -and `
-                                                                              $share.ChangeAccess -notcontains $_ -and `
-                                                                              $share.ReadAccess -notcontains $_ })
+            $share.ReadAccess = $() + ($share.ReadAccess | Where-Object { $share.FullAccess -notcontains $_ -and `
+                        $share.ChangeAccess -notcontains $_ })
+            $share.NoAccess = $() + ($share.NoAccess | Where-Object { $share.FullAccess -notcontains $_ -and `
+                        $share.ChangeAccess -notcontains $_ -and `
+                        $share.ReadAccess -notcontains $_ })
 
             (Get-DscSplattedResource -ResourceName SmbShare -ExecutionName "SmbShare_$shareId" -Properties $share -NoInvoke).Invoke($share)
         }

diff --git a/source/DSCResources/WebApplicationPools/WebApplicationPools.schema.psm1 b/source/DSCResources/WebApplicationPools/WebApplicationPools.schema.psm1
@@ -6,7 +6,7 @@ configuration WebApplicationPools {
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName xWebAdministration
+    Import-DscResource -ModuleName WebAdministrationDsc
 
     foreach ($item in $Items)
     {
@@ -16,6 +16,6 @@ configuration WebApplicationPools {
         }
 
         $executionName = $item.Name
-        (Get-DscSplattedResource -ResourceName xWebAppPool -ExecutionName $executionName -Properties $item -NoInvoke).Invoke($item)
+        (Get-DscSplattedResource -ResourceName WebAppPool -ExecutionName $executionName -Properties $item -NoInvoke).Invoke($item)
     }
 }
diff --git a/source/DSCResources/WebApplications/WebApplications.schema.psm1 b/source/DSCResources/WebApplications/WebApplications.schema.psm1
@@ -6,9 +6,9 @@ configuration WebApplications {
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName xWebAdministration
+    Import-DscResource -ModuleName WebAdministrationDsc
 
-    $dscResourceName = 'xWebApplication'
+    $dscResourceName = 'WebApplication'
 
     foreach ($item in $Items)
     {
@@ -21,6 +21,12 @@ configuration WebApplications {
         }
 
         $executionName = "webapp_$($item.Name -replace '[{}#\-\s]','_')"
+
+        if ($item.AuthenticationInfo)
+        {
+            $item.AuthenticationInfo = (Get-DscSplattedResource -ResourceName DSC_WebApplicationAuthenticationInformation -Properties $item.AuthenticationInfo -NoInvoke).Invoke($item.AuthenticationInfo)
+        }
+
         (Get-DscSplattedResource -ResourceName $dscResourceName -ExecutionName $executionName -Properties $item -NoInvoke).Invoke($item)
     }
 }
diff --git a/source/DSCResources/WebConfigProperties/WebConfigProperties.schema.psm1 b/source/DSCResources/WebConfigProperties/WebConfigProperties.schema.psm1
@@ -16,7 +16,7 @@ configuration WebConfigProperties {
     #>
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName xWebAdministration
+    Import-DscResource -ModuleName WebAdministrationDsc
 
     foreach ($item in $Items)
     {
@@ -26,6 +26,6 @@ configuration WebConfigProperties {
         }
 
         $executionName = "$($item.WebsitePath)_$($item.Filter)_$($item.PropertyName)" -replace '[\s(){}/\\:-]', '_'
-        (Get-DscSplattedResource -ResourceName xWebConfigProperty -ExecutionName $executionName -Properties $item -NoInvoke).Invoke($item)
+        (Get-DscSplattedResource -ResourceName WebConfigProperty -ExecutionName $executionName -Properties $item -NoInvoke).Invoke($item)
     }
 }
diff --git a/source/DSCResources/WebConfigPropertyCollections/WebConfigPropertyCollections.schema.psm1 b/source/DSCResources/WebConfigPropertyCollections/WebConfigPropertyCollections.schema.psm1
@@ -20,7 +20,7 @@ configuration WebConfigPropertyCollections {
     #>
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName xWebAdministration
+    Import-DscResource -ModuleName WebAdministrationDsc
 
     foreach ($item in $Items)
     {
@@ -30,6 +30,6 @@ configuration WebConfigPropertyCollections {
         }
 
         $executionName = "$($item.WebsitePath)_$($item.Filter)_$($item.CollectionName)_$($item.ItemKeyValue)_$($item.ItemPropertyName)" -replace '[\s(){}/\\:-]', '_'
-        (Get-DscSplattedResource -ResourceName xWebConfigPropertyCollection -ExecutionName $executionName -Properties $item -NoInvoke).Invoke($item)
+        (Get-DscSplattedResource -ResourceName WebConfigPropertyCollection -ExecutionName $executionName -Properties $item -NoInvoke).Invoke($item)
     }
 }
diff --git a/source/DSCResources/WebSites/Websites.schema.psm1 b/source/DSCResources/WebSites/Websites.schema.psm1
@@ -6,9 +6,9 @@ configuration WebSites {
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName xWebAdministration
+    Import-DscResource -ModuleName WebAdministrationDsc
 
-    $dscResourceName = 'xWebSite'
+    $dscResourceName = 'WebSite'
 
     foreach ($item in $Items)
     {
@@ -20,6 +20,20 @@ configuration WebSites {
             $item.Ensure = 'Present'
         }
 
+        if ($item.BindingINfo)
+        {
+            $dscBindingInfos = foreach ($bindingInfo in $item.BindingInfo)
+            {
+            (Get-DscSplattedResource -ResourceName DSC_WebBindingInformation -Properties $bindingInfo -NoInvoke).Invoke($bindingInfo)
+            }
+            $item.BindingInfo = $dscBindingInfos
+        }
+
+        if ($item.AuthenticationInfo)
+        {
+            $item.AuthenticationInfo = (Get-DscSplattedResource -ResourceName DSC_WebAuthenticationInformation -Properties $item.AuthenticationInfo -NoInvoke).Invoke($item.AuthenticationInfo)
+        }
+
         $executionName = "website_$($item.Name -replace '[{}#\-\s]','_')"
         (Get-DscSplattedResource -ResourceName $dscResourceName -ExecutionName $executionName -Properties $item -NoInvoke).Invoke($item)
     }

diff --git a/source/DSCResources/WebVirtualDirectories/WebVirtualDirectories.schema.psm1 b/source/DSCResources/WebVirtualDirectories/WebVirtualDirectories.schema.psm1
@@ -6,7 +6,7 @@ configuration WebVirtualDirectories {
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName xWebAdministration
+    Import-DscResource -ModuleName WebAdministrationDsc
 
     foreach ($item in $Items)
     {
@@ -16,6 +16,6 @@ configuration WebVirtualDirectories {
         }
 
         $executionName = $item.Name
-        (Get-DscSplattedResource -ResourceName xWebVirtualDirectory -ExecutionName $executionName -Properties $item -NoInvoke).Invoke($item)
+        (Get-DscSplattedResource -ResourceName WebVirtualDirectory -ExecutionName $executionName -Properties $item -NoInvoke).Invoke($item)
     }
 }