Skip to content
This repository was archived by the owner on Aug 28, 2025. It is now read-only.

Commit 992d2fe

Browse files
azure-sdkscbedd
andauthored
Sync eng/common directory with azure-sdk-tools for PR 8158 (Azure#22780)
* allow an override FILE to be honored by test-proxy-tool * update local test-framework to honor proxy override version by default --------- Co-authored-by: Scott Beddall (from Dev Box) <[email protected]>
1 parent e378785 commit 992d2fe

File tree

4 files changed

+22
-41
lines changed

4 files changed

+22
-41
lines changed

eng/common/testproxy/test-proxy-docker.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

eng/common/testproxy/test-proxy-tool.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,17 @@ steps:
2222
pwsh: true
2323

2424
- pwsh: |
25-
$version = $(Get-Content "${{ parameters.templateRoot }}/eng/common/testproxy/target_version.txt" -Raw).Trim()
25+
$standardVersion = "${{ parameters.templateRoot }}/eng/common/testproxy/target_version.txt"
26+
$overrideVersion = "${{ parameters.templateRoot }}/eng/target_proxy_version.txt"
27+
28+
$version = $(Get-Content $standardVersion -Raw).Trim()
29+
30+
if (Test-Path $overrideVersion) {
31+
$version = $(Get-Content $overrideVersion -Raw).Trim()
32+
}
33+
34+
Write-Host "Installing test-proxy version $version"
35+
2636
dotnet tool install azure.sdk.tools.testproxy `
2737
--tool-path $(Build.BinariesDirectory)/test-proxy `
2838
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json `

eng/target_proxy_version.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.0.0-dev.20240410.1

sdk/internal/recording/server.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,16 @@ func getProxyLog() (*os.File, error) {
319319

320320
func getProxyVersion(gitRoot string) (string, error) {
321321
proxyVersionConfig := filepath.Join(gitRoot, "eng/common/testproxy/target_version.txt")
322+
overrideProxyVersionConfig := filepath.Join(gitRoot, "eng/target_proxy_version.txt")
323+
324+
if _, err := os.Stat(overrideProxyVersionConfig); err == nil {
325+
version, err := ioutil.ReadFile(overrideProxyVersionConfig)
326+
if err == nil {
327+
proxyVersion := strings.TrimSpace(string(version))
328+
return proxyVersion, nil
329+
}
330+
}
331+
322332
version, err := ioutil.ReadFile(proxyVersionConfig)
323333
if err != nil {
324334
return "", err

0 commit comments

Comments
 (0)