Merge remote-tracking branch 'origin/main' into xitzhang/functioncallsample

Author: Xiting Zhang

eng/automation/parameters.py

@@ -17,7 +17,7 @@
 
 SDK_ROOT = "../../"  # related to file dir
 AUTOREST_CORE_VERSION = "3.9.7"
-AUTOREST_JAVA = "@autorest/[email protected].60"
+AUTOREST_JAVA = "@autorest/[email protected].62"
 DEFAULT_VERSION = "1.0.0-beta.1"
 GROUP_ID = "com.azure.resourcemanager"
 API_SPECS_FILE = "api-specs.yaml"

eng/common/pipelines/templates/steps/daily-dev-build-variable.yml

@@ -2,6 +2,7 @@
 # is used when this pipeline is going to be generating and publishing daily dev builds.
 parameters:
   ServiceDirectory: ''
+  Artifacts: []
   Condition: succeeded()
 steps:
 - ${{if ne(parameters.ServiceDirectory, '')}}:
@@ -11,6 +12,7 @@ steps:
       arguments: >
         -ServiceDirectory ${{parameters.ServiceDirectory}}
         -OutDirectory $(Build.ArtifactStagingDirectory)/PackageInfo
+        -artifactList @('${{ replace(convertToJson(parameters.Artifacts), '''', '`''') }}' | ConvertFrom-Json | Select-Object -ExpandProperty name)
       pwsh: true
       workingDirectory: $(Pipeline.Workspace)
     displayName: Dump Package properties

eng/common/pipelines/templates/steps/set-test-pipeline-version.yml

@@ -14,9 +14,9 @@ parameters:
 - name: TestPipeline
   type: boolean
   default: false
-- name: ArtifactsJson
-  type: string
-  default: ''
+- name: Artifacts
+  type: object
+  default: []
 
 steps:
 - ${{ if eq(parameters.TestPipeline, true) }}:
@@ -31,5 +31,5 @@ steps:
           -PackageNames '${{ coalesce(parameters.PackageName, parameters.PackageNames) }}'
           -ServiceDirectory '${{ parameters.ServiceDirectory }}'
           -TagSeparator '${{ parameters.TagSeparator }}'
-          -ArtifactsJson '${{ parameters.ArtifactsJson }}'
+          -Artifacts @('${{ replace(convertToJson(parameters.Artifacts), '''', '`''') }}' | ConvertFrom-Json)
         pwsh: true

eng/common/scripts/Save-Package-Properties.ps1

@@ -30,7 +30,11 @@ package properties JSON file. If the package properties JSON file already
 exists, read the Version property from the existing package properties JSON file
 and set that as the Version property for the new output. This has the effect of
 "adding" a DevVersion property to the file which could be different from the
-Verison property in that file.
+Version property in that file.
+
+.PARAMETER artifactList
+Optional array of artifact names to filter the package properties. Only packages
+with artifact names matching entries in this list will be processed.
 #>
 
 [CmdletBinding()]
@@ -39,7 +43,8 @@ Param (
   [Parameter(Mandatory = $True)]
   [string] $outDirectory,
   [string] $prDiff,
-  [switch] $addDevVersion
+  [switch] $addDevVersion,
+  [array] $artifactList
 )
 
 . (Join-Path $PSScriptRoot common.ps1)
@@ -132,6 +137,38 @@ if (-not (Test-Path -Path $outDirectory))
   New-Item -ItemType Directory -Force -Path $outDirectory | Out-Null
 }
 
+if ($artifactList)
+{
+  # Filter out null, empty, or whitespace-only entries
+  $filteredArtifacts = @($artifactList | Where-Object { -not [string]::IsNullOrWhiteSpace($_) })
+  
+  if ($filteredArtifacts.Count -eq 0)
+  {
+    Write-Warning "Artifact list contains no valid entries"
+  }
+  else
+  {
+    Write-Host "Filtering package properties to match artifact list: $($filteredArtifacts -join ', ')"
+    $artifactSet = New-Object 'System.Collections.Generic.HashSet[string]' ([System.StringComparer]::OrdinalIgnoreCase)
+    foreach ($artifact in $filteredArtifacts) {
+      $artifactSet.Add($artifact) | Out-Null
+    }
+
+    # Warn about packages missing ArtifactName property
+    $missingArtifactName = $allPackageProperties | Where-Object { $_.PSObject.Properties.Name -notcontains 'ArtifactName' }
+    foreach ($pkg in $missingArtifactName) {
+      Write-Warning "Package '$($pkg.PackageName)' does not have an 'ArtifactName' property and will be excluded from artifact filtering."
+    }
+    $allPackageProperties = $allPackageProperties | Where-Object { $_.ArtifactName -and $artifactSet.Contains($_.ArtifactName) }
+
+    if (!$allPackageProperties)
+    {
+      Write-Error "No packages found matching the provided artifact list"
+      exit 1
+    }
+  }
+}
+
 foreach ($pkg in $allPackageProperties)
 {
   if ($pkg.Name)

eng/common/scripts/SetTestPipelineVersion.ps1

@@ -5,63 +5,83 @@ param (
   [string]$BuildID,
   [Parameter(mandatory = $false)]
   [string]$PackageNames = "",
-  [Parameter(mandatory = $true)]
+  [Parameter(mandatory = $false)]
+  # ServiceDirectory is required when using PackageNames,
+  # or when Artifacts do not include their own ServiceDirectory property.
   [string]$ServiceDirectory,
   [Parameter(mandatory = $false)]
   [string]$TagSeparator = "_",
   [Parameter(mandatory = $false)]
-  [string]$ArtifactsJson = ""
+  [object[]]$Artifacts = @()
 )
 
 . (Join-Path $PSScriptRoot common.ps1)
 
+# Ensure Artifacts is always an array
+$Artifacts = @($Artifacts)
+
 Write-Host "PackageNames: $PackageNames"
 Write-Host "ServiceDirectory: $ServiceDirectory"
 Write-Host "BuildID: $BuildID"
-Write-Host "ArtifactsJson: $ArtifactsJson"
+Write-Host "Artifacts count: $($Artifacts.Count)"
 
-$packageNamesArray = @()
-$artifacts = $null
-
-# If ArtifactsJson is provided, extract package names from it
-if (![String]::IsNullOrWhiteSpace($ArtifactsJson)) {
-  Write-Host "Using ArtifactsJson to determine package names"
+if ($Artifacts -and $Artifacts.Count -gt 0) {
+  # When using Artifacts, process each artifact with its name and groupId (if applicable)
   try {
-    $artifacts = $ArtifactsJson | ConvertFrom-Json
-    $packageNamesArray = $artifacts | ForEach-Object { $_.name }
-    Write-Host "Extracted package names from ArtifactsJson: $($packageNamesArray -join ', ')"
-  }
-  catch {
-    LogError "Failed to parse ArtifactsJson: $($_.Exception.Message)"
-    exit 1
-  }
-}
-elseif (![String]::IsNullOrWhiteSpace($PackageNames)) {
-  $packageNamesArray = $PackageNames.Split(',')
-}
-else {
-  LogError "Either PackageNames or ArtifactsJson must be provided."
-  exit 1
-}
+    foreach ($artifact in $Artifacts) {
+      # Validate required properties
+      if (-not (Get-Member -InputObject $artifact -Name 'name' -MemberType Properties)) {
+        LogError "Artifact is missing required 'name' property."
+        exit 1
+      }
 
-if ($artifacts) {
-  # When using ArtifactsJson, process each artifact with its name and groupId (if applicable)
-  try {
-    foreach ($artifact in $artifacts) {
       $packageName = $artifact.name
+      if ([String]::IsNullOrWhiteSpace($packageName)) {
+        LogError "Artifact 'name' property is null or empty."
+        exit 1
+      }
+
+      $artifactServiceDirectory = $null
+      # Check for ServiceDirectory property
+      if (Get-Member -InputObject $artifact -Name 'ServiceDirectory' -MemberType Properties) {
+        if (![String]::IsNullOrWhiteSpace($artifact.ServiceDirectory)) {
+          $artifactServiceDirectory = $artifact.ServiceDirectory
+        }
+      }
+
+      if ([String]::IsNullOrWhiteSpace($artifactServiceDirectory)) {
+        $artifactServiceDirectory = $ServiceDirectory
+      }
+      
+      # Validate ServiceDirectory is available
+      if ([String]::IsNullOrWhiteSpace($artifactServiceDirectory)) {
+        LogError "ServiceDirectory is required but not provided for artifact '$packageName'. Provide it via script parameter or artifact property."
+        exit 1
+      }
+
       $newVersion = [AzureEngSemanticVersion]::new("1.0.0")
       $prefix = "$packageName$TagSeparator"
 
       if ($Language -eq "java") {
+        # Check for groupId property
+        if (-not (Get-Member -InputObject $artifact -Name 'groupId' -MemberType Properties)) {
+          LogError "Artifact '$packageName' is missing required 'groupId' property for Java language."
+          exit 1
+        }
+
         $groupId = $artifact.groupId
-        Write-Host "Processing $packageName with groupId $groupId"
         if ([String]::IsNullOrWhiteSpace($groupId)) {
           LogError "GroupId is missing for package $packageName."
           exit 1
         }
+
+        Write-Host "Processing $packageName with groupId $groupId"
         # Use groupId+artifactName format for tag prefix (e.g., "com.azure.v2+azure-sdk-template_")
         $prefix = "$groupId+$packageName$TagSeparator"
       }
+      else {
+        Write-Host "Processing $packageName"
+      }
 
       Write-Host "Get Latest Tag : git tag -l $prefix*"
       $latestTags = git tag -l "$prefix*"
@@ -87,21 +107,27 @@ if ($artifacts) {
       if ($Language -ne "java") {
         SetPackageVersion -PackageName $packageName `
           -Version $newVersion.ToString() `
-          -ServiceDirectory $ServiceDirectory
+          -ServiceDirectory $artifactServiceDirectory
       } else {
         SetPackageVersion -PackageName $packageName `
           -Version $newVersion.ToString() `
-          -ServiceDirectory $ServiceDirectory `
+          -ServiceDirectory $artifactServiceDirectory `
           -GroupId $groupId
       }
     }
   }
   catch {
-    LogError "Failed to process ArtifactsJson: $ArtifactsJson, exception: $($_.Exception.Message)"
+    LogError "Failed to process Artifacts: exception: $($_.Exception.Message)"
     exit 1
   }
-} else {
+} elseif (![String]::IsNullOrWhiteSpace($PackageNames)) {
   # Fallback to original logic when using PackageNames string
+  if ([String]::IsNullOrWhiteSpace($ServiceDirectory)) {
+    LogError "ServiceDirectory is required when using PackageNames."
+    exit 1
+  }
+
+  $packageNamesArray = $PackageNames.Split(',')
   foreach ($packageName in $packageNamesArray) {
     Write-Host "Processing $packageName"
     $newVersion = [AzureEngSemanticVersion]::new("1.0.0")
@@ -131,4 +157,7 @@ if ($artifacts) {
       -Version $newVersion.ToString() `
       -ServiceDirectory $ServiceDirectory
   }
+} else {
+  LogError "Either PackageNames or Artifacts must be provided."
+  exit 1
 }

eng/common/scripts/logging.ps1

@@ -94,6 +94,9 @@ function LogGroupStart() {
   elseif (Test-SupportsGitHubLogging) {
     Write-Host "::group::$args"
   }
+  else {
+    Write-Host "> $args"
+  }
 }
 
 function LogGroupEnd() {