Merge pull request #453 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev

Author: pull[bot]

Modules/CIPPCore/Public/GraphHelper/New-GraphGetRequest.ps1

@@ -59,7 +59,7 @@ function New-GraphGetRequest {
             $RetryCount = 0
             $MaxRetries = 3
             $RequestSuccessful = $false
-            Write-Host "This is attempt $($RetryCount + 1) of $MaxRetries"
+            Write-Information "GET [ $nextURL ] | tenant: $tenantid | attempt: $($RetryCount + 1) of $MaxRetries"
             do {
                 try {
                     $GraphRequest = @{
@@ -117,11 +117,24 @@ function New-GraphGetRequest {
                 } catch {
                     $ShouldRetry = $false
                     $WaitTime = 0
-
                     try {
-                        $Message = ($_.ErrorDetails.Message | ConvertFrom-Json -ErrorAction SilentlyContinue).error.message
+                        $MessageObj = $_.ErrorDetails.Message | ConvertFrom-Json -ErrorAction SilentlyContinue
+                        if ($MessageObj.error) {
+                            $MessageObj | Add-Member -NotePropertyName 'url' -NotePropertyValue $nextURL -Force
+                            $Message = $MessageObj.error.message -ne '' ? $MessageObj.error.message : $MessageObj.error.code
+                        }
                     } catch { $Message = $null }
-                    if ($Message -eq $null) { $Message = $($_.Exception.Message) }
+
+                    if ([string]::IsNullOrEmpty($Message)) {
+                        $Message = $($_.Exception.Message)
+                        $MessageObj = @{
+                            error = @{
+                                code    = $_.Exception.GetType().FullName
+                                message = $Message
+                                url     = $nextURL
+                            }
+                        }
+                    }
 
                     # Check for 429 Too Many Requests
                     if ($_.Exception.Response.StatusCode -eq 429) {
@@ -147,7 +160,7 @@ function New-GraphGetRequest {
                     } else {
                         # Final failure - update tenant error tracking and throw
                         if ($Message -ne 'Request not applicable to target tenant.' -and $Tenant) {
-                            $Tenant.LastGraphError = $Message
+                            $Tenant.LastGraphError = [string]($MessageObj | ConvertTo-Json -Compress)
                             if ($Tenant.PSObject.Properties.Name -notcontains 'GraphErrorCount') {
                                 $Tenant | Add-Member -MemberType NoteProperty -Name 'GraphErrorCount' -Value 0 -Force
                             }

Modules/CIPPCore/Public/GraphRequests/Get-GraphRequestList.ps1

@@ -86,7 +86,6 @@ function Get-GraphRequestList {
     $SingleTenantThreshold = 8000
     Write-Information "Tenant: $TenantFilter"
     $TableName = ('cache{0}' -f ($Endpoint -replace '[^A-Za-z0-9]'))[0..62] -join ''
-    Write-Information "Table: $TableName"
     $Endpoint = $Endpoint -replace '^/', ''
     $DisplayName = ($Endpoint -split '/')[0]
 
@@ -123,7 +122,6 @@ function Get-GraphRequestList {
     }
     $GraphQuery.Query = $ParamCollection.ToString()
     $PartitionKey = Get-StringHash -String (@($Endpoint, $ParamCollection.ToString(), 'v2') -join '-')
-    Write-Information "PK: $PartitionKey"
 
     # Perform $count check before caching
     $Count = 0
@@ -174,7 +172,7 @@ function Get-GraphRequestList {
             Write-Information "Total results (`$count): $Count"
         }
     }
-    Write-Information ( 'GET [ {0} ]' -f $GraphQuery.ToString())
+    #Write-Information ( 'GET [ {0} ]' -f $GraphQuery.ToString())
 
     try {
         if ($QueueId) {
@@ -196,7 +194,7 @@ function Get-GraphRequestList {
                 }
                 $Rows = Get-CIPPAzDataTableEntity @Table -Filter $Filter
                 $Type = 'Cache'
-                Write-Information "Cached: $(($Rows | Measure-Object).Count) rows (Type: $($Type))"
+                Write-Information "Table: $TableName | PK: $PartitionKey | Cached: $(($Rows | Measure-Object).Count) rows (Type: $($Type))"
                 $QueueReference = '{0}-{1}' -f $TenantFilter, $PartitionKey
                 $RunningQueue = Invoke-ListCippQueue -Reference $QueueReference | Where-Object { $_.Status -notmatch 'Completed' -and $_.Status -notmatch 'Failed' }
             }