Improve version setting and lock file update

Author: hallipr

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

@@ -84,25 +84,37 @@ stages:
             runOnce:
               deploy:
                 steps:
-                - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
-                  parameters:
-                    skipCheckoutNone: true
-
                 - template: /eng/pipelines/templates/steps/use-rust.yml@self
                   parameters:
                     Toolchain: stable
 
-                - task: PowerShell@2
+                - pwsh: |
+                    $additionalOwners = @('heaths', 'hallipr')
+                    $crateName = '${{artifact.name}}'
+
+                    Write-Host "Publishing packae: '$crateName'"
+                    $manifestPath = "$(Pipeline.Workspace)/drop/$crateName/Cargo.toml"
+
+                    $command = "cargo publish --locked --manifest-path '$manifestPath' --no-verify"
+
+                    Write-Host "> $command"
+                    Invoke-Expression $command
+
+                    if (!$?) {
+                      Write-Error "Failed to publish package: '$crateName'"
+                      exit 1
+                    }
+
+                    $existingOwners = (cargo owner --list $crateName) -replace " \(.*", ""
+                    $missingOwners = $additionalOwners | Where-Object { $existingOwners -notcontains $_ }
+
+                    foreach ($owner in $missingOwners) {
+                      Write-Host "> cargo owner --add $owner $crateName"
+                      cargo owner --add $owner $crateName
+                    }
                   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}}'
-                      -AdditionalOwners 'heaths','hallipr'
 
         # - job: CreateApiReview
         #   displayName: "Api Review"

eng/scripts/Pack-Crates.ps1

@@ -130,7 +130,7 @@ Push-Location $RepoRoot
 try {
   [array]$packages = Get-PackagesToBuild
 
-  $command = "cargo +nightly -Zpackage-workspace package --allow-dirty"
+  $command = "cargo +nightly -Zpackage-workspace package --allow-dirty --locked"
 
   Write-Host "Building packages:"
   foreach ($package in $packages) {

eng/scripts/Publish-Crates.ps1

@@ -82,21 +82,20 @@ if ($content -ne $updated) {
   Write-Host "Updated version in $tomlPath from $($pkgProperties.Version) to $packageSemVer."
 
   Write-Host "Updaging dependencies in Cargo.toml files."
-  Invoke-LoggedCommand "cargo +nightly -Zscript '$RepoRoot/eng/scripts/update-pathversions.rs' update" | Out-Null
+  Invoke-LoggedCommand "cargo +nightly -Zscript '$RepoRoot/eng/scripts/update-pathversions.rs' update"
 
   if ($env:SYSTEM_DEBUG -eq 'true') {
-    Write-Host "##[group] $RepoRoot/Cargo.lock"
-    Get-Content "$RepoRoot/Cargo.lock"
-    Write-Host "##[endgroup]"
+    New-Item -ItemType Directory -Path "$RepoRoot/target" -Force | Out-Null
+    Get-Content "$RepoRoot/Cargo.lock" | Out-File -FilePath "$RepoRoot/target/Cargo.lock.before" -Encoding utf8
   }
 
-  Write-Host "Updating Cargo.lock using 'cargo metadata'."
-  Invoke-LoggedCommand "cargo metadata --no-deps --format-version 1" | Out-Null
+  Write-Host "Updating Cargo.lock."
+  Invoke-LoggedCommand "cargo update --workspace"
 
   if ($env:SYSTEM_DEBUG -eq 'true') {
-    Write-Host "##[group] $RepoRoot/Cargo.lock"
-    Get-Content "$RepoRoot/Cargo.lock"
-    Write-Host "##[endgroup]"
+    Get-Content "$RepoRoot/Cargo.lock" | Out-File -FilePath "$RepoRoot/target/Cargo.lock.after" -Encoding utf8
+    Invoke-LoggedCommand "git diff --no-index -- $RepoRoot/target/Cargo.lock.before $RepoRoot/target/Cargo.lock.after" -AllowedExitCodes 0, 1
+    $LASTEXITCODE = 0
   }
 }
 else {

eng/scripts/Update-PackageVersion.ps1

@@ -24,7 +24,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .expect("requires 'add' or 'update' mode argument");
 
     let script_root = PathBuf::from(env::var("CARGO_MANIFEST_DIR")?);
-    let repo_root = script_root.join("../../..").canonicalize()?;
+    let repo_root = script_root.join("../..").canonicalize()?;
 
     // find all Cargo.toml files in the repo_root directory
     let exclude_dirs = vec![
@@ -38,13 +38,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     for mut toml_file in toml_files {
         let should_add = add_mode && !toml_file.is_publish_disabled;
-
-        update_package_versions(toml_file.document.as_table_mut(), &package_versions, should_add);
+        println!("Processing {}", toml_file.path.display());
+        update_package_versions(toml_file.document.as_table_mut(), &package_versions, None, should_add);
 
         // if the toml file has a workspace table, update the workspace table
         if let Some(workspace) = toml_file.document.get_mut("workspace") {
             if let Some(table) = workspace.as_table_mut() {
-                update_package_versions(table, &package_versions, should_add);
+                update_package_versions(table, &package_versions, Some("workspace"), should_add);
             }
         }
 
@@ -57,6 +57,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 fn load_cargo_toml_files(repo_root: &PathBuf, exclude_dirs: &Vec<PathBuf>) -> Result<Vec<TomlInfo>, Box<dyn Error>> {
+    println!("Loading Cargo.toml files in {}", repo_root.display());
     let mut toml_paths = Vec::new();
     find_cargo_toml_files(repo_root, exclude_dirs, &mut toml_paths)?;
 
@@ -109,7 +110,7 @@ fn get_package_versions(toml_files: &Vec<TomlInfo>) -> Vec<(String, String, bool
     package_versions
 }
 
-fn update_package_versions(toml: &mut Table, package_versions: &Vec<(String, String, bool)>, add: bool) {
+fn update_package_versions(toml: &mut Table, package_versions: &Vec<(String, String, bool)>, prefix: Option<&str>, add: bool) {
     // for each dependency table, for each package in package_versions
     // if the package is in the dependency table
     //   if the dependency has both path and version properties, update the version property
@@ -121,16 +122,26 @@ fn update_package_versions(toml: &mut Table, package_versions: &Vec<(String, Str
     let dependency_tables = get_dependency_tables(toml);
 
     for (table_name, table) in dependency_tables {
+        let table_display_name = if prefix.is_some() {
+            format!("{}.{}", prefix.unwrap(), table_name)
+        } else {
+            table_name.clone()
+        };
         for (package, version, is_publish_disabled) in package_versions {
             if let Some(dependency) = table.get_mut(package) {
                 // azure_idenentity will only be a transitive dev-dependency
                 let should_add = add && table_name != "dev-dependencies" && !is_publish_disabled && package != "azure_identity";
 
-                let has_path_property = dependency.get("path").is_some();
-                let has_version_property = dependency.get("version").is_some();
-
-                if has_path_property && (has_version_property || should_add) {
-                    dependency["version"] = value(version);
+                if dependency.get("path").is_some() {
+                    if let Some(current_version) = dependency.get("version") {
+                        if current_version.as_str() != Some(version) {
+                            dependency["version"] = value(version);
+                            println!("  Updating {table_display_name}.{package} to {version}");
+                        }
+                    } else if should_add {
+                        dependency["version"] = value(version);
+                        println!("  Adding {table_display_name}.{package} version {version}");
+                    }
                 }
             }
         }