github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Additional clean up

Browse Source
This commit is contained in:
Alitzel Mendez 2025-12-08 16:01:28 -08:00 committed by azure-sdk
parent cbff29908b
commit b4ff6c4578
1 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
eng/common/scripts/Create-APIReview.ps1
View File

@ -4,8 +4,6 @@ Param (
[array] $ArtifactList, [array] $ArtifactList,
[Parameter(Mandatory=$False)] [Parameter(Mandatory=$False)]
[string] $ArtifactPath, [string] $ArtifactPath,
[Parameter(Mandatory=$False)]
[string] $APIKey,
[string] $SourceBranch, [string] $SourceBranch,
[string] $DefaultBranch, [string] $DefaultBranch,
[string] $RepoName, [string] $RepoName,
@ -25,23 +23,21 @@ Set-StrictMode -Version 3
. (Join-Path $PSScriptRoot Helpers ApiView-Helpers.ps1) . (Join-Path $PSScriptRoot Helpers ApiView-Helpers.ps1)
# Get Bearer token for APIView authentication # Get Bearer token for APIView authentication
# Uses Azure CLI to get an access token for the specified audience function Get-ApiViewBearerToken()
function Get-ApiViewBearerToken($audience)
{ {
$audience = "api://apiview"
try { try {
Write-Host "Acquiring access token for audience: $audience"
$tokenResponse = az account get-access-token --resource $audience --output json | ConvertFrom-Json $tokenResponse = az account get-access-token --resource $audience --output json | ConvertFrom-Json
if ($tokenResponse -and $tokenResponse.accessToken) { if ($tokenResponse -and $tokenResponse.accessToken) {
Write-Host "Successfully acquired access token"
return $tokenResponse.accessToken return $tokenResponse.accessToken
} }
else { else {
Write-Host "Failed to acquire access token - no token in response" -ForegroundColor Yellow Write-Error "Failed to acquire access token - no token in response"
return $null return $null
} }
} }
catch { catch {
Write-Host "Failed to acquire access token: $($_.Exception.Message)" -ForegroundColor Yellow Write-Error "Failed to acquire access token: $($_.Exception.Message)"
return $null return $null
} }
} }
@ -103,18 +99,16 @@ function Upload-SourceArtifact($filePath, $apiLabel, $releaseStatus, $packageVer
$uri = "${APIViewUri}/upload" $uri = "${APIViewUri}/upload"
# Get Bearer token for authentication (preferred) or fall back to API key # Get Bearer token for authentication
$bearerToken = Get-ApiViewBearerToken $APIViewAudience $bearerToken = Get-ApiViewBearerToken
if ($bearerToken) { if (-not $bearerToken) {
$headers = @{
"Authorization" = "Bearer $bearerToken";
"content-type" = "multipart/form-data"
}
}
else {
Write-Host "ERROR: No authentication method available. Either Azure CLI login or APIKey is required." -ForegroundColor Red
return 401 return 401
} }
$headers = @{
"Authorization" = "Bearer $bearerToken";
"content-type" = "multipart/form-data"
}
try try
{ {
@ -155,17 +149,15 @@ function Upload-ReviewTokenFile($packageName, $apiLabel, $releaseStatus, $review
Write-Host "Request to APIView: $uri" Write-Host "Request to APIView: $uri"
# Get Bearer token for authentication (preferred) or fall back to API key # Get Bearer token for authentication
$bearerToken = Get-ApiViewBearerToken $APIViewAudience $bearerToken = Get-ApiViewBearerToken
if ($bearerToken) { if (-not $bearerToken) {
$headers = @{
"Authorization" = "Bearer $bearerToken"
}
}
else {
Write-Host "ERROR: No authentication method available. Either Azure CLI login or APIKey is required." -ForegroundColor Red
return 401 return 401
} }
$headers = @{
"Authorization" = "Bearer $bearerToken"
}
try try
{ {