github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Sync eng/common directory with azure-sdk-tools for PR 6300 (#4719)

Browse Source 
* add fallback onto azure.sdk.tools.testproxy within generate-assets-json.ps1

Co-authored-by: scbedd <45376673+scbedd@users.noreply.github.com>
Co-authored-by: Sameeksha Vaity <sameeksha.v91@gmail.com>
Co-authored-by: Konrad Jamrozik <spawarotti@jamro.pl>
This commit is contained in:
Azure SDK Bot 2023-06-16 13:26:12 -07:00 committed by GitHub
parent b2f92f3513
commit a11a93b48a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
eng/common/testproxy/transition-scripts/generate-assets-json.ps1
View File

@ -138,11 +138,18 @@ class Version {
}
Function Test-Exe-In-Path {
Param([string] $ExeToLookFor)
Param([string] $ExeToLookFor, [bool]$ExitOnError = $true)
if ($null -eq (Get-Command $ExeToLookFor -ErrorAction SilentlyContinue)) {
Write-Error "Unable to find $ExeToLookFor in your PATH"
exit 1
if ($ExitOnError) {
Write-Error "Unable to find $ExeToLookFor in your PATH"
exit 1
}
else {
return $false
}
}
return $true
}
Function Test-TestProxyVersion {
@ -348,9 +355,29 @@ $language = Get-Repo-Language
# in the path and that we're able to map the language's recording
# directories
if ($InitialPush) {
Test-Exe-In-Path -ExeToLookFor $TestProxyExe
$proxyPresent = Test-Exe-In-Path -ExeToLookFor $TestProxyExe -ExitOnError $false
if ($TestProxyExe -eq "test-proxy") {
# try to fall back
if (-not $proxyPresent) {
$StandaloneTestProxyExe = "Azure.Sdk.Tools.TestProxy"
if ($IsWindows) {
$StandaloneTestProxyExe += ".exe"
}
$standalonePresent = Test-Exe-In-Path -ExeToLookFor $StandaloneTestProxyExe -ExitOnError $false
if ($standalonePresent) {
Write-Host "Default proxy exe $TestProxyExe is not present, but standalone tool $StandaloneTestProxyExe is. Updating proxy exe to use the standalone version."
$TestProxyExe = $StandaloneTestProxyExe
}
else {
Write-Error "The user has selected option InitialPush to push their assets, neither $TestProxyExe nor standalone executable $StandaloneTestProxyExe are installed on this machine."
exit 1
}
}
if ($TestProxyExe -eq "test-proxy" -or $TestProxyExe.StartsWith("Azure.Sdk.Tools.TestProxy")) {
Test-TestProxyVersion -TestProxyExe $TestProxyExe
}