diff --git a/eng/common/TestResources/TestResources-Helpers.ps1 b/eng/common/TestResources/TestResources-Helpers.ps1 index d3a985cffdd..c6c118cc503 100644 --- a/eng/common/TestResources/TestResources-Helpers.ps1 +++ b/eng/common/TestResources/TestResources-Helpers.ps1 @@ -349,36 +349,6 @@ function SetDeploymentOutputs( return $deploymentEnvironmentVariables, $deploymentOutputs } -<# - Writes Resource Manager errors which often have nested exceptions. - https://learn.microsoft.com/dotnet/api/microsoft.azure.commands.resourcemanager.cmdlets.sdkmodels.psresourcemanagererror -#> -function Write-PSResourceManagerError($resourceManagerError, [int]$level, [int]$maxLevel) { - if (!$resourceManagerError -or !$resourceManagerError.Message) { - return; - } - - # Retrieve one or more messages then decode the strings for readability (remove quote escapes, fix link readability, etc.) - $parsedMessage = ($resourceManagerError.Message -join "$([System.Environment]::NewLine)$([System.Environment]::NewLine)") - $parsedMessage = [System.Net.WebUtility]::UrlDecode($parsedMessage) - - $prefix = " " * ($level * 2) + "-" - Write-Host "$prefix $parsedMessage" - - # Limit the level of nested exceptions to prevent overwhelming users with details and infinite recursive calls. - if ($level -ge $maxLevel) { - if ($resourceManagerError.Details.Count -gt 0) { - Write-Host "$prefix ... (additional nested errors not shown)" - } - - return; - } - - foreach ($detail in $resourceManagerError.Details) { - Write-PSResourceManagerError $detail ($level + 1) $maxLevel - } -} - function HandleTemplateDeploymentError($templateValidationResult) { Write-Warning "Deployment template validation failed" @@ -387,10 +357,14 @@ function HandleTemplateDeploymentError($templateValidationResult) { return } + # Retrieve one or more messages then decode the strings for readability (remove quote escapes, fix link readability, etc.) + $parsedMessage = ($templateValidationResult.Details.Message -join "$([System.Environment]::NewLine)$([System.Environment]::NewLine)") + $parsedMessage = [System.Net.WebUtility]::UrlDecode($parsedMessage) + Write-Warning "#####################################################" Write-Warning "######### TEMPLATE VALIDATION ERROR DETAILS #########" Write-Warning "#####################################################" - Write-PSResourceManagerError $templateValidationResult 0 5 + Write-Host $parsedMessage Write-Warning "#####################################################" } diff --git a/eng/common/tsp-client/package-lock.json b/eng/common/tsp-client/package-lock.json index d5d146f8a03..f0d72927316 100644 --- a/eng/common/tsp-client/package-lock.json +++ b/eng/common/tsp-client/package-lock.json @@ -645,18 +645,18 @@ } }, "node_modules/@simple-git/args-pathspec": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@simple-git/args-pathspec/-/args-pathspec-1.0.2.tgz", - "integrity": "sha512-nEFVejViHUoL8wU8GTcwqrvqfUG40S5ts6S4fr1u1Ki5CklXlRDYThPVA/qurTmCYFGnaX3XpVUmICLHdvhLaA==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@simple-git/args-pathspec/-/args-pathspec-1.0.3.tgz", + "integrity": "sha512-ngJMaHlsWDTfjyq9F3VIQ8b7NXbBLq5j9i5bJ6XLYtD6qlDXT7fdKY2KscWWUF8t18xx052Y/PUO1K1TRc9yKA==", "license": "MIT" }, "node_modules/@simple-git/argv-parser": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@simple-git/argv-parser/-/argv-parser-1.0.3.tgz", - "integrity": "sha512-NMKv9sJcSN2VvnPT9Ja7eKfGy8Q8mMFLwPTCcuZMtv3+mYcLIZflg31S/tp2XCCyiY7YAx6cgBHQ0fwA2fWHpQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@simple-git/argv-parser/-/argv-parser-1.1.1.tgz", + "integrity": "sha512-Q9lBcfQ+VQCpQqGJFHe5yooOS5hGdLFFbJ5R+R5aDsnkPCahtn1hSkMcORX65J2Z5lxSkD0lQorMsncuBQxYUw==", "license": "MIT", "dependencies": { - "@simple-git/args-pathspec": "^1.0.2" + "@simple-git/args-pathspec": "^1.0.3" } }, "node_modules/@sindresorhus/merge-streams": { @@ -1731,15 +1731,15 @@ } }, "node_modules/simple-git": { - "version": "3.35.2", - "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.35.2.tgz", - "integrity": "sha512-ZMjl06lzTm1EScxEGuM6+mEX+NQd14h/B3x0vWU+YOXAMF8sicyi1K4cjTfj5is+35ChJEHDl1EjypzYFWH2FA==", + "version": "3.36.0", + "resolved": "https://registry.npmjs.org/simple-git/-/simple-git-3.36.0.tgz", + "integrity": "sha512-cGQjLjK8bxJw4QuYT7gxHw3/IouVESbhahSsHrX97MzCL1gu2u7oy38W6L2ZIGECEfIBG4BabsWDPjBxJENv9Q==", "license": "MIT", "dependencies": { "@kwsites/file-exists": "^1.1.1", "@kwsites/promise-deferred": "^1.1.1", - "@simple-git/args-pathspec": "^1.0.2", - "@simple-git/argv-parser": "^1.0.3", + "@simple-git/args-pathspec": "^1.0.3", + "@simple-git/argv-parser": "^1.1.0", "debug": "^4.4.0" }, "funding": {