add: Version number to test output
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
class CISAuditResult {
|
||||
[string]$M365AuditVersion
|
||||
[string]$Status
|
||||
[string]$ELevel
|
||||
[string]$ProfileLevel
|
||||
|
||||
@@ -20,7 +20,7 @@ function Initialize-CISAuditResult {
|
||||
[Parameter(ParameterSetName = 'Error')]
|
||||
[switch]$Failure
|
||||
)
|
||||
|
||||
$M365AuditVersion = $Script:CISVersion
|
||||
# Import the test definitions CSV file
|
||||
$testDefinitions = $script:TestDefinitionsObject
|
||||
|
||||
@@ -45,6 +45,7 @@ function Initialize-CISAuditResult {
|
||||
$auditResult.Automated = [bool]::Parse($testDefinition.Automated)
|
||||
$auditResult.Connection = $testDefinition.Connection
|
||||
$auditResult.CISControlVer = 'v8'
|
||||
$auditResult.M365AuditVersion = $M365AuditVersion
|
||||
|
||||
if ($PSCmdlet.ParameterSetName -eq 'Full') {
|
||||
$auditResult.Result = $Result
|
||||
|
||||
@@ -87,7 +87,7 @@ function Export-M365SecurityAuditTable {
|
||||
)
|
||||
Begin {
|
||||
# Load v4.0 definitions
|
||||
$Version = '4.0.0'
|
||||
$AuditResults[0].M365AuditVersion
|
||||
$script:TestDefinitionsObject = Get-TestDefinition -Version $Version
|
||||
# Ensure Excel support if requested
|
||||
if ($ExportToExcel) {
|
||||
|
||||
@@ -194,10 +194,9 @@ function Invoke-M365SecurityAudit {
|
||||
# Ensure MgGraph assemblies are loaded prior to running PnP cmdlets
|
||||
Get-MgGroup -Top 1 -ErrorAction SilentlyContinue | Out-Null
|
||||
}
|
||||
# Define a function to load and merge test definitions
|
||||
|
||||
$Script:CISVersion = $Version
|
||||
# Call the function to load and merge test definitions
|
||||
$testDefinitions = Get-TestDefinitions -Version $Version
|
||||
$testDefinitions = Get-TestDefinition -Version $Version
|
||||
# Load the Test Definitions into the script scope for use in other functions
|
||||
$script:TestDefinitionsObject = $testDefinitions
|
||||
# Apply filters based on parameter sets
|
||||
|
||||
Reference in New Issue
Block a user