From 4886db286ff70f7940d2cc2264112045f5c66970 Mon Sep 17 00:00:00 2001 From: Raimund Andree Date: Sun, 11 Sep 2022 19:30:49 +0200 Subject: [PATCH 1/2] Removed 'skippedDscResources' --- tests/Unit/DSCResources/DscResources.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Unit/DSCResources/DscResources.Tests.ps1 b/tests/Unit/DSCResources/DscResources.Tests.ps1 index ab64cec6..a748a61d 100644 --- a/tests/Unit/DSCResources/DscResources.Tests.ps1 +++ b/tests/Unit/DSCResources/DscResources.Tests.ps1 @@ -2,7 +2,7 @@ BeforeDiscovery { $dscResources = Get-DscResource -Module $moduleUnderTest.Name $here = $PSScriptRoot - $skippedDscResources = 'PowerShellRepositories', 'RemoteDesktopCollections', 'RemoteDesktopDeployment' + $skippedDscResources = '' Import-Module -Name datum From 365ac7ccfadc2b2d5b1df7eabfbf520abca9f0ef Mon Sep 17 00:00:00 2001 From: Raimund Andree Date: Sun, 11 Sep 2022 19:33:10 +0200 Subject: [PATCH 2/2] Made 'SessionHost' a scalar as defined in the underlying DSC resource --- CHANGELOG.md | 1 + .../RemoteDesktopDeployment.schema.psm1 | 6 +++--- .../Assets/Config/RemoteDesktopCollections.yml | 8 ++------ .../Assets/Config/RemoteDesktopDeployment.yml | 4 +--- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00d838d7..062e89f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -79,3 +79,4 @@ set to true when the LCM is already in ApplyAndAutoCorrect mode. - ConfigurationManagerDeployment now has configurable Product Key. - Made reading binary files in FilesAndFolders and CertificateImports more robust. - Updated to latest version of 'PackageManagement' to fix module discovery error. +- Made 'SessionHost' a scalar as defined in the underlying DSC resource for 'RemoteDesktopCollections' and 'RemoteDesktopDeployment'. diff --git a/source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.schema.psm1 b/source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.schema.psm1 index 5c1174e4..0ee2c95d 100644 --- a/source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.schema.psm1 +++ b/source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.schema.psm1 @@ -11,8 +11,8 @@ configuration RemoteDesktopDeployment $WebAccess, [Parameter()] - [string[]] - $SessionHosts, + [string] + $SessionHost, [Parameter()] [hashtable[]] @@ -26,7 +26,7 @@ configuration RemoteDesktopDeployment { ConnectionBroker = $ConnectionBroker WebAccessServer = $WebAccess - SessionHost = $SessionHosts + SessionHost = $SessionHost } foreach ($gateway in $Gateways) diff --git a/tests/Unit/DSCResources/Assets/Config/RemoteDesktopCollections.yml b/tests/Unit/DSCResources/Assets/Config/RemoteDesktopCollections.yml index e2de1151..8711237f 100644 --- a/tests/Unit/DSCResources/Assets/Config/RemoteDesktopCollections.yml +++ b/tests/Unit/DSCResources/Assets/Config/RemoteDesktopCollections.yml @@ -1,14 +1,10 @@ Collections: - CollectionName: My first Collection - SessionHost: - - SH1 - - SH2 + SessionHost: SH1 CollectionDescription: This is my super awesome collection ConnectionBroker: CB1 - CollectionName: My second Collection - SessionHost: - - SH1 - - SH2 + SessionHost: SH1 CollectionDescription: This is my super awesome collection number 2 ConnectionBroker: CB1 Settings: diff --git a/tests/Unit/DSCResources/Assets/Config/RemoteDesktopDeployment.yml b/tests/Unit/DSCResources/Assets/Config/RemoteDesktopDeployment.yml index fdd9af86..5eb8deb1 100644 --- a/tests/Unit/DSCResources/Assets/Config/RemoteDesktopDeployment.yml +++ b/tests/Unit/DSCResources/Assets/Config/RemoteDesktopDeployment.yml @@ -1,5 +1,3 @@ ConnectionBroker: CB1 -SessionHosts: - - SH1 - - SH2 +SessionHost: SH1 WebAccess: WA1