Skip to content

Commit eb81443

Browse files
azure-sdkraych1
andauthored
Sync eng/common directory with azure-sdk-tools for PR 13040 (#47369)
* Include groupId in the pkg name when create api view request * Used the package info in the function signature --------- Co-authored-by: ray chen <raychen@microsoft.com>
1 parent c54a779 commit eb81443

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ steps:
4040
- task: Powershell@2
4141
inputs:
4242
filePath: ${{ parameters.SourceRootPath }}/eng/common/scripts/Create-APIReview.ps1
43+
# PackageInfoFiles example: @('a/file1.json','a/file2.json')
4344
arguments: >
4445
-PackageInfoFiles @('${{ join(''',''', parameters.PackageInfoFiles) }}')
4546
-ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name)

eng/common/pipelines/templates/steps/validate-all-packages.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ steps:
2424
azureSubscription: opensource-api-connection
2525
scriptType: pscore
2626
scriptLocation: inlineScript
27+
# PackageInfoFiles example: @('a/file1.json','a/file2.json')
2728
inlineScript: |
2829
$(Build.SourcesDirectory)/eng/common/scripts/Validate-All-Packages.ps1 `
2930
-ArtifactList ('${{ convertToJson(parameters.Artifacts) }}' | ConvertFrom-Json | Select-Object Name) `

eng/common/scripts/Detect-Api-Changes.ps1

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,16 @@ Param (
2222
$configFileDir = Join-Path -Path $ArtifactPath "PackageInfo"
2323

2424
# Submit API review request and return status whether current revision is approved or pending or failed to create review
25-
function Submit-Request($filePath, $packageName, $packageType)
25+
function Submit-Request($filePath, $packageInfo)
2626
{
27+
$packageName = $packageInfo.ArtifactName ?? $packageInfo.Name
28+
$packageType = $packageInfo.SdkType
29+
30+
# Construct full package name with groupId if available
31+
$fullPackageName = $packageName
32+
if ($packageInfo.PSObject.Members.Name -contains "Group" -and $packageInfo.Group) {
33+
$fullPackageName = "$($packageInfo.Group):$packageName"
34+
}
2735
$repoName = $RepoFullName
2836
if (!$repoName) {
2937
$repoName = "azure/azure-sdk-for-$LanguageShort"
@@ -36,7 +44,7 @@ function Submit-Request($filePath, $packageName, $packageType)
3644
$query.Add('commitSha', $CommitSha)
3745
$query.Add('repoName', $repoName)
3846
$query.Add('pullRequestNumber', $PullRequestNumber)
39-
$query.Add('packageName', $packageName)
47+
$query.Add('packageName', $fullPackageName)
4048
$query.Add('language', $LanguageShort)
4149
$query.Add('project', $DevopsProject)
4250
$query.Add('packageType', $packageType)
@@ -75,7 +83,7 @@ function Submit-Request($filePath, $packageName, $packageType)
7583
catch
7684
{
7785
Write-Host "ERROR: API request failed" -ForegroundColor Red
78-
Write-Host "Status Code: $($_.Exception.Response.StatusCode.Value__)" -ForegroundColor Yellow
86+
Write-Host "Status Code: $($_.Exception.Response.StatusCode.Value__)" -ForegroundColor Yellow
7987
Write-Host "Error: $($_.Exception.Message)" -ForegroundColor Yellow
8088
if ($_.ErrorDetails.Message) {
8189
Write-Host "Details: $($_.ErrorDetails.Message)" -ForegroundColor Yellow
@@ -165,7 +173,7 @@ foreach ($packageInfoFile in $packageInfoFiles)
165173
if ($isRequired -eq $True)
166174
{
167175
$filePath = $pkgPath.Replace($ArtifactPath , "").Replace("\", "/")
168-
$respCode = Submit-Request -filePath $filePath -packageName $pkgArtifactName -packageType $packageType
176+
$respCode = Submit-Request -filePath $filePath -packageInfo $packageInfo
169177
if ($respCode -ne '200')
170178
{
171179
$responses[$pkgArtifactName] = $respCode

0 commit comments

Comments
 (0)