Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure subConfigFiles is not an empty string #8516

Merged
merged 2 commits into from
Jul 3, 2024
Merged

Ensure subConfigFiles is not an empty string #8516

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4ce122
Ensure subConfigFiles is not an empty string
danieljurek Jun 28, 2024
5ec2af8
Skip instances where $file is an empty string
danieljurek Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions eng/common/TestResources/build-test-resource-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,14 @@ steps:

if ($subConfigFilesRaw) {
$subConfigFiles = $subConfigFilesRaw | ConvertFrom-Json -AsHashtable
weshaggard marked this conversation as resolved.
Show resolved Hide resolved
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
}
}
}

Expand Down