Merge pull request #133 from maester365/merill-cisa

Moved module variables to script
maester365 · Apr 25, 2024 · 7e2bbf4 · 7e2bbf4
2 parents 3437198 + d27606a
commit 7e2bbf4
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 22 deletions.
diff --git a/powershell/Maester.psm1 b/powershell/Maester.psm1
@@ -13,9 +13,12 @@
 
 ## Initialize Module Variables
 ## Update Clear-ModuleVariable function in internal/Clear-ModuleVariable.ps1 if you add new variables here
-$MtGraphCache = @{}
-$MtGraphBaseUri = $null
-$MtTestResultDetail = @{}
+$__MtSession = @{
+	GraphCache = @{}
+	GraphBaseUri = $null
+	TestResultDetail = @{}
+}
+New-Variable -Name __MtSession -Value $__MtSession -Scope Script -Force
 
 # Import private and public scripts and expose the public ones
 $privateScripts = @(Get-ChildItem -Path "$PSScriptRoot\internal" -Recurse -Filter "*.ps1")

diff --git a/powershell/internal/Clear-ModuleVariable.ps1 b/powershell/internal/Clear-ModuleVariable.ps1
@@ -14,6 +14,6 @@ Function Clear-ModuleVariable {
     param()
 
     Clear-MtGraphCache
-    $MtGraphBaseUri = $null
-    $MtTestResultDetail = @{}
+    $__MtSession.GraphBaseUri = $null
+    $__MtSession.TestResultDetail = @{}
 }
diff --git a/powershell/internal/ConvertTo-MtMaesterResults.ps1 b/powershell/internal/ConvertTo-MtMaesterResults.ps1
@@ -63,7 +63,7 @@ function ConvertTo-MtMaesterResult {
             ScriptBlockFile = $test.ScriptBlock.File
             ErrorRecord     = $test.ErrorRecord
             Block           = $test.Block.Name
-            ResultDetail    = $MtTestResultDetail[$test.ExpandedName]
+            ResultDetail    = $__MtSession.TestResultDetail[$test.ExpandedName]
         }
         $mtTests += $mtTestInfo
     }

diff --git a/powershell/internal/Invoke-MtGraphRequestCache.ps1 b/powershell/internal/Invoke-MtGraphRequestCache.ps1
@@ -20,14 +20,14 @@ Function Invoke-MtGraphRequestCache {
 
     $results = $null
     $isBatch = $uri.AbsoluteUri.EndsWith('$batch')
-    $isInCache = $MtGraphCache.ContainsKey($Uri.AbsoluteUri)
+    $isInCache = $__MtSession.GraphCache.ContainsKey($Uri.AbsoluteUri)
     $cacheKey = $Uri.AbsoluteUri
     $isMethodGet = $Method -eq 'GET'
 
     if (!$DisableCache -and !$isBatch -and $isInCache -and $isMethodGet) {
         # Don't read from cache for batch requests.
-        Write-Verbose ("Checking cache: $($cacheKey)")
-        $results = $MtGraphCache[$cacheKey]
+        Write-Verbose ("Using graph cache: $($cacheKey)")
+        $results = $__MtSession.GraphCache[$cacheKey]
     }
 
     if (!$results) {
@@ -36,9 +36,9 @@ Function Invoke-MtGraphRequestCache {
         if (!$isBatch -and $isMethodGet) {
             # Update cache
             if ($isInCache) {
-                $MtGraphCache[$cacheKey] = $results
+                $__MtSession.GraphCache[$cacheKey] = $results
             } else {
-                $MtGraphCache.Add($cacheKey, $results)
+                $__MtSession.GraphCache.Add($cacheKey, $results)
             }
         }
     }

diff --git a/powershell/public/Add-MtTestResultDetail.ps1 b/powershell/public/Add-MtTestResultDetail.ps1
@@ -96,11 +96,13 @@ Function Add-MtTestResultDetail {
 
     Write-MtProgress -Activity "Running tests" -Status $testName
     Write-Verbose "Adding test result detail for $testName"
-    Write-Verbose "Description: $Description"
+    # Write-Verbose "Description: $Description" # Makes it VERY verbose
     Write-Verbose "Result: $Result"
 
-    if ($null -ne $MtTestResultDetail -and ![string]::IsNullOrEmpty($testName)) {
-        # Only set if we are running in the context of Maester
-        $MtTestResultDetail[$testName] = $testInfo
+    if ($__MtSession -and $__MtSession.TestResultDetail) {
+        if (![string]::IsNullOrEmpty($testName)) {
+            # Only set if we are running in the context of Maester
+            $__MtSession.TestResultDetail[$testName] = $testInfo
+        }
     }
 }
diff --git a/powershell/public/Clear-MtGraphCache.ps1 b/powershell/public/Clear-MtGraphCache.ps1
@@ -23,5 +23,5 @@ function Clear-MtGraphCache {
 
     Write-Verbose -Message "Clearing the results cached from Graph API calls in this session"
 
-    $MtGraphCache = @{}
+    $__MtSession.GraphCache = @{}
 }
diff --git a/powershell/public/Get-MtConditionalAccessPolicy.ps1 b/powershell/public/Get-MtConditionalAccessPolicy.ps1
@@ -14,7 +14,6 @@ Function Get-MtConditionalAccessPolicy {
 
   Write-Verbose -Message "Getting conditional access policies."
 
-  # Note Graph v1.0 appears to return updates faster than beta
-  return Invoke-MtGraphRequest -RelativeUri 'identity/conditionalAccess/policies' -ApiVersion v1.0
+  return Invoke-MtGraphRequest -RelativeUri 'identity/conditionalAccess/policies' -ApiVersion beta
 
 }
diff --git a/powershell/public/Invoke-MtGraphRequest.ps1 b/powershell/public/Invoke-MtGraphRequest.ps1
@@ -70,12 +70,12 @@ Function Invoke-MtGraphRequest {
 
     begin {
         if ([string]::IsNullOrEmpty($GraphBaseUri)) {
-            if ([string]::IsNullOrEmpty($MtGraphBaseUri)) {
+            if ([string]::IsNullOrEmpty($__MtSession.GraphBaseUri)) {
                 Write-Verbose -Message "Setting GraphBaseUri to default value from MgContext."
-                $MtGraphBaseUri = $((Get-MgEnvironment -Name (Get-MgContext).Environment).GraphEndpoint)
+                $__MtSession.GraphBaseUri = $((Get-MgEnvironment -Name (Get-MgContext).Environment).GraphEndpoint)
             }
         }
-        $GraphBaseUri = $MtGraphBaseUri
+        $GraphBaseUri = $__MtSession.GraphBaseUri
 
         $listRequests = New-Object 'System.Collections.Generic.List[psobject]'
 

diff --git a/powershell/public/Test-MtPimAlertsExists.ps1 b/powershell/public/Test-MtPimAlertsExists.ps1
@@ -38,7 +38,7 @@ Function Test-MtPimAlertsExists {
     $Alert = Invoke-MtGraphRequest -ApiVersion "beta" -RelativeUri "privilegedAccess/aadroles/resources/$($tenantId)/alerts" | Where-Object { $_.id -eq $AlertId }
 
     $AffectedRoleAssignments = $Alert.additionalData | ForEach-Object {
-      $CurrentItem = $_['item']
+      $CurrentItem = $_.item
       $result = New-Object psobject
       foreach ($entry in $CurrentItem.GetEnumerator()) {
         $result | Add-Member -MemberType NoteProperty -Name $entry.key -Value $entry.value -Force