vibecoding/M365FoundationsCISReport
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add: connection property to merge

Browse Source
This commit is contained in:
DrIOS
2024-05-30 12:10:14 -05:00
parent c378f5d119
commit 20afb8d83e
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -4,6 +4,10 @@ The format is based on and uses the types of changes according to [Keep a Change
## [Unreleased] ## [Unreleased]
### Changed
- Updated sync function to include connection info.
## [0.1.3] - 2024-05-28 ## [0.1.3] - 2024-05-28
### Added ### Added

4
helpers/Build-Help.ps1
View File

@@ -4,10 +4,10 @@ Import-Module .\output\module\M365FoundationsCISReport\*\*.psd1
<# <#
$ver = "v0.1.2" $ver = "v0.1.3"
git checkout main git checkout main
git pull origin main git pull origin main
git tag -a $ver -m "Release version $ver Bugfix Update" git tag -a $ver -m "Release version $ver refactor Update"
git push origin $ver git push origin $ver
"Fix: PR #37" "Fix: PR #37"
git push origin $ver git push origin $ver

5
source/Private/Merge-CISExcelAndCsvData.ps1
View File

@@ -23,11 +23,10 @@ function Merge-CISExcelAndCsvData {
foreach ($property in $excelItem.PSObject.Properties) { foreach ($property in $excelItem.PSObject.Properties) {
$newObject | Add-Member -MemberType NoteProperty -Name $property.Name -Value $property.Value $newObject | Add-Member -MemberType NoteProperty -Name $property.Name -Value $property.Value
} }
$newObject | Add-Member -MemberType NoteProperty -Name 'CSV_Connection' -Value $csvRow.Connection
$newObject | Add-Member -MemberType NoteProperty -Name 'CSV_Status' -Value $csvRow.Status $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_Status' -Value $csvRow.Status
$newObject | Add-Member -MemberType NoteProperty -Name 'CSV_Details' -Value $csvRow.Details $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_Details' -Value $csvRow.Details
$newObject | Add-Member -MemberType NoteProperty -Name 'CSV_FailureReason' -Value $csvRow.FailureReason $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_FailureReason' -Value $csvRow.FailureReason
return $newObject return $newObject
} }
@@ -37,7 +36,7 @@ function Merge-CISExcelAndCsvData {
if ($csvRow) { if ($csvRow) {
CreateMergedObject -excelItem $item -csvRow $csvRow CreateMergedObject -excelItem $item -csvRow $csvRow
} else { } else {
CreateMergedObject -excelItem $item -csvRow ([PSCustomObject]@{Status=$null; Details=$null; FailureReason=$null}) CreateMergedObject -excelItem $item -csvRow ([PSCustomObject]@{Connection=$null;Status=$null; Details=$null; FailureReason=$null })
} }
} }