@@ -57,18 +57,20 @@ function CallWebRequest {
57
57
# convert the response json content
58
58
$info = ($result.Content | ConvertFrom-Json )
59
59
60
- Write-Debug " Paging links: $ ( $result.Headers [" Link" ]) "
60
+
61
+ $LinkHeader = $result.Headers [" Link" ]
62
+ Write-Debug " Paging links: $ ( $LinkHeader ) "
61
63
# Test for paging links and try to enumerate all pages
62
- if ($null -ne $result .Headers [ " Link " ] ) {
64
+ if ($null -ne $LinkHeader ) {
63
65
# Write-Warning "Paging link detected:"
64
- foreach ($page in $result .Headers [ " Link " ]. Split(" , " )) {
66
+ foreach ($page in $LinkHeader . Split (" ," )) {
65
67
66
68
# Write-Host "Found page: [$page]"
67
69
# Write-Host "rel next found at: [$($page.Split(";")[1])"
68
70
69
- if ($page.Split (" ; " )[1 ] -eq ' rel="next"' ) {
71
+ if ($page.Split (" ;" )[1 ].Trim() -eq ' rel="next"' ) {
70
72
# Write-Host "Next page is at [$page]"
71
- $almostUrl = $page.Split (" ;" )[0 ]
73
+ $almostUrl = $page.Split (" ;" )[0 ].Trim()
72
74
# Write-Host "Almost: $almostUrl"
73
75
$linkUrl = $almostUrl.Substring (1 , $almostUrl.Length - 2 )
74
76
Write-Host " Handling pagination link with next page at: $linkUrl "
@@ -349,14 +351,21 @@ function GetRawFile {
349
351
}
350
352
351
353
try {
352
- $result = $requestResult | Select-Object - Expand Content
354
+ $result = $requestResult.Content
355
+ $output = " "
356
+ # remove any empty lines or tabs in the result to prevent issues with parsing yaml
357
+ foreach ($line in $result.Split ([Environment ]::NewLine)) {
358
+ $trimmedLine = $line.Trim ().Replace(" `t " , " " ).Replace(" " , " " )
359
+ if ($trimmedLine.Length -gt 0 ) {
360
+ $output += $line + [Environment ]::NewLine
361
+ }
362
+ }
363
+ return $output
353
364
}
354
365
catch {
355
366
Write-Warning " Error converting file content from url [$ ( $logUrl ) ]"
356
367
Write-Warning " Error: [$_ ]"
357
368
Write-Warning " Content: [$requestResult ]"
358
369
return " "
359
370
}
360
-
361
- return $result
362
371
}
0 commit comments