Don't nest the output package folders (Azure#2151)

* Don't nest the output package folders
* Add json parsing to the cargo read-manifest call
* Remove Invoke-LoggedCommand from cargo owners call
* Regex escape the package path pattern

Author: hallipr

eng/pipelines/templates/stages/archetype-rust-release.yml

@@ -93,13 +93,14 @@ stages:
 
                 - task: PowerShell@2
                   displayName: Publish Crate
+                  env:
+                    CARGO_REGISTRY_TOKEN: $(azure-sdk-cratesio-token)
                   inputs:
                     targetType: filePath
                     filePath: $(Build.SourcesDirectory)/eng/scripts/Publish-Crates.ps1
                     arguments: >
                       -PackagesPath '$(Pipeline.Workspace)/drop'
                       -CrateNames '${{artifact.name}}'
-                      -Token $(azure-sdk-cratesio-token)
                       -AdditionalOwners 'heaths','hallipr'
 
         # - job: CreateApiReview
@@ -158,10 +159,11 @@ stages:
 
             - task: PowerShell@2
               displayName: Yank Crates
+              env:
+                CARGO_REGISTRY_TOKEN: $(azure-sdk-cratesio-token)
               inputs:
                 targetType: filePath
                 filePath: $(Build.SourcesDirectory)/eng/scripts/Yank-Crates.ps1
                 arguments:
                   -CrateNames '${{artifact.name}}'
-                  -PackagesPath '$(Pipeline.Workspace)/${{parameters.PipelineArtifactName}}'
-                  -Token $(azure-sdk-cratesio-token)
+                  -PackageInfoDirectory '$(Pipeline.Workspace)/${{parameters.PipelineArtifactName}}/PackageInfo'

eng/scripts/Language-Settings.ps1

@@ -125,7 +125,8 @@ function Get-rust-AdditionalValidationPackagesFromPackageSet ($packagesWithChang
   [array]$serviceFiles = ($diff.ChangedFiles + $diff.DeletedFiles) | ForEach-Object { $_ -replace '\\', '/' } | Where-Object { $_ -match "^sdk/.+/" }
   # remove files that target any specific package
   foreach ($package in $allPackageProperties) {
-    $serviceFiles = $serviceFiles | Where-Object { "$RepoRoot/$_" -notmatch "^$($package.DirectoryPath)/" }
+    $packagePathPattern = "^$( [Regex]::Escape($package.DirectoryPath.Replace('\', '/')) )/"
+    $serviceFiles = $serviceFiles | Where-Object { "$RepoRoot/$_".Replace('\', '/') -notmatch $packagePathPattern }
   }
 
   $affectedServiceDirectories = $serviceFiles | ForEach-Object { $_ -replace '^sdk/(.+?)/.*', '$1' } | Sort-Object -Unique
@@ -144,7 +145,7 @@ function Get-rust-AdditionalValidationPackagesFromPackageSet ($packagesWithChang
 
 function Get-rust-PackageInfoFromPackageFile([IO.FileInfo]$pkg, [string]$workingDirectory) {
   #$pkg will be a FileInfo object for the Cargo.toml file in a package artifact directory
-  $package = cargo read-manifest --manifest-path $pkg.FullName
+  $package = cargo read-manifest --manifest-path $pkg.FullName | ConvertFrom-Json
 
   $packageName = $package.name
   $packageVersion = $package.version

eng/scripts/Pack-Crates.ps1

@@ -119,7 +119,7 @@ function Get-PackagesToBuild() {
 
 function Initialize-VendorDirectory() {
   $path = "$RepoRoot/target/vendor"
-  Invoke-LoggedCommand "cargo vendor $path" | Out-Host
+  Invoke-LoggedCommand "cargo vendor $path" -GroupOutput | Out-Host
   return $path
 }
 
@@ -206,7 +206,7 @@ try {
 
       Write-Host "Copying package '$packageName' to '$packageOutputPath'"
       New-Item -ItemType Directory -Path $packageOutputPath -Force | Out-Null
-      Copy-Item -Path $targetPackagePath -Destination $packageOutputPath -Recurse -Exclude "Cargo.toml.orig"
+      Copy-Item -Path $targetPackagePath/* -Destination $packageOutputPath -Recurse -Exclude "Cargo.toml.orig"
     }
   }
 

eng/scripts/Publish-Crates.ps1

@@ -4,8 +4,7 @@
 param(
   [string]$PackagesPath,
   [string[]]$CrateNames,
-  [string[]]$AdditionalOwners,
-  [string]$Token
+  [string[]]$AdditionalOwners
 )
 
 $ErrorActionPreference = 'Stop'
@@ -15,18 +14,18 @@ foreach ($crateName in $CrateNames) {
   Write-Host "Publishing packae: '$crateName'"
   $manifestPath = "$PackagesPath/$crateName/Cargo.toml"
   # https://doc.rust-lang.org/cargo/reference/registry-web-api.html#publish
-  Write-Host "> cargo publish --manifest-path `"$manifestPath`" --token <TOKEN>"
-  cargo publish --manifest-path $manifestPath --token $Token
+  Write-Host "> cargo publish --manifest-path `"$manifestPath`""
+  cargo publish --manifest-path $manifestPath
   if (!$?) {
     Write-Error "Failed to publish package: '$crateName'"
     exit 1
   }
 
-  $existingOwners = (Invoke-LoggedCommand cargo owner --list $crateName) -replace " \(.*", ""
+  $existingOwners = (cargo owner --list $crateName) -replace " \(.*", ""
   $missingOwners = $AdditionalOwners | Where-Object { $existingOwners -notcontains $_ }
 
   foreach ($owner in $missingOwners) {
-    Write-Host "> cargo owner --add $owner $crateName --token <TOKEN>"
-    cargo owner --add $owner $crateName --token $Token
+    Write-Host "> cargo owner --add $owner $crateName"
+    cargo owner --add $owner $crateName
   }
 }

eng/scripts/Yank-Crates.ps1

@@ -3,8 +3,7 @@
 #Requires -Version 7.0
 param(
   [string]$PackageInfoDirectory,
-  [string[]]$CrateNames,
-  [string]$Token
+  [string[]]$CrateNames
 )
 
 $ErrorActionPreference = 'Stop'
@@ -17,8 +16,8 @@ foreach ($crateName in $crateNames) {
 
   Write-Host "Yanking crate: '$crateName@$crateVersion'"
 
-  Write-Host "cargo yank $crateName --version $crateVersion --token <TOKEN>"
-  cargo yank $crateName --version $crateVersion --token $Token
+  Write-Host "cargo yank $crateName --version $crateVersion"
+  cargo yank $crateName --version $crateVersion
 
   if (!$?) {
     Write-Host "Failed to yank crate: '$crateName@$crateVersion'"