Sync eng/common directory with azure-sdk-tools for PR 8158 (#29423)

* allow an override FILE to be honored by test-proxy-tool * update test-utils to honor proxy override version by default --------- Co-authored-by: Scott Beddall (from Dev Box) <[email protected]>
Azure · Apr 25, 2024 · 88d244a · 88d244a
1 parent 7706373
commit 88d244a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 47 deletions.
diff --git a/common/tools/dev-tool/src/util/testProxyUtils.ts b/common/tools/dev-tool/src/util/testProxyUtils.ts
@@ -287,8 +287,7 @@ export async function isProxyToolActive(): Promise<boolean> {
     }
 
     log.info(
-      `Proxy tool seems to be active at http://localhost:${
-        process.env.TEST_PROXY_HTTP_PORT ?? 5000
+      `Proxy tool seems to be active at http://localhost:${process.env.TEST_PROXY_HTTP_PORT ?? 5000
       }\n`,
     );
     return true;
@@ -299,15 +298,30 @@ export async function isProxyToolActive(): Promise<boolean> {
 
 async function getTargetVersion() {
   // Grab the tag from the `/eng/common/testproxy/target_version.txt` file [..is used to control the default version]
+  // 
+  // In times of longer lived version override, the file eng/target_proxy_version.txt can be used to override this version
+  // in both CI and local development.
   // Example content:
   //
   // 1.0.0-dev.20220224.2
   // (Bot regularly updates the tag in the file above.)
   try {
-    const contentInVersionFile = await fs.readFile(
-      `${path.join(await resolveRoot(), "eng/common/testproxy/target_version.txt")}`,
-      "utf-8",
-    );
+    let contentInVersionFile: string;
+    const overrideFile = `${path.join(await resolveRoot(), "eng/target_proxy_version.txt")}`;
+    const overrideExists = await fs.exists(overrideFile);
+
+    if (overrideExists) {
+      contentInVersionFile = await fs.readFile(
+        overrideFile,
+        "utf-8",
+      );
+    }
+    else {
+      contentInVersionFile = await fs.readFile(
+        `${path.join(await resolveRoot(), "eng/common/testproxy/target_version.txt")}`,
+        "utf-8",
+      );
+    }
 
     const tag = contentInVersionFile.trim();
 

diff --git a/eng/common/testproxy/test-proxy-docker.yml b/eng/common/testproxy/test-proxy-docker.yml
diff --git a/eng/common/testproxy/test-proxy-tool.yml b/eng/common/testproxy/test-proxy-tool.yml
@@ -22,7 +22,17 @@ steps:
       pwsh: true
 
   - pwsh: |
-      $version = $(Get-Content "${{ parameters.templateRoot }}/eng/common/testproxy/target_version.txt" -Raw).Trim()
+      $standardVersion = "${{ parameters.templateRoot }}/eng/common/testproxy/target_version.txt"
+      $overrideVersion = "${{ parameters.templateRoot }}/eng/target_proxy_version.txt"
+
+      $version = $(Get-Content $standardVersion -Raw).Trim()
+
+      if (Test-Path $overrideVersion) {
+        $version = $(Get-Content $overrideVersion -Raw).Trim()
+      }
+
+      Write-Host "Installing test-proxy version $version"
+
       dotnet tool install azure.sdk.tools.testproxy `
         --tool-path $(Build.BinariesDirectory)/test-proxy `
         --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json `

diff --git a/eng/target_proxy_version.txt b/eng/target_proxy_version.txt
@@ -0,0 +1 @@
+1.0.0-dev.20240410.1