Feedback

eng/common/pipelines/templates/steps/create-apireview.yml

@@ -37,16 +37,18 @@ steps:
       parameters:
         WorkingDirectory: ${{ parameters.SourceRootPath }}
 
-    - task: Powershell@2
+    - task: AzureCLI@2
       inputs:
-        filePath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Create-APIReview.ps1
+        azureSubscription: 'APIView prod deployment'
+        scriptType: pscore
+        scriptLocation: scriptPath
+        scriptPath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Create-APIReview.ps1
         # PackageInfoFiles example: @('a/file1.json','a/file2.json')
         arguments: >
           -PackageInfoFiles @('${{ join(''',''', parameters.PackageInfoFiles) }}')
           -ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name)
           -ArtifactPath '${{parameters.ArtifactPath}}'
           -ArtifactName ${{ parameters.ArtifactName }}
-          -APIKey '$(azuresdk-apiview-apikey)'
           -PackageName '${{parameters.PackageName}}'
           -SourceBranch '$(Build.SourceBranchName)'
           -DefaultBranch '$(DefaultBranch)'
@@ -54,7 +56,6 @@ steps:
           -BuildId '$(Build.BuildId)'
           -RepoName '$(Build.Repository.Name)'
           -MarkPackageAsShipped $${{parameters.MarkPackageAsShipped}}
-        pwsh: true
       displayName: Create API Review
       condition: >-
         and(

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

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

eng/common/scripts/Create-APIReview.ps1

@@ -4,15 +4,13 @@ Param (
   [array] $ArtifactList,
   [Parameter(Mandatory=$True)]
   [string] $ArtifactPath,
-  [Parameter(Mandatory=$True)]
-  [string] $APIKey,
   [string] $SourceBranch,
   [string] $DefaultBranch,
   [string] $RepoName,
   [string] $BuildId,
   [string] $PackageName = "",
   [string] $ConfigFileDir = "",
-  [string] $APIViewUri = "https://apiview.dev/AutoReview",
+  [string] $APIViewUri = "https://apiview.dev/autoreview",
   [string] $ArtifactName = "packages",
   [bool] $MarkPackageAsShipped = $false,
   [Parameter(Mandatory=$False)]
@@ -20,9 +18,28 @@ Param (
 )
 
 Set-StrictMode -Version 3
+
 . (Join-Path $PSScriptRoot common.ps1)
 . (Join-Path $PSScriptRoot Helpers ApiView-Helpers.ps1)
 
+# Get Bearer token for APIView authentication
+# In Azure DevOps, this uses the service connection's Managed Identity/Service Principal
+function Get-ApiViewBearerToken()
+{
+    try {
+        $tokenResponse = az account get-access-token --resource "api://apiview" --output json 2>&1
+        if ($LASTEXITCODE -ne 0) {
+            Write-Error "Failed to acquire access token: $tokenResponse"
+            return $null
+        }
+        return ($tokenResponse | ConvertFrom-Json).accessToken
+    }
+    catch {
+        Write-Error "Failed to acquire access token: $($_.Exception.Message)"
+        return $null
+    }
+}
+
 # Submit API review request and return status whether current revision is approved or pending or failed to create review
 function Upload-SourceArtifact($filePath, $apiLabel, $releaseStatus, $packageVersion, $packageType)
 {
@@ -78,9 +95,17 @@ function Upload-SourceArtifact($filePath, $apiLabel, $releaseStatus, $packageVer
         Write-Host "Request param, compareAllRevisions: true"
     }
 
-    $uri = "${APIViewUri}/UploadAutoReview"
+    $uri = "${APIViewUri}/upload"
+    
+    # Get Bearer token for authentication
+    $bearerToken = Get-ApiViewBearerToken
+    if (-not $bearerToken) {
+        Write-Error "Failed to acquire Bearer token for APIView authentication."
+        return [System.Net.HttpStatusCode]::Unauthorized
+    }
+    
     $headers = @{
-        "ApiKey" = $apiKey;
+        "Authorization" = "Bearer $bearerToken";
         "content-type" = "multipart/form-data"
     }
 
@@ -115,20 +140,28 @@ function Upload-ReviewTokenFile($packageName, $apiLabel, $releaseStatus, $review
     if($MarkPackageAsShipped) {
         $params += "&setReleaseTag=true"
     }
-    $uri = "${APIViewUri}/CreateApiReview?${params}"
+    $uri = "${APIViewUri}/create?${params}"
     if ($releaseStatus -and ($releaseStatus -ne "Unreleased"))
     {
         $uri += "&compareAllRevisions=true"
     }
 
     Write-Host "Request to APIView: $uri"
+    
+    # Get Bearer token for authentication
+    $bearerToken = Get-ApiViewBearerToken
+    if (-not $bearerToken) {
+        Write-Error "Failed to acquire Bearer token for APIView authentication."
+        return [System.Net.HttpStatusCode]::Unauthorized
+    }
+    
     $headers = @{
-        "ApiKey" = $APIKey;
+        "Authorization" = "Bearer $bearerToken"
     }
 
     try
     {
-        $Response = Invoke-WebRequest -Method 'GET' -Uri $uri -Headers $headers
+        $Response = Invoke-WebRequest -Method 'POST' -Uri $uri -Headers $headers
         Write-Host "API review: $($Response.Content)"
         $StatusCode = $Response.StatusCode
     }

eng/common/scripts/SetTestPipelineVersion.ps1

@@ -5,83 +5,63 @@ param (
   [string]$BuildID,
   [Parameter(mandatory = $false)]
   [string]$PackageNames = "",
-  [Parameter(mandatory = $false)]
-  # ServiceDirectory is required when using PackageNames,
-  # or when Artifacts do not include their own ServiceDirectory property.
+  [Parameter(mandatory = $true)]
   [string]$ServiceDirectory,
   [Parameter(mandatory = $false)]
   [string]$TagSeparator = "_",
   [Parameter(mandatory = $false)]
-  [object[]]$Artifacts = @()
+  [string]$ArtifactsJson = ""
 )
 
 . (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 "Artifacts count: $($Artifacts.Count)"
+Write-Host "ArtifactsJson: $ArtifactsJson"
 
-if ($Artifacts -and $Artifacts.Count -gt 0) {
-  # When using Artifacts, process each artifact with its name and groupId (if applicable)
+$packageNamesArray = @()
+$artifacts = $null
+
+# If ArtifactsJson is provided, extract package names from it
+if (![String]::IsNullOrWhiteSpace($ArtifactsJson)) {
+  Write-Host "Using ArtifactsJson to determine package names"
   try {
-    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
-      }
+    $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
+}
 
+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*"
@@ -107,27 +87,21 @@ if ($Artifacts -and $Artifacts.Count -gt 0) {
       if ($Language -ne "java") {
         SetPackageVersion -PackageName $packageName `
           -Version $newVersion.ToString() `
-          -ServiceDirectory $artifactServiceDirectory
+          -ServiceDirectory $ServiceDirectory
       } else {
         SetPackageVersion -PackageName $packageName `
           -Version $newVersion.ToString() `
-          -ServiceDirectory $artifactServiceDirectory `
+          -ServiceDirectory $ServiceDirectory `
           -GroupId $groupId
       }
     }
   }
   catch {
-    LogError "Failed to process Artifacts: exception: $($_.Exception.Message)"
+    LogError "Failed to process ArtifactsJson: $ArtifactsJson, exception: $($_.Exception.Message)"
     exit 1
   }
-} elseif (![String]::IsNullOrWhiteSpace($PackageNames)) {
+} else {
   # 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")
@@ -157,7 +131,4 @@ if ($Artifacts -and $Artifacts.Count -gt 0) {
       -Version $newVersion.ToString() `
       -ServiceDirectory $ServiceDirectory
   }
-} else {
-  LogError "Either PackageNames or Artifacts must be provided."
-  exit 1
 }

eng/common/scripts/logging.ps1

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