From 290540b25a5cc6deeca02974c8d9ad1db5c30393 Mon Sep 17 00:00:00 2001 From: DrIOS <58635327+DrIOSX@users.noreply.github.com> Date: Tue, 28 May 2024 19:25:27 -0500 Subject: [PATCH] fix: Refactor Initialize-CISAuditResult to use global test definitions --- source/Private/Initialize-CISAuditResult.ps1 | 3 +-- source/Public/Invoke-M365SecurityAudit.ps1 | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/Private/Initialize-CISAuditResult.ps1 b/source/Private/Initialize-CISAuditResult.ps1 index dd92a7b..b1e2e09 100644 --- a/source/Private/Initialize-CISAuditResult.ps1 +++ b/source/Private/Initialize-CISAuditResult.ps1 @@ -17,8 +17,7 @@ function Initialize-CISAuditResult { ) # Import the test definitions CSV file - $testDefinitionsPath = Join-Path -Path $PSScriptRoot -ChildPath "helper/TestDefinitions.csv" - $testDefinitions = Import-Csv -Path $testDefinitionsPath + $testDefinitions = $script:TestDefinitionsObject # Find the row that matches the provided recommendation (Rec) $testDefinition = $testDefinitions | Where-Object { $_.Rec -eq $Rec } diff --git a/source/Public/Invoke-M365SecurityAudit.ps1 b/source/Public/Invoke-M365SecurityAudit.ps1 index f2059c0..474cc09 100644 --- a/source/Public/Invoke-M365SecurityAudit.ps1 +++ b/source/Public/Invoke-M365SecurityAudit.ps1 @@ -161,7 +161,8 @@ function Invoke-M365SecurityAudit { # Load test definitions from CSV $testDefinitionsPath = Join-Path -Path $PSScriptRoot -ChildPath "helper\TestDefinitions.csv" $testDefinitions = Import-Csv -Path $testDefinitionsPath - + # Load the Test Definitions into the script scope for use in other functions + $script:TestDefinitionsObject = $testDefinitions # Apply filters based on parameter sets switch ($PSCmdlet.ParameterSetName) { 'ELevelFilter' {