From e2e0cb625461f9934ba3fa334a5cf8791dd021a2 Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Fri, 28 Jun 2024 10:55:10 -0700 Subject: [PATCH 1/2] Ensure subConfigFiles is not an empty string --- .../TestResources/build-test-resource-config.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eng/common/TestResources/build-test-resource-config.yml b/eng/common/TestResources/build-test-resource-config.yml index c64664f852..bc34a9f613 100644 --- a/eng/common/TestResources/build-test-resource-config.yml +++ b/eng/common/TestResources/build-test-resource-config.yml @@ -66,10 +66,14 @@ steps: if ($subConfigFilesRaw) { $subConfigFiles = $subConfigFilesRaw | ConvertFrom-Json -AsHashtable - foreach ($file in $subConfigFiles) { - Write-Host "Merging sub config from file: $file" - $subConfig = Get-Content $file | ConvertFrom-Json -AsHashtable - $finalConfig = UpdateSubscriptionConfiguration $finalConfig $subConfig + # Handle cases where $subConfigFilesRaw converts to an empty string + # instead of an array of strings + if ($subConfigFiles) { + foreach ($file in $subConfigFiles) { + Write-Host "Merging sub config from file: $file" + $subConfig = Get-Content $file | ConvertFrom-Json -AsHashtable + $finalConfig = UpdateSubscriptionConfiguration $finalConfig $subConfig + } } } From 06fc8a0ef452d005e12018df28eebbac07835707 Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Wed, 3 Jul 2024 09:08:23 -0700 Subject: [PATCH 2/2] Skip instances where $file is an empty string --- .../TestResources/build-test-resource-config.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/eng/common/TestResources/build-test-resource-config.yml b/eng/common/TestResources/build-test-resource-config.yml index bc34a9f613..a1c6a41d6c 100644 --- a/eng/common/TestResources/build-test-resource-config.yml +++ b/eng/common/TestResources/build-test-resource-config.yml @@ -66,14 +66,16 @@ steps: if ($subConfigFilesRaw) { $subConfigFiles = $subConfigFilesRaw | ConvertFrom-Json -AsHashtable - # Handle cases where $subConfigFilesRaw converts to an empty string - # instead of an array of strings - if ($subConfigFiles) { - foreach ($file in $subConfigFiles) { - Write-Host "Merging sub config from file: $file" - $subConfig = Get-Content $file | ConvertFrom-Json -AsHashtable - $finalConfig = UpdateSubscriptionConfiguration $finalConfig $subConfig + foreach ($file in $subConfigFiles) { + # In some cases, $file could be an empty string. Get-Content will fail + # if $file is an empty string, so skip those cases. + if (!$file) { + continue } + + Write-Host "Merging sub config from file: $file" + $subConfig = Get-Content $file | ConvertFrom-Json -AsHashtable + $finalConfig = UpdateSubscriptionConfiguration $finalConfig $subConfig } }