Sync eng/common directory with azure-sdk-tools for PR 8902 (#23410)

* Add descriptive error when variable groups are not added to pipeline

* Add emoji to deploy step title to make it easier to find

* Move yaml json checking into powershell script

* Fix base sub config empty/string checking

---------

Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
This commit is contained in:
Azure SDK Bot 2024-09-10 14:06:57 -07:00 коммит произвёл GitHub
Родитель b3bcb28734
Коммит ca440fbcfe
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
2 изменённых файлов: 13 добавлений и 4 удалений

Просмотреть файл

@ -196,17 +196,26 @@ function UpdateSubscriptionConfigurationWithFiles([object]$baseSubConfig, [strin
# Helper function for processing stringified json sub configs from pipeline parameter data
function BuildAndSetSubscriptionConfig([string]$baseSubConfigJson, [string]$additionalSubConfigsJson, [string]$subConfigFilesJson) {
$finalConfig = @{}
if ($baseSubConfigJson) {
if ($baseSubConfigJson -and $baseSubConfigJson -ne '""') {
# When variable groups are not added to the pipeline, secret references like
# $(<my secret>) are passed as a string literal instead of being replaced by the keyvault secret value
if ($baseSubConfigJson -notlike '{*') {
throw "Expected a json dictionary object but found '$baseSubConfigJson'. This probably means a subscription config secret was not downloaded. The pipeline is likely missing a variable group."
}
$baseSubConfig = $baseSubConfigJson | ConvertFrom-Json -AsHashtable
Write-Host "Setting base sub config"
$finalConfig = SetSubscriptionConfiguration $baseSubConfig
}
if ($additionalSubConfigsJson) {
if ($additionalSubConfigsJson -and $additionalSubConfigsJson -ne '""') {
$subConfigs = $additionalSubConfigsJson | ConvertFrom-Json -AsHashtable
foreach ($subConfig in $subConfigs) {
if ($subConfig -isnot [hashtable]) {
throw "Expected a json dictionary object but found '$subConfig'. This probably means a subscription config secret was not downloaded. The pipeline is likely missing a variable group."
}
Write-Host "Merging sub config from list"
$finalConfig = UpdateSubscriptionConfiguration $finalConfig $subConfig
}

Просмотреть файл

@ -43,7 +43,7 @@ steps:
- ${{ if eq('true', parameters.UseFederatedAuth) }}:
- task: AzurePowerShell@5
displayName: Deploy test resources
displayName: 🚀 Deploy test resources
env:
TEMP: $(Agent.TempDirectory)
PoolSubnet: $(PoolSubnet)
@ -96,7 +96,7 @@ steps:
-ServicePrincipalAuth `
-Force `
-Verbose | Out-Null
displayName: Deploy test resources
displayName: 🚀 Deploy test resources
env:
TEMP: $(Agent.TempDirectory)
PoolSubnet: $(PoolSubnet)