PR:IntuneDeviceEnrollmentPlatformRestriction - Fixes 3730 #4054
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@William-Francillette Could you please apply this patch below on top of yours? In Test-TargetResource it removes Identity parameter instead of Id since the latter doesn't exist in the resource, it also removes all auth parameters from {Set,Test}-TargetResource. Additionally it removes some leftovers from one of my other PRs that I forgot to remove. diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentPlatformRestriction/MSFT_IntuneDeviceEnrollmentPlatformRestriction.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentPlatformRestriction/MSFT_IntuneDeviceEnrollmentPlatformRestriction.psm1
index 40e5fe25f..c20427365 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentPlatformRestriction/MSFT_IntuneDeviceEnrollmentPlatformRestriction.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceEnrollmentPlatformRestriction/MSFT_IntuneDeviceEnrollmentPlatformRestriction.psm1
@@ -274,14 +274,7 @@ function Set-TargetResource
#endregion
$currentCategory = Get-TargetResource @PSBoundParameters
- $PSBoundParameters.Remove('Credential') | Out-Null
- $PSBoundParameters.Remove('ApplicationId') | Out-Null
- $PSBoundParameters.Remove('TenantId') | Out-Null
- $PSBoundParameters.Remove('ApplicationSecret') | Out-Null
- $PSBoundParameters.Remove('ManagedIdentity') | Out-Null
- $PSBoundParameters.Remove('Ensure') | Out-Null
- $PSBoundParameters.Remove('CertificateThumbprint') | Out-Null
- $PSBoundParameters.Remove('Verbose') | Out-Null
+ $PSBoundParameters = Remove-M365DSCAuthenticationParameter -BoundParameters $PSBoundParameters
$PSBoundParameters.Remove('Identity') | Out-Null
if ($Ensure -eq 'Present' -and $currentCategory.Ensure -eq 'Absent')
@@ -516,6 +509,9 @@ function Test-TargetResource
$CurrentValues = Get-TargetResource @PSBoundParameters
$ValuesToCheck = ([Hashtable]$PSBoundParameters).clone()
+ $ValuesToCheck = Remove-M365DSCAuthenticationParameter -BoundParameters $ValuesToCheck
+ $ValuesToCheck.Remove('Identity') | Out-Null
+ $ValuesToCheck.Remove('WindowsMobileRestriction') | Out-Null
if ($CurrentValues.Ensure -eq 'Absent')
{
@@ -547,13 +543,6 @@ function Test-TargetResource
}
}
- $ValuesToCheck.Remove('Credential') | Out-Null
- $ValuesToCheck.Remove('ApplicationId') | Out-Null
- $ValuesToCheck.Remove('TenantId') | Out-Null
- $ValuesToCheck.Remove('ApplicationSecret') | Out-Null
- $ValuesToCheck.Remove('Id') | Out-Null
- $ValuesToCheck.Remove('WindowsMobileRestriction') | Out-Null
-
#Convert any DateTime to String
foreach ($key in $ValuesToCheck.Keys)
{
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined.psm1
index c19fb4f99..5c144e69b 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADHybridJoined.psm1
@@ -571,12 +571,6 @@ function Test-TargetResource
}
}
- $ValuesToCheck.Remove('Id') | Out-Null
- $ValuesToCheck.Remove('Credential') | Out-Null
- $ValuesToCheck.Remove('ApplicationId') | Out-Null
- $ValuesToCheck.Remove('TenantId') | Out-Null
- $ValuesToCheck.Remove('ApplicationSecret') | Out-Null
-
Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)"
Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $ValuesToCheck)"
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined.psm1
index ff01ef6f8..605ad7f2f 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined/MSFT_IntuneWindowsAutopilotDeploymentProfileAzureADJoined.psm1
@@ -591,12 +591,6 @@ function Test-TargetResource
}
}
- $ValuesToCheck.Remove('Id') | Out-Null
- $ValuesToCheck.Remove('Credential') | Out-Null
- $ValuesToCheck.Remove('ApplicationId') | Out-Null
- $ValuesToCheck.Remove('TenantId') | Out-Null
- $ValuesToCheck.Remove('ApplicationSecret') | Out-Null
-
Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)"
Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $ValuesToCheck)"
|
sorted |
NikCharlebois
approved these changes
Dec 19, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request (PR) description
This Pull Request (PR) fixes the following issues
FIXES #3730