From 060da49696ab4de21071ae303cac44b49469e85f Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 18 Aug 2021 14:22:21 -0700 Subject: [PATCH] Fix query batch processing (#15319) Co-authored-by: Wes Haggard --- eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 index 24420cef2b66..81c2595fdc5d 100644 --- a/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 +++ b/eng/common/scripts/Helpers/DevOps-WorkItem-Helpers.ps1 @@ -62,7 +62,7 @@ function Invoke-Query($fields, $wiql, $output = $true) -Uri "https://dev.azure.com/azure-sdk/Release/_apis/wit/wiql/?`$top=10000&api-version=6.0" ` -Headers (Get-DevOpsRestHeaders) -Body $body -ContentType "application/json" | ConvertTo-Json -Depth 10 | ConvertFrom-Json -AsHashTable - if ($response -isnot [HashTable] -or !$response.ContainsKey("workItems")) { + if ($response -isnot [HashTable] -or !$response.ContainsKey("workItems") -or $response.workItems.Count -eq 0) { Write-Verbose "Query returned no items. $wiql" return ,@() } @@ -83,11 +83,11 @@ function Invoke-Query($fields, $wiql, $output = $true) Write-Verbose "Pulling work items $uri " $batchResponse = Invoke-RestMethod -Method GET -Uri $uri ` - -Headers $headers -ContentType "application/json" -MaximumRetryCount 3 | ConvertTo-Json -Depth 10 | ConvertFrom-Json -AsHashTable + -Headers (Get-DevOpsRestHeaders) -ContentType "application/json" -MaximumRetryCount 3 | ConvertTo-Json -Depth 10 | ConvertFrom-Json -AsHashTable if ($batchResponse.value) { - $batchResponse.value | % { $workItems += $_ } + $batchResponse.value | ForEach-Object { $workItems += $_ } } else {