From 6068b48d245494302f3a81abdecb33b6ee3245be Mon Sep 17 00:00:00 2001
From: Fabien Tschanz <fabien.tschanz@bluewin.ch>
Date: Tue, 28 Jan 2025 22:30:15 +0100
Subject: [PATCH] Improve performance of AAD resources
---
CHANGELOG.md | 5 ++
.../MSFT_AADAccessReviewDefinition.psm1 | 72 ++++++++++---------
.../MSFT_AADAccessReviewPolicy.psm1 | 47 ++++++------
.../MSFT_AADActivityBasedTimeoutPolicy.psm1 | 54 ++++++++------
.../MSFT_AADAdminConsentRequestPolicy.psm1 | 47 ++++++------
.../MSFT_AADAttributeSet.psm1 | 50 +++++++------
...ADAuthenticationContextClassReference.psm1 | 54 ++++++++------
...thenticationMethodPolicyAuthenticator.psm1 | 54 ++++++++------
...FT_AADAuthenticationMethodPolicyEmail.psm1 | 54 ++++++++------
...AADAuthenticationMethodPolicyExternal.psm1 | 59 +++++++--------
...FT_AADAuthenticationMethodPolicyFido2.psm1 | 54 ++++++++------
...AADAuthenticationMethodPolicyHardware.psm1 | 54 ++++++++------
...MSFT_AADAuthenticationMethodPolicySms.psm1 | 54 ++++++++------
...AADAuthenticationMethodPolicySoftware.psm1 | 54 ++++++++------
...ADAuthenticationMethodPolicyTemporary.psm1 | 54 ++++++++------
...FT_AADAuthenticationMethodPolicyVoice.psm1 | 54 ++++++++------
...SFT_AADAuthenticationMethodPolicyX509.psm1 | 54 ++++++++------
.../MSFT_AADAuthenticationRequirement.psm1 | 46 +++++++-----
.../MSFT_AADClaimsMappingPolicy.psm1 | 68 ++++++++++--------
...SFT_AADConnectorGroupApplicationProxy.psm1 | 72 +++++++++----------
...enantAccessPolicyConfigurationPartner.psm1 | 47 +++++++-----
...MSFT_AADCustomAuthenticationExtension.psm1 | 65 +++++++----------
..._AADCustomSecurityAttributeDefinition.psm1 | 58 +++++++--------
.../MSFT_AADDomain/MSFT_AADDomain.psm1 | 48 +++++++------
...AADEntitlementManagementAccessPackage.psm1 | 31 ++++----
25 files changed, 718 insertions(+), 591 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fe1dc8ebd..78167d539a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
# Change log for Microsoft365DSC
+# UNRELEASED
+
+* AAD Workload
+ * Improved performance of various resources during export.
+
# 1.25.122.2
* AADAdminConsentRequestPolicy
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewDefinition/MSFT_AADAccessReviewDefinition.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewDefinition/MSFT_AADAccessReviewDefinition.psm1
index c29b4d17cf..5b88d542f6 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewDefinition/MSFT_AADAccessReviewDefinition.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewDefinition/MSFT_AADAccessReviewDefinition.psm1
@@ -68,47 +68,54 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
- $getValue = $null
- #region resource generator code
- $getValue = Get-MgBetaIdentityGovernanceAccessReviewDefinition -AccessReviewScheduleDefinitionId $Id -ErrorAction SilentlyContinue
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- if ($null -eq $getValue)
- {
- Write-Verbose -Message "Could not find an Azure AD Access Review Definition with Id {$Id}"
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
+
+ $getValue = $null
+ #region resource generator code
+ $getValue = Get-MgBetaIdentityGovernanceAccessReviewDefinition -AccessReviewScheduleDefinitionId $Id -ErrorAction SilentlyContinue
- if (-not [System.String]::IsNullOrEmpty($DisplayName))
+ if ($null -eq $getValue)
{
- $getValue = Get-MgBetaIdentityGovernanceAccessReviewDefinition `
- -Filter "DisplayName eq '$DisplayName'" `
- -ErrorAction SilentlyContinue | Where-Object `
- -FilterScript {
- $_.AdditionalProperties.'@odata.type' -eq '#microsoft.graph.AccessReviewScheduleDefinition'
+ Write-Verbose -Message "Could not find an Azure AD Access Review Definition with Id {$Id}"
+
+ if (-not [System.String]::IsNullOrEmpty($DisplayName))
+ {
+ $getValue = Get-MgBetaIdentityGovernanceAccessReviewDefinition `
+ -Filter "DisplayName eq '$DisplayName'" `
+ -ErrorAction SilentlyContinue | Where-Object `
+ -FilterScript {
+ $_.AdditionalProperties.'@odata.type' -eq '#microsoft.graph.AccessReviewScheduleDefinition'
+ }
}
}
+ #endregion
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Access Review Definition with DisplayName {$DisplayName}."
+ return $nullResult
+ }
}
- #endregion
- if ($null -eq $getValue)
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Access Review Definition with DisplayName {$DisplayName}."
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$Id = $getValue.Id
Write-Verbose -Message "An Azure AD Access Review Definition with Id {$Id} and DisplayName {$DisplayName} was found"
@@ -814,6 +821,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewPolicy/MSFT_AADAccessReviewPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewPolicy/MSFT_AADAccessReviewPolicy.psm1
index 7697cbcc1a..d741de52e3 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewPolicy/MSFT_AADAccessReviewPolicy.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAccessReviewPolicy/MSFT_AADAccessReviewPolicy.psm1
@@ -41,28 +41,35 @@ function Get-TargetResource
$AccessTokens
)
- New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters | Out-Null
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
-
- $nullResult = $PSBoundParameters
try
{
- $instance = Get-MgBetaPolicyAccessReviewPolicy -ErrorAction Stop
- if ($null -eq $instance)
+ if (-not $Script:exportedInstance)
+ {
+ New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters | Out-Null
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
+
+ $nullResult = $PSBoundParameters
+ $instance = Get-MgBetaPolicyAccessReviewPolicy -ErrorAction SilentlyContinue
+ if ($null -eq $instance)
+ {
+ throw 'Could not retrieve the Access Review Policy'
+ }
+ }
+ else
{
- throw 'Could not retrieve the Access Review Policy'
+ $instance = $Script:exportedInstance
}
$results = @{
@@ -277,7 +284,6 @@ function Export-TargetResource
try
{
- $Script:ExportMode = $true
[array] $Script:exportedInstances = Get-MgBetaPolicyAccessReviewPolicy -ErrorAction Stop
$i = 1
@@ -310,6 +316,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADActivityBasedTimeoutPolicy/MSFT_AADActivityBasedTimeoutPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADActivityBasedTimeoutPolicy/MSFT_AADActivityBasedTimeoutPolicy.psm1
index 735b09dfff..78c6d0dd7a 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADActivityBasedTimeoutPolicy/MSFT_AADActivityBasedTimeoutPolicy.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADActivityBasedTimeoutPolicy/MSFT_AADActivityBasedTimeoutPolicy.psm1
@@ -60,32 +60,39 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
- #region resource generator code
- $getValue = Get-MgBetaPolicyActivityBasedTimeoutPolicy -ErrorAction SilentlyContinue
- #endregion
- if ($null -eq $getValue)
+ $getValue = $null
+ #region resource generator code
+ $getValue = Get-MgBetaPolicyActivityBasedTimeoutPolicy -ErrorAction SilentlyContinue
+ #endregion
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Activity Based Timeout Policy with DisplayName {$DisplayName}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Activity Based Timeout Policy with DisplayName {$DisplayName}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$Id = $getValue.Id
Write-Verbose -Message "An Azure AD Activity Based Timeout Policy with Id {$Id} and DisplayName {$DisplayName} was found."
@@ -525,6 +532,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdminConsentRequestPolicy/MSFT_AADAdminConsentRequestPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdminConsentRequestPolicy/MSFT_AADAdminConsentRequestPolicy.psm1
index db857d353c..77ebe8e3ec 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdminConsentRequestPolicy/MSFT_AADAdminConsentRequestPolicy.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAdminConsentRequestPolicy/MSFT_AADAdminConsentRequestPolicy.psm1
@@ -57,28 +57,35 @@ function Get-TargetResource
$AccessTokens
)
- New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters | Out-Null
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
-
- $nullResult = $PSBoundParameters
try
{
- $instance = Get-MgBetaPolicyAdminConsentRequestPolicy -ErrorAction Stop
- if ($null -eq $instance)
+ if (-not $Script:exportedInstance)
+ {
+ New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters | Out-Null
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
+
+ $nullResult = $PSBoundParameters
+ $instance = Get-MgBetaPolicyAdminConsentRequestPolicy -ErrorAction SilentlyContinue
+ if ($null -eq $instance)
+ {
+ throw 'Could not retrieve the Admin Consent Request Policy'
+ }
+ }
+ else
{
- throw 'Could not retrieve the Admin Consent Request Policy'
+ $instance = $Script:exportedInstance
}
$reviewersValue = @()
@@ -431,7 +438,6 @@ function Export-TargetResource
try
{
- $Script:ExportMode = $true
[array] $Script:exportedInstances = Get-MgBetaPolicyAdminConsentRequestPolicy -ErrorAction Stop
$i = 1
@@ -464,6 +470,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAttributeSet/MSFT_AADAttributeSet.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAttributeSet/MSFT_AADAttributeSet.psm1
index 759be2e842..938c347b5b 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAttributeSet/MSFT_AADAttributeSet.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAttributeSet/MSFT_AADAttributeSet.psm1
@@ -53,34 +53,41 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
+ $getValue = $null
- $getValue = Get-MgBetaDirectoryAttributeSet `
- -AttributeSetId $Id `
- -ErrorAction SilentlyContinue
+ $getValue = Get-MgBetaDirectoryAttributeSet `
+ -AttributeSetId $Id `
+ -ErrorAction SilentlyContinue
- if ($null -eq $getValue)
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find Attribute Set with Id {$Id}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find Attribute Set with Id {$Id}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
Write-Verbose -Message "Attribute Set with Id {$Id} was found."
@@ -361,6 +368,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationContextClassReference/MSFT_AADAuthenticationContextClassReference.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationContextClassReference/MSFT_AADAuthenticationContextClassReference.psm1
index d889676bfd..28f7757520 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationContextClassReference/MSFT_AADAuthenticationContextClassReference.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationContextClassReference/MSFT_AADAuthenticationContextClassReference.psm1
@@ -58,34 +58,41 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
+ $getValue = $null
- $getValue = Get-MgBetaIdentityConditionalAccessAuthenticationContextClassReference `
- -AuthenticationContextClassReferenceId $Id `
- -ErrorAction SilentlyContinue
+ $getValue = Get-MgBetaIdentityConditionalAccessAuthenticationContextClassReference `
+ -AuthenticationContextClassReferenceId $Id `
+ -ErrorAction SilentlyContinue
- if ($null -eq $getValue)
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find Authentication Context with Id {$Id}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find Authentication Context with Id {$Id}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
Write-Verbose -Message "Authentication Context Policy with Id {$Id} was found."
@@ -385,6 +392,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1
index 3f4c6bff07..22a9b92b6b 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1
@@ -69,33 +69,40 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
- #region resource generator code
- $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
+ $getValue = $null
+ #region resource generator code
+ $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
- #endregion
- if ($null -eq $getValue)
+ #endregion
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Authenticator with id {$id}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Authenticator with id {$id}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$Id = $getValue.Id
Write-Verbose -Message "An Azure AD Authentication Method Policy Authenticator with Id {$Id} was found."
@@ -917,6 +924,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyEmail/MSFT_AADAuthenticationMethodPolicyEmail.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyEmail/MSFT_AADAuthenticationMethodPolicyEmail.psm1
index c77a4371fa..446b1aeda4 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyEmail/MSFT_AADAuthenticationMethodPolicyEmail.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyEmail/MSFT_AADAuthenticationMethodPolicyEmail.psm1
@@ -66,33 +66,40 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
- #region resource generator code
- $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
+ $getValue = $null
+ #region resource generator code
+ $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
- #endregion
- if ($null -eq $getValue)
+ #endregion
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Email with id {$id}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Email with id {$id}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$Id = $getValue.Id
Write-Verbose -Message "An Azure AD Authentication Method Policy Email with Id {$Id} was found."
@@ -578,6 +585,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyExternal/MSFT_AADAuthenticationMethodPolicyExternal.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyExternal/MSFT_AADAuthenticationMethodPolicyExternal.psm1
index 521d55f25a..3d165e0f60 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyExternal/MSFT_AADAuthenticationMethodPolicyExternal.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyExternal/MSFT_AADAuthenticationMethodPolicyExternal.psm1
@@ -68,44 +68,44 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
+ $getValue = $null
- if (-Not [string]::IsNullOrEmpty($DisplayName))
- {
- if ($null -ne $Script:exportedInstances -and $Script:ExportMode)
- {
- $getValue = $Script:exportedInstances | Where-Object -FilterScript { $_.DisplayName -eq $DisplayName }
- }
- else
+ if (-not [string]::IsNullOrEmpty($DisplayName))
{
$response = Invoke-MgGraphRequest -Method Get -Uri ((Get-MSCloudLoginConnectionProfile -Workload MicrosoftGraph).ResourceUrl + 'beta/policies/authenticationMethodsPolicy/')
$getValue = $response.authenticationMethodConfigurations | Where-Object -FilterScript { $_.DisplayName -eq $DisplayName }
}
- }
- #endregion
- if ($null -eq $getValue)
+ #endregion
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy External with DisplayName {$DisplayName}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy External with DisplayName {$DisplayName}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
Write-Verbose -Message "An Azure AD Authentication Method Policy External with displayName {$DisplayName} was found."
@@ -569,6 +569,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyFido2/MSFT_AADAuthenticationMethodPolicyFido2.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyFido2/MSFT_AADAuthenticationMethodPolicyFido2.psm1
index f30289335d..f7582a366b 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyFido2/MSFT_AADAuthenticationMethodPolicyFido2.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyFido2/MSFT_AADAuthenticationMethodPolicyFido2.psm1
@@ -73,33 +73,40 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
- #region resource generator code
- $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
+ $getValue = $null
+ #region resource generator code
+ $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
- #endregion
- if ($null -eq $getValue)
+ #endregion
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Fido2 with id {$id}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Fido2 with id {$id}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$Id = $getValue.Id
Write-Verbose -Message "An Azure AD Authentication Method Policy Fido2 with Id {$Id} was found."
@@ -605,6 +612,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyHardware/MSFT_AADAuthenticationMethodPolicyHardware.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyHardware/MSFT_AADAuthenticationMethodPolicyHardware.psm1
index 1d4f7a7921..723b4f0a83 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyHardware/MSFT_AADAuthenticationMethodPolicyHardware.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyHardware/MSFT_AADAuthenticationMethodPolicyHardware.psm1
@@ -60,33 +60,40 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
- #region resource generator code
- $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
+ $getValue = $null
+ #region resource generator code
+ $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
- #endregion
- if ($null -eq $getValue)
+ #endregion
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Hardware with id {$id}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Hardware with id {$id}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$Id = $getValue.Id
Write-Verbose -Message "An Azure AD Authentication Method Policy Hardware with Id {$Id} was found."
@@ -549,6 +556,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySms/MSFT_AADAuthenticationMethodPolicySms.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySms/MSFT_AADAuthenticationMethodPolicySms.psm1
index 66ebcea0f4..188fdcc9b9 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySms/MSFT_AADAuthenticationMethodPolicySms.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySms/MSFT_AADAuthenticationMethodPolicySms.psm1
@@ -61,33 +61,40 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
- #region resource generator code
- $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
+ $getValue = $null
+ #region resource generator code
+ $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
- #endregion
- if ($null -eq $getValue)
+ #endregion
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Sms with id {$id}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Sms with id {$id}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$Id = $getValue.Id
Write-Verbose -Message "An Azure AD Authentication Method Policy Sms with Id {$Id} was found."
@@ -553,6 +560,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySoftware/MSFT_AADAuthenticationMethodPolicySoftware.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySoftware/MSFT_AADAuthenticationMethodPolicySoftware.psm1
index 0e6598e572..7d8bd7934c 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySoftware/MSFT_AADAuthenticationMethodPolicySoftware.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicySoftware/MSFT_AADAuthenticationMethodPolicySoftware.psm1
@@ -61,33 +61,40 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
- #region resource generator code
- $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
+ $getValue = $null
+ #region resource generator code
+ $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
- #endregion
- if ($null -eq $getValue)
+ #endregion
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Software with id {$id}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Software with id {$id}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$Id = $getValue.Id
Write-Verbose -Message "An Azure AD Authentication Method Policy Software with Id {$Id} was found."
@@ -552,6 +559,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyTemporary/MSFT_AADAuthenticationMethodPolicyTemporary.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyTemporary/MSFT_AADAuthenticationMethodPolicyTemporary.psm1
index 4a9afd21c9..1ad824f844 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyTemporary/MSFT_AADAuthenticationMethodPolicyTemporary.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyTemporary/MSFT_AADAuthenticationMethodPolicyTemporary.psm1
@@ -81,33 +81,40 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
- #region resource generator code
- $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
+ $getValue = $null
+ #region resource generator code
+ $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
- #endregion
- if ($null -eq $getValue)
+ #endregion
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message 'Could not find an Azure AD Authentication Method Policy Temporary'
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message 'Could not find an Azure AD Authentication Method Policy Temporary'
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$Id = $getValue.Id
Write-Verbose -Message "An Azure AD Authentication Method Policy Temporary with Id {$($currentExcludeTargets.id))} was found."
@@ -626,6 +633,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyVoice/MSFT_AADAuthenticationMethodPolicyVoice.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyVoice/MSFT_AADAuthenticationMethodPolicyVoice.psm1
index c0efa84b63..bde2d43b71 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyVoice/MSFT_AADAuthenticationMethodPolicyVoice.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyVoice/MSFT_AADAuthenticationMethodPolicyVoice.psm1
@@ -65,33 +65,40 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
- #region resource generator code
- $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
+ $getValue = $null
+ #region resource generator code
+ $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
- #endregion
- if ($null -eq $getValue)
+ #endregion
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Voice with id {$id}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy Voice with id {$id}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$Id = $getValue.Id
Write-Verbose -Message "An Azure AD Authentication Method Policy Voice with Id {$Id} was found."
@@ -565,6 +572,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyX509/MSFT_AADAuthenticationMethodPolicyX509.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyX509/MSFT_AADAuthenticationMethodPolicyX509.psm1
index 007c561dd3..46edf9edb9 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyX509/MSFT_AADAuthenticationMethodPolicyX509.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationMethodPolicyX509/MSFT_AADAuthenticationMethodPolicyX509.psm1
@@ -67,33 +67,40 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
- #region resource generator code
- $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
+ $getValue = $null
+ #region resource generator code
+ $getValue = Get-MgBetaPolicyAuthenticationMethodPolicyAuthenticationMethodConfiguration -AuthenticationMethodConfigurationId $Id -ErrorAction SilentlyContinue
- #endregion
- if ($null -eq $getValue)
+ #endregion
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy X509 with id {$id}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Authentication Method Policy X509 with id {$id}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$Id = $getValue.Id
Write-Verbose -Message "An Azure AD Authentication Method Policy X509 with Id {$Id} was found."
@@ -629,6 +636,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationRequirement/MSFT_AADAuthenticationRequirement.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationRequirement/MSFT_AADAuthenticationRequirement.psm1
index fe1e412886..bcb1ce332d 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationRequirement/MSFT_AADAuthenticationRequirement.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAuthenticationRequirement/MSFT_AADAuthenticationRequirement.psm1
@@ -44,31 +44,38 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
+ $nullResult = $PSBoundParameters
- $getValue = $null
- $url = (Get-MSCloudLoginConnectionProfile -Workload MicrosoftGraph).ResourceUrl + "beta/users/$UserPrincipalName/authentication/requirements"
- $getValue = Invoke-MgGraphRequest -Method Get -Uri $url
+ $getValue = $null
+ $url = (Get-MSCloudLoginConnectionProfile -Workload MicrosoftGraph).ResourceUrl + "beta/users/$UserPrincipalName/authentication/requirements"
+ $getValue = Invoke-MgGraphRequest -Method Get -Uri $url
- if ($null -eq $getValue)
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Authentication Requirement for user with UPN {$UserPrincipalName}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Authentication Requirement for user with UPN {$UserPrincipalName}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
Write-Verbose -Message "An Azure AD Authentication Method Policy Requirement for a user with UPN {$UserPrincipalName} was found."
@@ -348,6 +355,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADClaimsMappingPolicy/MSFT_AADClaimsMappingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADClaimsMappingPolicy/MSFT_AADClaimsMappingPolicy.psm1
index 03264750eb..0e69584348 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADClaimsMappingPolicy/MSFT_AADClaimsMappingPolicy.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADClaimsMappingPolicy/MSFT_AADClaimsMappingPolicy.psm1
@@ -63,44 +63,51 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
- #region resource generator code
- $getValue = Get-MgBetaPolicyClaimMappingPolicy -ClaimsMappingPolicyId $Id -ErrorAction SilentlyContinue
+ $getValue = $null
+ #region resource generator code
+ $getValue = Get-MgBetaPolicyClaimMappingPolicy -ClaimsMappingPolicyId $Id -ErrorAction SilentlyContinue
- if ($null -eq $getValue)
- {
- Write-Verbose -Message "Could not find an Azure AD Claims Mapping Policy with Id {$Id}"
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Claims Mapping Policy with Id {$Id}"
- if (-not [System.String]::IsNullOrEmpty($DisplayName))
+ if (-not [System.String]::IsNullOrEmpty($DisplayName))
+ {
+ $getValue = Get-MgBetaPolicyClaimMappingPolicy `
+ -Filter "DisplayName eq '$DisplayName'" `
+ -ErrorAction SilentlyContinue
+ }
+ }
+ #endregion
+ if ($null -eq $getValue)
{
- $getValue = Get-MgBetaPolicyClaimMappingPolicy `
- -Filter "DisplayName eq '$DisplayName'" `
- -ErrorAction SilentlyContinue
+ Write-Verbose -Message "Could not find an Azure AD Claims Mapping Policy with DisplayName {$DisplayName}."
+ return $nullResult
}
}
- #endregion
- if ($null -eq $getValue)
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Claims Mapping Policy with DisplayName {$DisplayName}."
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$Id = $getValue.Id
Write-Verbose -Message "An Azure AD Claims Mapping Policy with Id {$Id} and DisplayName {$DisplayName} was found"
@@ -543,6 +550,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADConnectorGroupApplicationProxy/MSFT_AADConnectorGroupApplicationProxy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADConnectorGroupApplicationProxy/MSFT_AADConnectorGroupApplicationProxy.psm1
index 5745c0c7e1..ccbbbd5ffc 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADConnectorGroupApplicationProxy/MSFT_AADConnectorGroupApplicationProxy.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADConnectorGroupApplicationProxy/MSFT_AADConnectorGroupApplicationProxy.psm1
@@ -53,58 +53,51 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = $null
- #region resource generator code
- if (-not [string]::IsNullOrEmpty($Id))
- {
- if ($null -ne $Script:exportedInstances -and $Script:ExportMode)
- {
- $getValue = $Script:exportedInstances | Where-Object -FilterScript { $_.Id -eq $Id }
- }
- else
+ $getValue = $null
+ #region resource generator code
+ if (-not [string]::IsNullOrEmpty($Id))
{
$getValue = Get-MgBetaOnPremisePublishingProfileConnectorGroup -ConnectorGroupId $Id -OnPremisesPublishingProfileId 'applicationProxy' -ErrorAction SilentlyContinue
}
- }
- if ($null -eq $getValue -and -not [string]::IsNullOrEmpty($Id))
- {
- Write-Verbose -Message "Could not find an Azure AD Connector Group Application Proxy with Name {$Name}"
- if (-Not [string]::IsNullOrEmpty($DisplayName))
+ if ($null -eq $getValue -and -not [string]::IsNullOrEmpty($Id))
{
- if ($null -ne $Script:exportedInstances -and $Script:ExportMode)
- {
- $getValue = $Script:exportedInstances | Where-Object -FilterScript { $_.Name -eq $Name }
- }
- else
+ Write-Verbose -Message "Could not find an Azure AD Connector Group Application Proxy with Name {$Name}"
+ if (-not [string]::IsNullOrEmpty($DisplayName))
{
$getValue = Get-MgBetaOnPremisePublishingProfileConnectorGroup -OnPremisesPublishingProfileId 'applicationProxy' -Filter "Name eq '$Name'" -ErrorAction Stop
}
}
+ #endregion
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Connector Group Application Proxy with Name {$Name}"
+ return $nullResult
+ }
}
- #endregion
- if ($null -eq $getValue)
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Connector Group Application Proxy with Name {$Name}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$Id = $getValue.Id
@@ -434,6 +427,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1
index af6540843c..73af68b8ec 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1
@@ -68,31 +68,38 @@ function Get-TargetResource
try
{
- $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters
+ if (-not $Script:exportedInstance)
+ {
+ $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- $getValue = Get-MgBetaPolicyCrossTenantAccessPolicyPartner -CrossTenantAccessPolicyConfigurationPartnerTenantId $PartnerTenantId `
- -ErrorAction SilentlyContinue
+ $getValue = Get-MgBetaPolicyCrossTenantAccessPolicyPartner -CrossTenantAccessPolicyConfigurationPartnerTenantId $PartnerTenantId `
+ -ErrorAction SilentlyContinue
- if ($null -eq $getValue)
+ if ($null -eq $getValue)
+ {
+ Write-Verbose -Message "Could not find an Azure AD Cross Tenant Access Configuration Partner with TenantId {$PartnerTenantId}"
+ return $nullResult
+ }
+ }
+ else
{
- Write-Verbose -Message "Could not find an Azure AD Cross Tenant Access Configuration Partner with TenantId {$PartnerTenantId}"
- return $nullResult
+ $getValue = $Script:exportedInstance
}
$B2BCollaborationInboundValue = $null
@@ -494,6 +501,8 @@ function Export-TargetResource
Managedidentity = $ManagedIdentity.IsPresent
AccessTokens = $AccessTokens
}
+
+ $Script:exportedInstance = $entry
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomAuthenticationExtension/MSFT_AADCustomAuthenticationExtension.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomAuthenticationExtension/MSFT_AADCustomAuthenticationExtension.psm1
index 22521a338d..368dc4b401 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomAuthenticationExtension/MSFT_AADCustomAuthenticationExtension.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomAuthenticationExtension/MSFT_AADCustomAuthenticationExtension.psm1
@@ -87,43 +87,28 @@ function Get-TargetResource
$Ensure = 'Present'
)
- New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters | Out-Null
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
-
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
- Write-Verbose -Message 'Fetching result....'
try
{
- # check for export.
- if ($null -ne $Script:exportedInstances -and $Script:ExportMode)
- {
- # check with Id first
- if (-not [System.String]::IsNullOrEmpty($Id))
- {
- $instance = $Script:exportedInstances | Where-Object -FilterScript { $_.Id -eq $Id }
- }
-
- # check with display name next.
- if ($null -eq $instance)
- {
- $instance = $Script:exportedInstances | Where-Object -FilterScript { $_.DisplayName -eq $DisplayName }
- }
- }
- else
+ if (-not $Script:exportedInstance)
{
+ New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters | Out-Null
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
+
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
+ Write-Verbose -Message 'Fetching result....'
if (-not [System.String]::IsNullOrEmpty($Id))
{
$instance = Get-MgBetaIdentityCustomAuthenticationExtension -CustomAuthenticationExtensionId $Id `
@@ -134,10 +119,14 @@ function Get-TargetResource
$instance = Get-MgBetaIdentityCustomAuthenticationExtension -Filter "DisplayName eq '$DisplayName'" `
-ErrorAction SilentlyContinue
}
+ if ($null -eq $instance)
+ {
+ return $nullResult
+ }
}
- if ($null -eq $instance)
+ else
{
- return $nullResult
+ $instance = $Script:exportedInstance
}
Write-Verbose 'Instance found for the resource. Calculating result....'
@@ -146,7 +135,7 @@ function Get-TargetResource
DisplayName = $instance.DisplayName
Id = $instance.Id
Description = $instance.Description
- Ensure = 'Present'
+ Ensure = 'Present'
Credential = $Credential
ApplicationId = $ApplicationId
TenantId = $TenantId
@@ -598,7 +587,6 @@ function Export-TargetResource
try
{
- $Script:ExportMode = $true
[array] $Script:exportedInstances = Get-MgBetaIdentityCustomAuthenticationExtension -ErrorAction Stop
$i = 1
@@ -632,6 +620,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$endpointConfigurationCimString = Get-M365DSCDRGComplexTypeToString `
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomSecurityAttributeDefinition/MSFT_AADCustomSecurityAttributeDefinition.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomSecurityAttributeDefinition/MSFT_AADCustomSecurityAttributeDefinition.psm1
index 2e68367f7d..10c0bc7853 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomSecurityAttributeDefinition/MSFT_AADCustomSecurityAttributeDefinition.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADCustomSecurityAttributeDefinition/MSFT_AADCustomSecurityAttributeDefinition.psm1
@@ -74,38 +74,28 @@ function Get-TargetResource
$AccessTokens
)
- New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters | Out-Null
-
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
-
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
-
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
try
{
- if ($null -ne $Script:exportedInstances -and $Script:ExportMode)
- {
- if (-not [System.String]::IsNullOrEmpty($Id))
- {
- $instance = $Script:exportedInstances | Where-Object -FilterScript { $_.Id -eq $Id }
- }
- if ($null -eq $instance)
- {
- $instance = $Script:exportedInstances | Where-Object -FilterScript { $_.Name -eq $Name }
- }
- }
- else
+ if (-not $Script:exportedInstance)
{
+ New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters | Out-Null
+
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
+
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
+
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
+
if (-not [System.String]::IsNullOrEmpty($Id))
{
$instance = Get-MgBetaDirectoryCustomSecurityAttributeDefinition -CustomSecurityAttributeDefinitionId $Id `
@@ -116,10 +106,14 @@ function Get-TargetResource
$instance = Get-MgBetaDirectoryCustomSecurityAttributeDefinition -Filter "Name eq '$Name'" `
-ErrorAction SilentlyContinue
}
+ if ($null -eq $instance)
+ {
+ return $nullResult
+ }
}
- if ($null -eq $instance)
+ else
{
- return $nullResult
+ $instance = $Script:exportedInstance
}
$results = @{
@@ -431,7 +425,6 @@ function Export-TargetResource
try
{
- $Script:ExportMode = $true
[array] $Script:exportedInstances = Get-MgBetaDirectoryCustomSecurityAttributeDefinition -ErrorAction Stop
$i = 1
@@ -466,6 +459,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADDomain/MSFT_AADDomain.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADDomain/MSFT_AADDomain.psm1
index eff7ae01fc..3fa2f2b1ee 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADDomain/MSFT_AADDomain.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADDomain/MSFT_AADDomain.psm1
@@ -78,30 +78,38 @@ function Get-TargetResource
$AccessTokens
)
- New-M365DSCConnection -Workload 'MicrosoftGraph' `
- -InboundParameters $PSBoundParameters | Out-Null
+ try
+ {
+ if (-not $Script:exportedInstance)
+ {
+ New-M365DSCConnection -Workload 'MicrosoftGraph' `
+ -InboundParameters $PSBoundParameters | Out-Null
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
- try
- {
- $instance = Get-MgBetaDomain -DomainId $Id -ErrorAction SilentlyContinue
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
- if ($null -eq $instance)
+ $instance = Get-MgBetaDomain -DomainId $Id -ErrorAction SilentlyContinue
+
+ if ($null -eq $instance)
+ {
+ return $nullResult
+ }
+ }
+ else
{
- return $nullResult
+ $instance = $Script:exportedInstance
}
$results = @{
@@ -448,7 +456,6 @@ function Export-TargetResource
try
{
- $Script:ExportMode = $true
[array] $Script:exportedInstances = Get-MgBetaDomain -ErrorAction Stop
$i = 1
@@ -481,6 +488,7 @@ function Export-TargetResource
AccessTokens = $AccessTokens
}
+ $Script:exportedInstance = $config
$Results = Get-TargetResource @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1
index 8a3aa932e3..7266217e16 100644
--- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1
+++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1
@@ -84,28 +84,21 @@ function Get-TargetResource
{
$ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
-InboundParameters $PSBoundParameters
- }
- catch
- {
- Write-Verbose -Message ($_)
- }
- #Ensure the proper dependencies are installed in the current environment.
- Confirm-M365DSCDependencies
+ #Ensure the proper dependencies are installed in the current environment.
+ Confirm-M365DSCDependencies
- #region Telemetry
- $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
- $CommandName = $MyInvocation.MyCommand
- $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
- -CommandName $CommandName `
- -Parameters $PSBoundParameters
- Add-M365DSCTelemetryEvent -Data $data
- #endregion
+ #region Telemetry
+ $ResourceName = $MyInvocation.MyCommand.ModuleName.Replace('MSFT_', '')
+ $CommandName = $MyInvocation.MyCommand
+ $data = Format-M365DSCTelemetryParameters -ResourceName $ResourceName `
+ -CommandName $CommandName `
+ -Parameters $PSBoundParameters
+ Add-M365DSCTelemetryEvent -Data $data
+ #endregion
- $nullResult = $PSBoundParameters
- $nullResult.Ensure = 'Absent'
- try
- {
+ $nullResult = $PSBoundParameters
+ $nullResult.Ensure = 'Absent'
$getValue = $null
if (-not [System.String]::IsNullOrEmpty($id))