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

* Bump test proxy version * move proxy transition-scripts folder to onboarding Co-authored-by: Bill Wert <[email protected]> Co-authored-by: Scott Beddall <[email protected]>
azure-javaee · Jul 28, 2023 · 4f16481 · 4f16481
1 parent a33cf0b
commit 4f16481
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
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