Sync eng/common directory with azure-sdk-tools for PR 6518 (#37706)

* Bump test proxy version * remove interim fix * move proxy transition-scripts folder to onboarding Co-authored-by: Bill Wert <billwert@microsoft.com> Co-authored-by: Scott Beddall <scbedd@microsoft.com>
Azure · Jul 28, 2023 · e3661de · e3661de
1 parent 7acedfd
commit e3661de
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 16 deletions.
diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
@@ -301,7 +301,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TestProxyVersion>1.0.0-dev.20230706.1</TestProxyVersion>
+    <TestProxyVersion>1.0.0-dev.20230728.1</TestProxyVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/...on/testproxy/transition-scripts/README.md → eng/common/testproxy/onboarding/README.me b/...on/testproxy/transition-scripts/README.md → eng/common/testproxy/onboarding/README.me
diff --git a/...ansition-scripts/generate-assets-json.ps1 → ...proxy/onboarding/generate-assets-json.ps1 b/...ansition-scripts/generate-assets-json.ps1 → ...proxy/onboarding/generate-assets-json.ps1
@@ -308,18 +308,17 @@ Function Invoke-ProxyCommand {
 # Get the shorthash directory under PROXY_ASSETS_FOLDER
 Function Get-AssetsRoot {
   param(
-    [string] $AssetsJsonFile
+    [string] $AssetsJsonFile,
+    [string] $TestProxyExe
   )
   $repoRoot = Get-Repo-Root
   $relPath = [IO.Path]::GetRelativePath($repoRoot, $AssetsJsonFile).Replace("`\", "/")
   $assetsJsonDirectory = Split-Path $relPath
-  $breadcrumbFile = Join-Path $repoRoot ".assets" ".breadcrumb"
 
-  $breadcrumbString = Get-Content $breadcrumbFile | Where-Object { $_.StartsWith($relPath) }
-  $assetRepo = $breadcrumbString.Split(";")[1]
-  $assetsPrefix = (Get-Content $AssetsJsonFile | Out-String | ConvertFrom-Json).AssetsRepoPrefixPath
+  [array] $output = & "$TestProxyExe" config locate -a "$relPath" --storage-location="$repoRoot"
+  $assetsDirectory = $output[-1]
 
-  return Join-Path $repoRoot ".assets" $assetRepo $assetsPrefix $assetsJsonDirectory
+  return Join-Path $assetsDirectory $assetsJsonDirectory
 }
 
 Function Move-AssetsFromLangRepo {
@@ -405,7 +404,7 @@ if ($InitialPush) {
     $CommandArgs = "restore --assets-json-path $assetsJsonRelPath"
     Invoke-ProxyCommand -TestProxyExe $TestProxyExe -CommandArgs $CommandArgs -TargetDirectory $repoRoot
 
-    $assetsRoot = (Get-AssetsRoot -AssetsJsonFile $assetsJsonFile)
+    $assetsRoot = (Get-AssetsRoot -AssetsJsonFile $assetsJsonFile -TestProxyExe $TestProxyExe)
     Write-Host "assetsRoot=$assetsRoot"
 
     Move-AssetsFromLangRepo -AssetsRoot $assetsRoot

diff --git a/eng/common/testproxy/target_version.txt b/eng/common/testproxy/target_version.txt
@@ -1 +1 @@
-1.0.0-dev.20230706.1
+1.0.0-dev.20230728.1
diff --git a/sdk/core/Azure.Core.TestFramework/src/TestProxy.cs b/sdk/core/Azure.Core.TestFramework/src/TestProxy.cs
@@ -81,13 +81,6 @@ private TestProxy(string proxyPath, bool debugMode = false)
                 }
             };
 
-            bool.TryParse(Environment.GetEnvironmentVariable("TF_BUILD"), out bool inCI);
-
-            if (inCI)
-            {
-                testProxyProcessInfo.EnvironmentVariables["PROXY_ASSETS_FOLDER"] = Path.Combine(System.IO.Path.GetTempPath(), Guid.NewGuid().ToString());
-            }
-
             _testProxyProcess = Process.Start(testProxyProcessInfo);
 
             ProcessTracker.Add(_testProxyProcess);