Merge branch 'main' into dev/Aman-Jain-14/StorageCache_AutoImport_2025-05-01_API_spec

Author: Aman-Jain-14

.github/package-lock.json

@@ -15,7 +15,8 @@ jobs:
     if: |
       github.event.check_run.check_suite.app.name == 'Azure Pipelines' && (
       contains(github.event.check_run.name, 'APIView') ||
-      contains(github.event.check_run.name, 'SDK Generation') )
+      contains(github.event.check_run.name, 'SDK Generation') ||
+      contains(github.event.check_run.name, 'SDK azure-sdk-for-') )
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/post-apiview.yml

@@ -130,14 +130,22 @@ export async function extractInputs(github, context, core) {
         core.info(
           `listPullRequestsAssociatedWithCommit(${head_owner}, ${head_repo}, ${head_sha})`,
         );
-        const pullRequests = await github.paginate(
-          github.rest.repos.listPullRequestsAssociatedWithCommit,
-          {
-            owner: head_owner,
-            repo: head_repo,
-            commit_sha: head_sha,
-            per_page: PER_PAGE_MAX,
-          },
+        const pullRequests = (
+          await github.paginate(
+            github.rest.repos.listPullRequestsAssociatedWithCommit,
+            {
+              owner: head_owner,
+              repo: head_repo,
+              commit_sha: head_sha,
+              per_page: PER_PAGE_MAX,
+            },
+          )
+        ).filter(
+          // Only include PRs to the same repo as the triggering workflow.
+          //
+          // Other unique keys like "full_name" should also work, but "id" is the safest since it's
+          // supposed to be guaranteed unique and never change (repos can be renamed or change owners).
+          (pr) => pr.base.repo.id === payload.workflow_run.repository.id,
         );
 
         if (pullRequests.length === 0) {

.github/workflows/src/context.js

@@ -198,7 +198,7 @@ describe("extractInputs", () => {
     });
   });
 
-  it.each([0, 1, 2])(
+  it.each([0, 1, 2, 3])(
     "workflow_run:completed:pull_request (fork repo, %s PRs)",
     async (numPullRequests) => {
       const context = {
@@ -216,6 +216,7 @@ describe("extractInputs", () => {
             head_sha: "abc123",
             id: 456,
             repository: {
+              id: 1234,
               name: "TestRepoName",
               owner: {
                 login: "TestRepoOwnerLogin",
@@ -231,7 +232,28 @@ describe("extractInputs", () => {
         async (args) => {
           console.log(JSON.stringify(args));
           return {
-            data: [{ number: 123 }, { number: 124 }].slice(0, numPullRequests),
+            data: [
+              {
+                base: {
+                  repo: { id: 1234 },
+                },
+                number: 123,
+              },
+              // Ensure PRs to other repos are excluded
+              {
+                base: {
+                  repo: { id: 4567 },
+                },
+                number: 1,
+              },
+              // Multiple PRs to triggering repo still causes an error (TODO: #33418)
+              {
+                base: {
+                  repo: { id: 1234 },
+                },
+                number: 124,
+              },
+            ].slice(0, numPullRequests),
           };
         },
       );
@@ -266,7 +288,8 @@ describe("extractInputs", () => {
         });
 
         expect(github.rest.search.issuesAndPullRequests).toHaveBeenCalled();
-      } else if (numPullRequests === 1) {
+      } else if (numPullRequests === 1 || numPullRequests === 2) {
+        // Second PR is to a different repo, so expect same behavior with or without it
         await expect(
           extractInputs(github, context, createMockCore()),
         ).resolves.toEqual({
@@ -277,6 +300,7 @@ describe("extractInputs", () => {
           run_id: 456,
         });
       } else {
+        // Multiple PRs to triggering repo still causes an error (TODO: #33418)
         await expect(
           extractInputs(github, context, createMockCore()),
         ).rejects.toThrow("Unexpected number of pull requests");

.github/workflows/test/context.test.js

@@ -657,6 +657,7 @@ $serialized
 '`@ | ConvertFrom-Json -AsHashtable
 # Set global variables that aren't always passed as parameters
 `$ResourceGroupName = `$parameters.ResourceGroupName
+`$AdditionalParameters = `$parameters.AdditionalParameters
 `$DeploymentOutputs = `$parameters.DeploymentOutputs
 $postDeploymentScript `@parameters
 "@

eng/common/TestResources/New-TestResources.ps1

@@ -180,14 +180,15 @@ function Set-ApiViewCommentForPR {
       $commentText += "APIView identified API level changes in this PR and created the following API reviews"
       $commentText += ""
 
+      $responseContent = $response.Content | ConvertFrom-Json
       if ($RepoName.StartsWith(("azure-sdk-for-"))) {
-        $response | ForEach-Object {
+        $responseContent | ForEach-Object {
           $commentText += "[$($_.packageName)]($($_.url))"
         }
       } else {
         $commentText += "| Language | API Review for Package |"
         $commentText += "|----------|---------|"
-        $response | ForEach-Object {
+        $responseContent | ForEach-Object {
           $commentText += "| $($_.language) | [$($_.packageName)]($($_.url)) |"
         }
       }

eng/common/scripts/Helpers/ApiView-Helpers.ps1

@@ -15,6 +15,8 @@ param (
     [Parameter(Mandatory=$False)][array] $Filters,
     [Parameter(Mandatory=$False)][array] $Replace,
     [Parameter(Mandatory=$False)][array] $NonSparseParameters,
+    # Use for local generation/debugging when env: values are set in a matrix
+    [Parameter(Mandatory=$False)][switch] $SkipEnvironmentVariables,
     [Parameter()][switch] $CI = ($null -ne $env:SYSTEM_TEAMPROJECTID)
 )
 
@@ -34,7 +36,8 @@ $Filters = $Filters | Where-Object { $_ }
     -displayNameFilter $DisplayNameFilter `
     -filters $Filters `
     -replace $Replace `
-    -nonSparseParameters $NonSparseParameters
+    -nonSparseParameters $NonSparseParameters `
+    -skipEnvironmentVariables:$SkipEnvironmentVariables
 
 $serialized = SerializePipelineMatrix $matrix
 

eng/common/scripts/job-matrix/Create-JobMatrix.ps1

@@ -101,8 +101,8 @@ function GenerateMatrix(
 ) {
     $result = ProcessImport $config.matrixParameters $selectFromMatrixType $nonSparseParameters $config.displayNamesLookup
 
-    $matrixParameters          = $result.Matrix
-    $importedMatrix            = $result.ImportedMatrix
+    $matrixParameters = $result.Matrix
+    $importedMatrix = $result.ImportedMatrix
     $combinedDisplayNameLookup = $result.DisplayNamesLookup
 
     if ($selectFromMatrixType -eq "sparse") {
@@ -148,7 +148,7 @@ function ProcessNonSparseParameters(
     $nonSparse = [MatrixParameter[]]@()
 
     foreach ($param in $parameters) {
-        if ($null -eq $param){
+        if ($null -eq $param) {
             continue
         }
         if ($param.Name -in $nonSparseParameters) {
@@ -430,9 +430,9 @@ function ProcessImport([MatrixParameter[]]$matrix, [String]$selection, [Array]$n
     }
     if ((!$matrix -and !$importPath) -or !$importPath) {
         return [PSCustomObject]@{
-            Matrix                = $matrix
-            ImportedMatrix        = @()
-            DisplayNamesLookup    = $displayNamesLookup
+            Matrix             = $matrix
+            ImportedMatrix     = @()
+            DisplayNamesLookup = $displayNamesLookup
         }
     }
 
@@ -456,9 +456,9 @@ function ProcessImport([MatrixParameter[]]$matrix, [String]$selection, [Array]$n
     }
 
     return [PSCustomObject]@{
-        Matrix                = $matrix ?? @()
-        ImportedMatrix        = $importedMatrix
-        DisplayNamesLookup    = $combinedDisplayNameLookup
+        Matrix             = $matrix ?? @()
+        ImportedMatrix     = $importedMatrix
+        DisplayNamesLookup = $combinedDisplayNameLookup
     }
 }
 
@@ -643,7 +643,7 @@ function InitializeMatrix {
 function GetMatrixDimensions([MatrixParameter[]]$parameters) {
     $dimensions = @()
     foreach ($param in $parameters) {
-        if ($null -eq $param){
+        if ($null -eq $param) {
             continue
         }
         $dimensions += $param.Length()
@@ -760,12 +760,12 @@ function Get4dMatrixIndex([int]$index, [Array]$dimensions) {
 
 function GenerateMatrixForConfig {
     param (
-      [Parameter(Mandatory = $true)][string] $ConfigPath,
-      [Parameter(Mandatory = $true)][string] $Selection,
-      [Parameter(Mandatory = $false)][string] $DisplayNameFilter,
-      [Parameter(Mandatory = $false)][array] $Filters,
-      [Parameter(Mandatory = $false)][array] $Replace,
-      [Parameter(Mandatory = $false)][Array] $NonSparseParameters = @()
+        [Parameter(Mandatory = $true)][string] $ConfigPath,
+        [Parameter(Mandatory = $true)][string] $Selection,
+        [Parameter(Mandatory = $false)][string] $DisplayNameFilter,
+        [Parameter(Mandatory = $false)][array] $Filters,
+        [Parameter(Mandatory = $false)][array] $Replace,
+        [Parameter(Mandatory = $false)][Array] $NonSparseParameters = @()
     )
     $matrixFile = Join-Path $PSScriptRoot ".." ".." ".." ".." $ConfigPath
 
@@ -776,12 +776,12 @@ function GenerateMatrixForConfig {
     $Filters = $Filters | Where-Object { $_ }
 
     [array]$matrix = GenerateMatrix `
-      -config $config `
-      -selectFromMatrixType $Selection `
-      -displayNameFilter $DisplayNameFilter `
-      -filters $Filters `
-      -replace $Replace `
-      -nonSparseParameters $NonSparseParameters
+        -config $config `
+        -selectFromMatrixType $Selection `
+        -displayNameFilter $DisplayNameFilter `
+        -filters $Filters `
+        -replace $Replace `
+        -nonSparseParameters $NonSparseParameters
 
     return , $matrix
 }

eng/common/scripts/job-matrix/job-matrix-functions.ps1

@@ -48,7 +48,15 @@ function Login([string]$subscription, [string]$tenant, [string]$clusterGroup, [s
     Write-Host "Logging in to subscription, cluster and container registry"
     az account show -s "$subscription" *> $null
     if ($LASTEXITCODE) {
-        RunOrExitOnFailure az login --allow-no-subscriptions --tenant $tenant
+        Run az login --allow-no-subscriptions --tenant $tenant
+        if ($LASTEXITCODE) {
+            throw "You do not have access to the TME subscription. Follow these steps to join the group: https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/206/Subscription-and-Tenant-Usage?anchor=azure-sdk-test-resources-tme"
+        }
+    }
+
+    $subscriptions = (Run az account list -o json) | ConvertFrom-Json
+    if ($subscriptions.Length -eq 0) {
+        throw "You do not have access to the TME subscription. Follow these steps to join the group: https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/206/Subscription-and-Tenant-Usage?anchor=azure-sdk-test-resources-tme"
     }
 
     # Discover cluster name, only one cluster per group is expected

eng/common/scripts/stress-testing/stress-test-deployment-lib.ps1

@@ -32,37 +32,54 @@ steps:
       }
 
       Write-Host "Installing test-proxy version $version"
+      Write-Host "${{ parameters.templateRoot }}/eng/common/testproxy/install-test-proxy.ps1 -Version $version -InstallDirectory $(Build.BinariesDirectory)/test-proxy"
       ${{ parameters.templateRoot }}/eng/common/testproxy/install-test-proxy.ps1 -Version $version -InstallDirectory $(Build.BinariesDirectory)/test-proxy
     displayName: "Install test-proxy"
     condition: and(succeeded(), ${{ parameters.condition }})
 
   - pwsh: |
+      Write-Host "Prepending path with the test proxy tool install location: '$(Build.BinariesDirectory)/test-proxy'"
       Write-Host "##vso[task.prependpath]$(Build.BinariesDirectory)/test-proxy"
     displayName: "Prepend path with test-proxy tool install location"
 
   - ${{ if eq(parameters.runProxy, 'true') }}:
     - pwsh: |
+        Write-Host "Setting ASPNETCORE_Kestrel__Certificates__Default__Path to '${{ parameters.templateRoot }}/eng/common/testproxy/dotnet-devcert.pfx'"
         Write-Host "##vso[task.setvariable variable=ASPNETCORE_Kestrel__Certificates__Default__Path]${{ parameters.templateRoot }}/eng/common/testproxy/dotnet-devcert.pfx"
+        Write-Host "Setting ASPNETCORE_Kestrel__Certificates__Default__Password to 'password'"
         Write-Host "##vso[task.setvariable variable=ASPNETCORE_Kestrel__Certificates__Default__Password]password"
+        Write-Host "Setting PROXY_MANUAL_START to 'true'"
         Write-Host "##vso[task.setvariable variable=PROXY_MANUAL_START]true"
       displayName: 'Configure Kestrel and PROXY_MANUAL_START Variables'
       condition: and(succeeded(), ${{ parameters.condition }})
 
     - pwsh: |
+        $invocation = @"
+        Start-Process $(PROXY_EXE)
+          -ArgumentList `"start -u --storage-location ${{ parameters.rootFolder }}`"
+          -NoNewWindow -PassThru -RedirectStandardOutput ${{ parameters.rootFolder }}/test-proxy.log
+          -RedirectStandardError ${{ parameters.rootFolder }}/test-proxy-error.log
+        "@
+        Write-Host $invocation
+
         $Process = Start-Process $(PROXY_EXE) `
           -ArgumentList "start -u --storage-location ${{ parameters.rootFolder }}" `
           -NoNewWindow -PassThru -RedirectStandardOutput ${{ parameters.rootFolder }}/test-proxy.log `
           -RedirectStandardError ${{ parameters.rootFolder }}/test-proxy-error.log
 
+        Write-Host "Setting PROXY_PID to $($Process.Id)"
         Write-Host "##vso[task.setvariable variable=PROXY_PID]$($Process.Id)"
       displayName: 'Run the testproxy - windows'
       condition: and(succeeded(), eq(variables['Agent.OS'],'Windows_NT'), ${{ parameters.condition }})
 
     # nohup does NOT continue beyond the current session if you use it within powershell
     - bash: |
+        echo "nohup $(PROXY_EXE) 1>${{ parameters.rootFolder }}/test-proxy.log 2>${{ parameters.rootFolder }}/test-proxy-error.log &"
         nohup $(PROXY_EXE) 1>${{ parameters.rootFolder }}/test-proxy.log 2>${{ parameters.rootFolder }}/test-proxy-error.log &
 
         echo $! > $(Build.SourcesDirectory)/test-proxy.pid
+
+        echo "Setting PROXY_PID to $(cat $(Build.SourcesDirectory)/test-proxy.pid)"
         echo "##vso[task.setvariable variable=PROXY_PID]$(cat $(Build.SourcesDirectory)/test-proxy.pid)"
       displayName: "Run the testproxy - linux/mac"
       condition: and(succeeded(), ne(variables['Agent.OS'],'Windows_NT'), ${{ parameters.condition }})
@@ -71,7 +88,9 @@ steps:
     - pwsh: |
         for ($i = 0; $i -lt 10; $i++) {
             try {
+                Write-Host "Invoke-WebRequest -Uri `"http://localhost:5000/Admin/IsAlive`" | Out-Null"
                 Invoke-WebRequest -Uri "http://localhost:5000/Admin/IsAlive" | Out-Null
+                Write-Host "Successfully connected to the test proxy on port 5000."
                 exit 0
             } catch {
                 Write-Warning "Failed to successfully connect to test proxy. Retrying..."