update scripts (#6797)

Co-authored-by: helen229 <gaoh@microsoft.com>
This commit is contained in:
Azure SDK Bot 2025-10-20 13:30:39 -07:00 committed by GitHub
parent 5afdf22a90
commit 612333d157
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 7 deletions

View File

@ -24,7 +24,7 @@ Set-StrictMode -Version 3
. (Join-Path $PSScriptRoot Helpers ApiView-Helpers.ps1)
# 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)
function Upload-SourceArtifact($filePath, $apiLabel, $releaseStatus, $packageVersion, $packageType)
{
Write-Host "File path: $filePath"
$fileName = Split-Path -Leaf $filePath
@ -61,6 +61,13 @@ function Upload-SourceArtifact($filePath, $apiLabel, $releaseStatus, $packageVer
$multipartContent.Add($releaseTagParamContent)
Write-Host "Request param, setReleaseTag: $MarkPackageAsShipped"
$packageTypeParam = [System.Net.Http.Headers.ContentDispositionHeaderValue]::new("form-data")
$packageTypeParam.Name = "packageType"
$packageTypeParamContent = [System.Net.Http.StringContent]::new($packageType)
$packageTypeParamContent.Headers.ContentDisposition = $packageTypeParam
$multipartContent.Add($packageTypeParamContent)
Write-Host "Request param, packageType: $packageType"
if ($releaseStatus -and ($releaseStatus -ne "Unreleased"))
{
$compareAllParam = [System.Net.Http.Headers.ContentDispositionHeaderValue]::new("form-data")
@ -92,14 +99,14 @@ function Upload-SourceArtifact($filePath, $apiLabel, $releaseStatus, $packageVer
return $StatusCode
}
function Upload-ReviewTokenFile($packageName, $apiLabel, $releaseStatus, $reviewFileName, $packageVersion, $filePath)
function Upload-ReviewTokenFile($packageName, $apiLabel, $releaseStatus, $reviewFileName, $packageVersion, $filePath, $packageType)
{
Write-Host "Original File path: $filePath"
$fileName = Split-Path -Leaf $filePath
Write-Host "OriginalFile name: $fileName"
$params = "buildId=${BuildId}&artifactName=${ArtifactName}&originalFilePath=${fileName}&reviewFilePath=${reviewFileName}"
$params += "&label=${apiLabel}&repoName=${RepoName}&packageName=${packageName}&project=internal&packageVersion=${packageVersion}"
$params +="&label=${apiLabel}&repoName=${RepoName}&packageName=${packageName}&project=internal&packageVersion=${packageVersion}&packageType=${packageType}"
if($MarkPackageAsShipped) {
$params += "&setReleaseTag=true"
}
@ -146,17 +153,18 @@ function Get-APITokenFileName($packageName)
function Submit-APIReview($packageInfo, $packagePath)
{
$apiLabel = "Source Branch:${SourceBranch}"
$packageType = $packageInfo.SdkType
# Get generated review token file if present
# APIView processes request using different API if token file is already generated
$reviewTokenFileName = Get-APITokenFileName $packageInfo.ArtifactName
if ($reviewTokenFileName) {
Write-Host "Uploading review token file $reviewTokenFileName to APIView."
return Upload-ReviewTokenFile $packageInfo.ArtifactName $apiLabel $packageInfo.ReleaseStatus $reviewTokenFileName $packageInfo.Version $packagePath
return Upload-ReviewTokenFile $packageInfo.ArtifactName $apiLabel $packageInfo.ReleaseStatus $reviewTokenFileName $packageInfo.Version $packagePath $packageType
}
else {
Write-Host "Uploading $packagePath to APIView."
return Upload-SourceArtifact $packagePath $apiLabel $packageInfo.ReleaseStatus $packageInfo.Version
return Upload-SourceArtifact $packagePath $apiLabel $packageInfo.ReleaseStatus $packageInfo.Version $packageType
}
}

View File

@ -22,7 +22,7 @@ Param (
$configFileDir = Join-Path -Path $ArtifactPath "PackageInfo"
# Submit API review request and return status whether current revision is approved or pending or failed to create review
function Submit-Request($filePath, $packageName)
function Submit-Request($filePath, $packageName, $packageType)
{
$repoName = $RepoFullName
if (!$repoName) {
@ -39,6 +39,7 @@ function Submit-Request($filePath, $packageName)
$query.Add('packageName', $packageName)
$query.Add('language', $LanguageShort)
$query.Add('project', $DevopsProject)
$query.Add('packageType', $packageType)
$reviewFileFullName = Join-Path -Path $ArtifactPath $packageName $reviewFileName
# If CI generates token file then it passes both token file name and original file (filePath) to APIView
# If both files are passed then APIView downloads the parent directory as a zip
@ -126,6 +127,7 @@ foreach ($packageInfoFile in $packageInfoFiles)
{
$packageInfo = Get-Content $packageInfoFile | ConvertFrom-Json
$pkgArtifactName = $packageInfo.ArtifactName ?? $packageInfo.Name
$packageType = $packageInfo.SdkType
LogInfo "Processing $($pkgArtifactName)"
@ -157,7 +159,7 @@ foreach ($packageInfoFile in $packageInfoFiles)
if ($isRequired -eq $True)
{
$filePath = $pkgPath.Replace($ArtifactPath , "").Replace("\", "/")
$respCode = Submit-Request -filePath $filePath -packageName $pkgArtifactName
$respCode = Submit-Request -filePath $filePath -packageName $pkgArtifactName -packageType $packageType
if ($respCode -ne '200')
{
$responses[$pkgArtifactName] = $respCode