Remove RustToolchain redundant naming

hallipr · hallipr · commit 94e6c6aa7eac · 2024-08-26T17:31:42.000-07:00
diff --git a/eng/pipelines/templates/jobs/ci.yml b/eng/pipelines/templates/jobs/ci.yml
@@ -4,7 +4,7 @@ parameters:
     default: ""
   - name: BuildTargetingString
     type: string
-    default: "azure-*"
+    default: "*"
   - name: BeforeTestSteps
     type: object
     default: []
@@ -33,25 +33,35 @@ parameters:
           os: linux
           name: $(LINUXPOOL)
           image: $(LINUXVMIMAGE)
-        RustToolchains: [stable, msrv, nightly]
+        Toolchains:
+          - name: stable
+            publish: true
+          - name: msrv
+          - name: nightly
       - pool:
           os: windows
           name: $(WINDOWSPOOL)
           image: $(WINDOWSVMIMAGE)
-        RustToolchains: [stable, msrv, nightly]
+        Toolchains:
+          - name: stable
+          - name: msrv
+          - name: nightly
       - pool:
           os: macOS
           name: $(MACPOOL)
           vmImage: $(MACVMIMAGE)
-        RustToolchains: [stable, msrv, nightly]
+        Toolchains:
+          - name: stable
+          - name: msrv
+          - name: nightly
   - name: AnalyzeToolchains
     type: object
     default: [stable]
 
 jobs:
   - ${{ each matrix in parameters.BuildMatrix }}:
-      - ${{ each RustToolchain in matrix.RustToolchains }}:
-          - job: Build_${{ matrix.pool.os }}_${{ RustToolchain }}
+      - ${{ each toolchain in matrix.Toolchains }}:
+          - job: Build_${{ matrix.pool.os }}_${{ toolchain.name }}
             timeoutInMinutes: 90
 
             pool: ${{ matrix.pool }}
@@ -65,14 +75,14 @@ jobs:
                 parameters:
                   ServiceDirectory: ${{ parameters.ServiceDirectory }}
                   BuildTargetingString: ${{ parameters.BuildTargetingString }}
-                  RustToolchain: ${{ RustToolchain }}
-                  ArtifactSuffix: ${{ matrix.pool.os }}_${{ RustToolchain }}
-                  PublishArtifacts: ${{ and(eq(matrix.pool.os, 'linux'), eq(RustToolchain, 'stable')) }}
+                  Toolchain: ${{ toolchain.name }}
+                  ArtifactSuffix: ${{ matrix.pool.os }}_${{ toolchain.name }}
+                  PublishArtifacts: ${{ toolchain.publish }}
                   UnitTests: true
                   FunctionalTests: ${{ ne(variables['Build.Reason'], 'PullRequest') }}
 
-  - ${{ each RustToolchain in parameters.AnalyzeToolchains }}:
-      - job: "Analyze_${{ RustToolchain }}"
+  - ${{ each toolchain in parameters.AnalyzeToolchains }}:
+      - job: "Analyze_${{ toolchain }}"
         condition: and(succeededOrFailed(), ne(variables['Skip.Analyze'], 'true'))
         timeoutInMinutes: ${{ parameters.TestTimeoutInMinutes }}
 
@@ -93,7 +103,7 @@ jobs:
 
           - template: /eng/pipelines/templates/steps/analyze.yml
             parameters:
-              RustToolchain: ${{ RustToolchain }}
+              Toolchain: ${{ toolchain }}
 
           - template: /eng/common/pipelines/templates/steps/check-spelling.yml
             parameters:
diff --git a/eng/pipelines/templates/steps/analyze.yml b/eng/pipelines/templates/steps/analyze.yml
@@ -1,22 +1,22 @@
 parameters:
-  - name: RustToolchain
+  - name: Toolchain
     type: string
     default: stable
 
 steps:
   - template: /eng/pipelines/templates/steps/use-rust.yml@self
     parameters:
-      Toolchain: ${{ parameters.RustToolchain }}
+      Toolchain: ${{ parameters.Toolchain }}
 
   - pwsh: |
       . ./eng/common/scripts/Helpers/CommandInvocation-Helpers.ps1
 
       $env:RUSTDOCFLAGS = "-D warnings"
       $env:RUSTFLAGS = "-Dwarnings"
 
-      Invoke-LoggedCommand "cargo +$(RustToolchain) check -p azure_core --no-default-features"
-      Invoke-LoggedCommand "cargo +$(RustToolchain) install cargo-readme"
-      Invoke-LoggedCommand "cargo +$(RustToolchain) fmt --all -- --check"
-      Invoke-LoggedCommand "cargo +$(RustToolchain) clippy --all"
-      Invoke-LoggedCommand "cargo +$(RustToolchain) doc --all --no-deps"
+      Invoke-LoggedCommand "cargo +$(Toolchain) check -p azure_core --no-default-features"
+      Invoke-LoggedCommand "cargo +$(Toolchain) fmt --all -- --check"
+      Invoke-LoggedCommand "cargo +$(Toolchain) clippy --all"
+      Invoke-LoggedCommand "cargo +$(Toolchain) doc --all --no-deps"
+      Invoke-LoggedCommand "cargo +nightly -Zscript ./eng/scripts/verify-dependencies.rs"
     displayName: "Run source analysis"
diff --git a/eng/pipelines/templates/steps/test-packages.yml b/eng/pipelines/templates/steps/test-packages.yml
@@ -5,7 +5,7 @@ parameters:
   - name: BuildTargetingString
     type: string
     default: "*"
-  - name: RustToolchain
+  - name: Toolchain
     type: string
     default: stable
   - name: ArtifactSuffix
@@ -27,7 +27,7 @@ parameters:
 steps:
   - template: /eng/pipelines/templates/steps/use-rust.yml@self
     parameters:
-      Toolchain: ${{ parameters.RustToolchain }}
+      Toolchain: ${{ parameters.Toolchain }}
 
   - template: /eng/common/pipelines/templates/steps/set-default-branch.yml@self
 
@@ -102,7 +102,7 @@ steps:
       arguments: >
         -ServiceDirectory '${{ parameters.ServiceDirectory }}'
         -TargetingString '$(TargetingString)'
-        -Toolchain '$(RustToolchain)'
+        -Toolchain '$(Toolchain)'
         -UnitTests $${{ parameters.UnitTests }}
         -FunctionalTests $${{ parameters.FunctionalTests }}
 
diff --git a/eng/pipelines/templates/steps/use-rust.yml b/eng/pipelines/templates/steps/use-rust.yml
@@ -11,8 +11,8 @@ steps:
           $toolchain = cargo metadata --manifest-path ./sdk/core/azure_core/Cargo.toml --format-version 1 | convertfrom-json | select -expand packages | where { $_.name -eq 'azure_core' } | select -expand rust_version
       }
 
-      Write-Host "Setting RustToolchain variable to $toolchain"
-      Write-Host "##vso[task.setvariable variable=RustToolchain]$toolchain"
+      Write-Host "Setting Toolchain variable to $toolchain"
+      Write-Host "##vso[task.setvariable variable=Toolchain]$toolchain"
 
       Write-Host "> rustup update --no-self-update $toolchain"
       rustup update --no-self-update $toolchain
diff --git a/eng/scripts/Language-Settings.ps1 b/eng/scripts/Language-Settings.ps1
@@ -10,29 +10,30 @@ function Get-AllPackageInfoFromRepo ([string] $ServiceDirectory) {
     $allPackageProps = @()
     Push-Location $RepoRoot
     try {
-        $searchPath = 'sdk'
+        $sdkPath = Join-Path $RepoRoot 'sdk' -Resolve
 
         if ($ServiceDirectory -and $ServiceDirectory -ne 'auto') {
             $searchPath = Join-Path 'sdk' $ServiceDirectory
         }
 
-        $cargoTomlFiles = Get-ChildItem -Path $searchPath -Recurse -Filter 'Cargo.toml' -ErrorAction SilentlyContinue
+        $packages = cargo metadata --format-version 1
+        | ConvertFrom-Json -AsHashtable
+        | Select-Object -ExpandProperty packages
+        | Where-Object { $_.manifest_path.StartsWith($sdkPath) }
 
         $packageManifests = @{}
-        foreach ($file in $cargoTomlFiles) {
-            $manifest = cargo read-manifest --manifest-path $file | ConvertFrom-Json -AsHashtable
-
-            if ($manifest.manifest_path -replace '\\', '/' -match '/sdk/([^/]+)/') {
-                $manifest.ServiceDirectoryName = $Matches[1]
+        foreach ($package in $packages) {
+            if ($package.manifest_path -replace '\\', '/' -match '/sdk/([^/]+)/') {
+                $package.ServiceDirectoryName = $Matches[1]
             }
             else {
                 # ignore manifests that are not in a service directory
                 continue
             }
 
-            $manifest.RelativePath = (Split-Path $manifest.manifest_path -Parent).Replace($RepoRoot, "").SubString(1)
-            $manifest.DependentPackages = @()
-            $packageManifests[$manifest.name] = $manifest
+            $package.RelativePath = (Split-Path $package.manifest_path -Parent).Replace($RepoRoot, "").SubString(1)
+            $package.DependentPackages = @()
+            $packageManifests[$package.name] = $package
         }
     }
     catch {
@@ -44,22 +45,22 @@ function Get-AllPackageInfoFromRepo ([string] $ServiceDirectory) {
     }
 
     # Invert the manifest dependency graph
-    foreach ($manifest in $packageManifests.Values) {
-        foreach ($dependency in $manifest.dependencies) {
+    foreach ($package in $packageManifests.Values) {
+        foreach ($dependency in $package.dependencies) {
             $dependencyManifest = $packageManifests[$dependency.name]
             if ($dependencyManifest) {
-                $dependencyManifest.DependentPackages += $manifest
+                $dependencyManifest.DependentPackages += $package
             }
         }
     }
 
     # Flatten the dependency graph recursively
-    function GetDependentPackages($manifest, $dependantPackages) {
+    function GetDependentPackages($package, $dependantPackages) {
         if (!$dependantPackages) {
             $dependantPackages = @()
         }
 
-        foreach ($dependency in $manifest.DependentPackages) {
+        foreach ($dependency in $package.DependentPackages) {
             if ($dependantPackages.Contains($dependency)) {
                 continue
             }
@@ -70,20 +71,20 @@ function Get-AllPackageInfoFromRepo ([string] $ServiceDirectory) {
         return $dependantPackages;
     }
 
-    foreach ($manifest in $packageManifests.Values) {
-        $absolutePath = Split-Path $manifest.manifest_path -Parent -Resolve
-        $pkgProp = [PackageProps]::new($manifest.name, $manifest.version, $absolutePath, $manifest.ServiceDirectoryName)
+    foreach ($package in $packageManifests.Values) {
+        $absolutePath = Split-Path $package.manifest_path -Parent -Resolve
+        $pkgProp = [PackageProps]::new($package.name, $package.version, $absolutePath, $package.ServiceDirectoryName)
         $pkgProp.IsNewSdk = $true
-        $pkgProp.ArtifactName = $manifest.name
+        $pkgProp.ArtifactName = $package.name
 
-        if ($manifest.name -match "mgmt") {
+        if ($package.name -match "mgmt") {
             $pkgProp.SdkType = "mgmt"
         }
         else {
             $pkgProp.SdkType = "client"
         }
 
-        $pkgProp.DependentPackages = GetDependentPackages $manifest | Select-Object -ExpandProperty RelativePath
+        $pkgProp.DependentPackages = GetDependentPackages $package | Select-Object -ExpandProperty RelativePath
 
         $allPackageProps += $pkgProp
     }

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ steps:`
`11`	`11`	`$toolchain = cargo metadata --manifest-path ./sdk/core/azure_core/Cargo.toml --format-version 1 \| convertfrom-json \| select -expand packages \| where { $_.name -eq 'azure_core' } \| select -expand rust_version`
`12`	`12`	`}`
`13`	`13`
`14`		`- Write-Host "Setting RustToolchain variable to $toolchain"`
`15`		`- Write-Host "##vso[task.setvariable variable=RustToolchain]$toolchain"`
	`14`	`+ Write-Host "Setting Toolchain variable to $toolchain"`
	`15`	`+ Write-Host "##vso[task.setvariable variable=Toolchain]$toolchain"`
`16`	`16`
`17`	`17`	`Write-Host "> rustup update --no-self-update $toolchain"`
`18`	`18`	`rustup update --no-self-update $toolchain`