Skip to content

Commit

Permalink
Minor style changes
Browse files Browse the repository at this point in the history
Co-authored-by: David Bui <[email protected]>
  • Loading branch information
adhilto and buidav authored Oct 1, 2024
1 parent e3f7b7f commit 825227f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h1>SCuBA M365 Security Baseline Conformance Reports</h1>
{TABLES}
<footer>
Report generated with <a class="individual_reports" href="https://github.com/cisagov/ScubaGear">CISA's ScubaGear</a> tool {MODULE_VERSION}
<br>
<br></br>
<span class="uuid">Report UUID: {REPORT_UUID}.</span>
</footer>
</main>
Expand Down
6 changes: 3 additions & 3 deletions PowerShell/ScubaGear/Modules/Orchestrator.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -1209,8 +1209,8 @@ function Invoke-ReportCreation {
$TenantMetaData = $TenantMetaData -replace '^(.*?)<table>','<table class ="tenantdata" style = "text-align:center;">'
$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"
Expand Down Expand Up @@ -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
}
Expand Down

0 comments on commit 825227f

Please sign in to comment.