Skip to content

Commit

Permalink
Merge pull request #1 from doc352/FixSCAuth
Browse files Browse the repository at this point in the history
Fixes additional Get-TargetResource calls from SCComplianceCase and SCComplianceSearchAction to use @PSBoundParameters and removes $PSBoundParameters.Clone() from SCComplianceSearchAction
  • Loading branch information
doc352 authored Jan 25, 2023
2 parents b9223b1 + 5ae1cc6 commit 60b8b3f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -387,11 +387,7 @@ function Export-TargetResource
foreach ($Case in $Cases)
{
Write-Host " GDPR: [$i/$($Cases.Count)] $($Case.Name)" -NoNewline
$Params = @{
Name = $Case.Name
Credential = $Credential
}
$Results = Get-TargetResource @Params
$Results = Get-TargetResource @PSBoundParameters -Name $Case.Name
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
$currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName `
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -523,17 +523,18 @@ function Export-TargetResource
foreach ($action in $actions)
{
Write-Host " |---[$i/$($actions.Length)] $($action.Name)" -NoNewline
$Params = $PSBoundParameters.Clone()
$Params.Action = $action.Action
$Params.SearchName = $action.SearchName
$Params = @{
Action = $action.Action
SearchName = $action.SearchName
}

$Scenario = Get-ResultProperty -ResultString $action.Results -PropertyName 'Scenario'

if ('RetentionReports' -eq $Scenario)
{
$Params.Action = 'Retention'
}
$Results = Get-TargetResource @Params
$Results = Get-TargetResource @PSBoundParameters @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
$currentDSCBlock = Get-M365DSCExportContentForResource -ResourceName $ResourceName `
Expand Down Expand Up @@ -565,7 +566,6 @@ function Export-TargetResource
$Params = @{
Action = $action.Action
SearchName = $action.SearchName
Credential = $Credential
}

$Scenario = Get-ResultProperty -ResultString $action.Results -PropertyName 'Scenario'
Expand All @@ -574,7 +574,7 @@ function Export-TargetResource
{
$Params.Action = 'Retention'
}
$Results = Get-TargetResource @Params
$Results = Get-TargetResource @PSBoundParameters @Params
$Results = Update-M365DSCExportAuthenticationResults -ConnectionMode $ConnectionMode `
-Results $Results
$dscContent += Get-M365DSCExportContentForResource -ResourceName $ResourceName `
Expand Down

0 comments on commit 60b8b3f

Please sign in to comment.