From eb1d3af71dad878cdee3ede048e8671b0a19fa59 Mon Sep 17 00:00:00 2001 From: U116139 Date: Fri, 1 Dec 2023 08:56:01 +0100 Subject: [PATCH] Readd missing Wi-Fi parameter --- CHANGELOG.md | 4 ---- ...ionPolicyAndroidDeviceAdministratorBasic.psm1 | 16 ++++++++++++++-- ...icyAndroidDeviceAdministratorBasic.schema.mof | 1 + ...tionPolicyAndroidDeviceAdministratorBasic.ps1 | 1 + ...licyAndroidDeviceAdministratorBasic.Tests.ps1 | 5 ++++- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e44cc1f57..ab2af52778 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,10 +10,6 @@ # 1.23.1129.1 -* IntuneAntivirusPolicyWindows10SettingCatalog - * Skipped settingValueTemplateReference and settingInstanceTemplateReference for severethreats, highseveritythreats, moderateseveritythreats, lowseveritythreats as per API requirements observed in the Intune portal - FIXES [#3818](https://github.com/microsoft/Microsoft365DSC/issues/3818) - FIXES [#3955](https://github.com/microsoft/Microsoft365DSC/issues/3955) * AADRoleSetting * Export sorted by DisplayName for better comparison * Enable Filter property to be used on export diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.psm1 index 5a1aaa75d7..4556b4039a 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.psm1 @@ -17,6 +17,10 @@ function Get-TargetResource [System.String] $Description, + [Parameter()] + [System.Boolean] + $ConnectAutomatically, + [Parameter()] [System.Boolean] $ConnectWhenNetworkNameIsHidden, @@ -120,6 +124,7 @@ function Get-TargetResource Id = $getValue.Id Description = $getValue.Description DisplayName = $getValue.DisplayName + ConnectAutomatically = $getValue.AdditionalProperties.connectAutomatically ConnectWhenNetworkNameIsHidden = $getValue.AdditionalProperties.connectWhenNetworkNameIsHidden NetworkName = $getValue.AdditionalProperties.networkName Ssid = $getValue.AdditionalProperties.ssid @@ -181,6 +186,10 @@ function Set-TargetResource [System.String] $Description, + [Parameter()] + [System.Boolean] + $ConnectAutomatically, + [Parameter()] [System.Boolean] $ConnectWhenNetworkNameIsHidden, @@ -273,7 +282,6 @@ function Set-TargetResource $CreateParameters = ([Hashtable]$PSBoundParameters).clone() $CreateParameters = Rename-M365DSCCimInstanceParameter -Properties $CreateParameters - $CreateParameters.Add('ConnectAutomatically', $false) $AdditionalProperties = Get-M365DSCAdditionalProperties -Properties ($CreateParameters) foreach ($key in $AdditionalProperties.keys) @@ -394,6 +402,10 @@ function Test-TargetResource [System.String] $Description, + [Parameter()] + [System.Boolean] + $ConnectAutomatically, + [Parameter()] [System.Boolean] $ConnectWhenNetworkNameIsHidden, @@ -463,7 +475,7 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters $ValuesToCheck = ([Hashtable]$PSBoundParameters).clone() - if ($CurrentValues.Ensure -eq 'Absent') + if ($CurrentValues.Ensure -ne $PSBoundParameters.Ensure) { Write-Verbose -Message "Test-TargetResource returned $false" return $false diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.schema.mof index 4573a17105..cbe3282eef 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.schema.mof +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic/MSFT_IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.schema.mof @@ -15,6 +15,7 @@ class MSFT_IntuneWifiConfigurationPolicyAndroidDeviceAdministratorBasic : OMI_Ba [Write, Description("Id of the Intune Policy.")] String Id; [Key, Description("Display name of the Intune Policy.")] String DisplayName; [Write, Description("Description of the Intune Policy.")] String Description; + [Write, Description("Connect automatically.")] Boolean ConnectAutomatically; [Write, Description("Connect if the network name is hidden.")] Boolean ConnectWhenNetworkNameIsHidden; [Write, Description("Network name.")] String NetworkName; [Write, Description("SSID.")] String Ssid; diff --git a/Modules/Microsoft365DSC/Examples/Resources/IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic/1-ConfigureIntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.ps1 b/Modules/Microsoft365DSC/Examples/Resources/IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic/1-ConfigureIntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.ps1 index d65df6dd51..01ce1db578 100644 --- a/Modules/Microsoft365DSC/Examples/Resources/IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic/1-ConfigureIntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic/1-ConfigureIntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.ps1 @@ -23,6 +23,7 @@ Configuration Example dataType = '#microsoft.graph.allDevicesAssignmentTarget' } ) + ConnectAutomatically = $True ConnectWhenNetworkNameIsHidden = $True DisplayName = 'Android Device Admin Basic Wi-Fi Profile' NetworkName = 'b71f8c63-8140-4c7e-b818-f9b4aa98b79b' diff --git a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.Tests.ps1 index 1f451b30c1..90d86640e5 100644 --- a/Tests/Unit/Microsoft365DSC/Microsoft365DSC.IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.IntuneWiFiConfigurationPolicyAndroidDeviceAdministratorBasic.Tests.ps1 @@ -24,7 +24,6 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { $secpasswd = ConvertTo-SecureString 'test@password1' -AsPlainText -Force $Credential = New-Object System.Management.Automation.PSCredential ('tenantadmin@mydomain.com', $secpasswd) - Mock -CommandName Confirm-M365DSCDependencies -MockWith { } @@ -57,6 +56,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Context -Name 'The IntuneWifiConfigurationPolicyAndroidDeviceAdministratorBasic should exist but it DOES NOT' -Fixture { BeforeAll { $testParams = @{ + ConnectAutomatically = $True ConnectWhenNetworkNameIsHidden = $True Description = 'FakeStringValue' DisplayName = 'FakeStringValue' @@ -87,6 +87,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Context -Name 'The IntuneWifiConfigurationPolicyAndroidDeviceAdministratorBasic exists but it SHOULD NOT' -Fixture { BeforeAll { $testParams = @{ + ConnectAutomatically = $True ConnectWhenNetworkNameIsHidden = $True Description = 'FakeStringValue' DisplayName = 'FakeStringValue' @@ -134,6 +135,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Context -Name 'The IntuneWifiConfigurationPolicyAndroidDeviceAdministratorBasic Exists and Values are already in the desired state' -Fixture { BeforeAll { $testParams = @{ + ConnectAutomatically = $True ConnectWhenNetworkNameIsHidden = $True Description = 'FakeStringValue' DisplayName = 'FakeStringValue' @@ -173,6 +175,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Context -Name 'The IntuneWifiConfigurationPolicyAndroidDeviceAdministratorBasic exists and values are NOT in the desired state' -Fixture { BeforeAll { $testParams = @{ + ConnectAutomatically = $True ConnectWhenNetworkNameIsHidden = $True Description = 'FakeStringValue' DisplayName = 'FakeStringValue'