Bug fixes (#69)

jazuntee · web-flow · commit a3ecdcf01986 · 2022-09-09T10:49:08.000-04:00
* Add progress bar activity for packaging

* Hide error when resource is not found

* Fix format-csv

* Add guidance when data collection fails

* Fix null members error
diff --git a/README.md b/README.md
@@ -44,6 +44,11 @@ Invoke-AADAssessmentHybridDataCollection
 
 The output package will be named according to the following pattern: `AzureADAssessmentData-<TenantDomain>.aad`
 
+If Data Collection command fails before completing, try running it again with the SkipReportOutput parameter.
+```PowerShell
+Invoke-AADAssessmentDataCollection -SkipReportOutput
+```
+
 Once data collection is complete, provide the output packages to whoever is completing the assessment. Please avoid making any changes to the generated files including the name of the file.
 
 ## Complete Assessment Reports
diff --git a/src/Get-AADAssessUserReport.ps1 b/src/Get-AADAssessUserReport.ps1
@@ -79,7 +79,7 @@ function Get-AADAssessUserReport {
                     "onPremisesSyncEnabled" = [bool]$_.onPremisesSyncEnabled
                     "onPremisesImmutableId" = ![string]::IsNullOrWhiteSpace($InputObject.onPremisesImmutableId)
                     "mail" = $InputObject.mail
-                    "otherMails" = $InputObject.otherMails -join ';' 
+                    "otherMails" = $InputObject.otherMails
                     "AADLicense" = $aadLicense
                     "lastInteractiveSignInDateTime" = $lastInteractiveSignInDateTime
                     "lastNonInteractiveSignInDateTime" = $lastNonInteractiveSignInDateTime
diff --git a/src/Invoke-AADAssessmentDataCollection.ps1 b/src/Invoke-AADAssessmentDataCollection.ps1
@@ -358,6 +358,23 @@ function Invoke-AADAssessmentDataCollection {
             Remove-Item -Path (Join-Path $OutputDirectoryAAD "*") -Include "*Data.csv" -ErrorAction Ignore
         }
 
+        ### Package Output
+        if (!$SkipPackaging) {
+            Write-AppInsightsTrace ("{0} - Package Output" -f $MyInvocation.MyCommand.Name) -SeverityLevel Verbose -IncludeProcessStatistics -OrderedProperties (Get-ReferencedIdCacheDetail $ReferencedIdCache)
+            Write-Progress -Id 0 -Activity ('Microsoft Azure AD Assessment - {0}' -f $InitialTenantDomain) -Status 'Packaging Data' -PercentComplete 95
+
+            ### Remove pre existing package (zip) if it exists
+            if (Test-Path -Path $PackagePath) { Remove-Item $PackagePath -Force }
+            
+            ### Package Output
+            #Compress-Archive (Join-Path $OutputDirectoryData '\*') -DestinationPath $PackagePath -Force -ErrorAction Stop
+            [System.IO.Compression.ZipFile]::CreateFromDirectory($OutputDirectoryData, $PackagePath)
+            $PackageFileInfo = Get-Item $PackagePath
+            Write-AppInsightsTrace ("{0} - Package Complete" -f $MyInvocation.MyCommand.Name) -SeverityLevel Verbose -IncludeProcessStatistics -OrderedProperties ((Get-ReferencedIdCacheDetail $ReferencedIdCache) + [ordered]@{ PackageSize = Format-NumberWithUnit $PackageFileInfo.Length 'B'; PackageSizeInBytes = $PackageFileInfo.Length })
+
+            Remove-Item $OutputDirectoryData -Recurse -Force
+        }
+
         ### Complete
         Write-Progress -Id 0 -Activity ('Microsoft Azure AD Assessment - {0}' -f $InitialTenantDomain) -Completed
 
@@ -372,21 +389,6 @@ function Invoke-AADAssessmentDataCollection {
         #Stop-Transcript
         #$Error | Select-Object -Last ($Error.Count - $ErrorStartCount) | Export-Clixml -Path (Join-Path $OutputDirectoryData "PowerShell_errors.xml") -Depth 10
 
-        if (!$SkipPackaging) {
-            Write-AppInsightsTrace ("{0} - Package" -f $MyInvocation.MyCommand.Name) -SeverityLevel Verbose -IncludeProcessStatistics -OrderedProperties (Get-ReferencedIdCacheDetail $ReferencedIdCache)
-
-            ### Remove pre existing package (zip) if it exists
-            if (Test-Path -Path $PackagePath) {
-                Remove-Item $PackagePath -Force
-            }
-            
-            ### Package Output
-            #Compress-Archive (Join-Path $OutputDirectoryData '\*') -DestinationPath $PackagePath -Force -ErrorAction Stop
-            [System.IO.Compression.ZipFile]::CreateFromDirectory($OutputDirectoryData,$PackagePath)
-
-            Remove-Item $OutputDirectoryData -Recurse -Force
-        }
-
         ### Open Directory
         try {
             Invoke-Item $OutputDirectory -ErrorAction SilentlyContinue
diff --git a/src/internal/Expand-GroupTransitiveMembership.ps1 b/src/internal/Expand-GroupTransitiveMembership.ps1
@@ -22,19 +22,21 @@ function Expand-GroupTransitiveMembership {
     if ($Group.psobject.Properties.Name.Contains('transitiveMembers')) { $Group.transitiveMembers }
     else {
         $transitiveMembers = New-Object 'System.Collections.Generic.Dictionary[guid,psobject]'
-        foreach ($member in $Group.members) {
-            if (!$transitiveMembers.ContainsKey($member.id)) {
-                $transitiveMembers.Add($member.id, $member)
-                $member
-            }
-            if ($member.'@odata.type' -eq '#microsoft.graph.group') {
-                if (!$GroupId.Contains($member.id)) {
-                    $GroupId.Push($member.id)
-                    $transitiveMembersNested = Expand-GroupTransitiveMembership $GroupId -LookupCache $LookupCache
-                    foreach ($memberNested in $transitiveMembersNested) {
-                        if (!$transitiveMembers.ContainsKey($memberNested.id)) {
-                            $transitiveMembers.Add($memberNested.id, $memberNested)
-                            $memberNested
+        if ($Group.psobject.Properties.Name.Contains('members')) {
+            foreach ($member in $Group.members) {
+                if (!$transitiveMembers.ContainsKey($member.id)) {
+                    $transitiveMembers.Add($member.id, $member)
+                    $member
+                }
+                if ($member.'@odata.type' -eq '#microsoft.graph.group') {
+                    if (!$GroupId.Contains($member.id)) {
+                        $GroupId.Push($member.id)
+                        $transitiveMembersNested = Expand-GroupTransitiveMembership $GroupId -LookupCache $LookupCache
+                        foreach ($memberNested in $transitiveMembersNested) {
+                            if (!$transitiveMembers.ContainsKey($memberNested.id)) {
+                                $transitiveMembers.Add($memberNested.id, $memberNested)
+                                $memberNested
+                            }
                         }
                     }
                 }
diff --git a/src/internal/Format-Csv.ps1 b/src/internal/Format-Csv.ps1
@@ -8,22 +8,22 @@ function Format-Csv {
         [psobject[]] $InputObjects,
         #
         [Parameter(Mandatory = $false)]
-        [string] $ArrayDelimiter = "`r`n"
+        [string] $ArrayDelimiter = ";"
     )
 
     begin {
         function Transform ($InputObject) {
             if ($InputObject) {
-                if ($Property.Value -is [DateTime]) {
+                if ($InputObject -is [DateTime]) {
                     $InputObject = $InputObject.ToString("o")
                 }
-                elseif ($Property.Value -is [Array] -or $Property.Value -is [System.Collections.ArrayList]) {
+                elseif ($InputObject -is [Array] -or $InputObject -is [System.Collections.ArrayList]) {
                     for ($i = 0; $i -lt $InputObject.Count; $i++) {
                         $InputObject[$i] = Transform $InputObject[$i]
                     }
                     $InputObject = $InputObject -join $ArrayDelimiter
                 }
-                elseif ($Property.Value -is [System.Management.Automation.PSCustomObject]) {
+                elseif ($InputObject -is [System.Management.Automation.PSCustomObject]) {
                     return ConvertTo-Json $InputObject
                 }
             }
diff --git a/src/internal/Get-MsGraphResults.ps1 b/src/internal/Get-MsGraphResults.ps1
@@ -133,7 +133,7 @@ function Get-MsGraphResults {
                 else {
                     ## Ignore errors with specific codes else display non-terminating error
                     if ($ResponseDetail['ContentParsed'].error.code -eq 'Request_ResourceNotFound') {
-                        Write-Error -Exception $_.Exception -Message $ResponseDetail['ContentParsed'].error.message -ErrorId $ResponseDetail['ContentParsed'].error.code -Category $_.CategoryInfo.Category -CategoryActivity $_.CategoryInfo.Activity -CategoryReason $_.CategoryInfo.Reason -CategoryTargetName $_.CategoryInfo.TargetName -CategoryTargetType $_.CategoryInfo.TargetType -TargetObject $_.TargetObject -ErrorVariable cmdError -ErrorAction SilentlyContinue
+                        #Write-Error -Exception $_.Exception -Message $ResponseDetail['ContentParsed'].error.message -ErrorId $ResponseDetail['ContentParsed'].error.code -Category $_.CategoryInfo.Category -CategoryActivity $_.CategoryInfo.Activity -CategoryReason $_.CategoryInfo.Reason -CategoryTargetName $_.CategoryInfo.TargetName -CategoryTargetType $_.CategoryInfo.TargetType -TargetObject $_.TargetObject -ErrorVariable cmdError -ErrorAction SilentlyContinue
                         #Write-Warning $ResponseDetail['ContentParsed'].error.message
                     }
                     else {
@@ -158,7 +158,7 @@ function Get-MsGraphResults {
                 else {
                     ## Ignore errors with specific codes else display non-terminating error
                     if ($BatchResponse.body.error.code -eq 'Request_ResourceNotFound') {
-                        Write-Error -Message $BatchResponse.body.error.message -ErrorId $BatchResponse.body.error.code -ErrorVariable cmdError -ErrorAction SilentlyContinue
+                        #Write-Error -Message $BatchResponse.body.error.message -ErrorId $BatchResponse.body.error.code -ErrorVariable cmdError -ErrorAction SilentlyContinue
                         #Write-Warning $BatchResponse.body.error.message
                     }
                     else {

Original file line number	Diff line number	Diff line change
`@@ -8,22 +8,22 @@ function Format-Csv {`
`8`	`8`	`[psobject[]] $InputObjects,`
`9`	`9`	`#`
`10`	`10`	`[Parameter(Mandatory = $false)]`
`11`		- [string] $ArrayDelimiter = "`r`n"
	`11`	`+ [string] $ArrayDelimiter = ";"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`begin {`
`15`	`15`	`function Transform ($InputObject) {`
`16`	`16`	`if ($InputObject) {`
`17`		`- if ($Property.Value -is [DateTime]) {`
	`17`	`+ if ($InputObject -is [DateTime]) {`
`18`	`18`	`$InputObject = $InputObject.ToString("o")`
`19`	`19`	`}`
`20`		`- elseif ($Property.Value -is [Array] -or $Property.Value -is [System.Collections.ArrayList]) {`
	`20`	`+ elseif ($InputObject -is [Array] -or $InputObject -is [System.Collections.ArrayList]) {`
`21`	`21`	`for ($i = 0; $i -lt $InputObject.Count; $i++) {`
`22`	`22`	`$InputObject[$i] = Transform $InputObject[$i]`
`23`	`23`	`}`
`24`	`24`	`$InputObject = $InputObject -join $ArrayDelimiter`
`25`	`25`	`}`
`26`		`- elseif ($Property.Value -is [System.Management.Automation.PSCustomObject]) {`
	`26`	`+ elseif ($InputObject -is [System.Management.Automation.PSCustomObject]) {`
`27`	`27`	`return ConvertTo-Json $InputObject`
`28`	`28`	`}`
`29`	`29`	`}`