From 825227fed0fafa5801a55c59112ec06bc8b8f04d Mon Sep 17 00:00:00 2001 From: Alden Hilton <106177711+adhilto@users.noreply.github.com> Date: Tue, 1 Oct 2024 08:39:38 -0700 Subject: [PATCH] Minor style changes Co-authored-by: David Bui <105074908+buidav@users.noreply.github.com> --- .../Modules/CreateReport/ParentReport/ParentReport.html | 2 +- PowerShell/ScubaGear/Modules/Orchestrator.psm1 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PowerShell/ScubaGear/Modules/CreateReport/ParentReport/ParentReport.html b/PowerShell/ScubaGear/Modules/CreateReport/ParentReport/ParentReport.html index 078f976d5b..bf811475db 100644 --- a/PowerShell/ScubaGear/Modules/CreateReport/ParentReport/ParentReport.html +++ b/PowerShell/ScubaGear/Modules/CreateReport/ParentReport/ParentReport.html @@ -28,7 +28,7 @@

SCuBA M365 Security Baseline Conformance Reports

{TABLES} diff --git a/PowerShell/ScubaGear/Modules/Orchestrator.psm1 b/PowerShell/ScubaGear/Modules/Orchestrator.psm1 index 917015832f..f793a9ec1e 100644 --- a/PowerShell/ScubaGear/Modules/Orchestrator.psm1 +++ b/PowerShell/ScubaGear/Modules/Orchestrator.psm1 @@ -1209,8 +1209,8 @@ function Invoke-ReportCreation { $TenantMetaData = $TenantMetaData -replace '^(.*?)','
' $Fragment = $Fragment | ConvertTo-Html -Fragment -ErrorAction 'Stop' - $FileName = Join-Path -Path $OutFolderPath -ChildPath "$($OutProviderFileName).json" -Resolve - $ReportUuid = $(Get-Utf8NoBom -FilePath $FileName | ConvertFrom-Json).report_uuid + $ProviderJSONFilePath = Join-Path -Path $OutFolderPath -ChildPath "$($OutProviderFileName).json" -Resolve + $ReportUuid = $(Get-Utf8NoBom -FilePath $ProviderJSONFilePath | ConvertFrom-Json).report_uuid $ReportHtmlPath = Join-Path -Path $ReporterPath -ChildPath "ParentReport" -ErrorAction 'Stop' $ReportHTML = (Get-Content $(Join-Path -Path $ReportHtmlPath -ChildPath "ParentReport.html") -ErrorAction 'Stop') -Join "`n" @@ -1767,7 +1767,7 @@ function Invoke-SCuBACached { $SettingsExport = Get-Content $ProviderJSONFilePath | ConvertFrom-Json # Generate a new UUID if the original data doesn't have one - if (-Not (Get-Member -InputObject $SettingsExport -Name "report_uuid" -MemberType Properties)) { + if (-not (Get-Member -InputObject $SettingsExport -Name "report_uuid" -MemberType Properties)) { try { $Guid = New-Guid }