Rhurey/ia merge latest main

.github/workflows/comment.yml

@@ -16,26 +16,51 @@ jobs:
       - name: Process comment
         shell: pwsh
         run: |
-          $payload = echo $env:PAYLOAD | ConvertFrom-Json -AsHashtable
+          $payload = Write-Output $env:PAYLOAD | ConvertFrom-Json -AsHashtable
           if (!$payload.comment -or !$payload.comment.body) {
-            Write-Host "Empty comment, returning..."
+            Write-Host "Skipping: empty comment."
             return
           }
           $body = $payload.comment.body.Trim().ToLowerInvariant()
           $expected = '/pr requestmerge'
           if ($body -ne $expected) {
-            Write-Host "Comment did not equal '$expected', skipping..."
+            Write-Host "Skipping: comment did not equal '$expected'."
             return
           }
           $label = 'MergeRequested'
-          Write-Host "gh pr edit $($payload.issue.number) --add-label `"$label`""
-          gh pr edit $payload.issue.html_url --add-label "$label"
-          if ($LASTEXITCODE) {
-            Write-Warning "Failed to add label"
-            exit $LASTEXITCODE
+
+          $retryCount = 0
+          $maxRetries = 5
+          $retryDelay = 5 # Initial retry delay in seconds
+
+          while ($retryCount -lt $maxRetries) {
+
+            Write-Host "Attempt $($retryCount+1) out of $($maxRetries): gh pr edit $($payload.issue.number) --add-label `"$label`""
+            gh pr edit $payload.issue.html_url --add-label "$label"
+
+            if ($LASTEXITCODE -eq 0) {
+              Write-Host "Label added successfully on attempt $($retryCount+1) out of $($maxRetries)."
+              break
+            } else {
+              Write-Warning "Failed to add label on attempt $($retryCount+1) out of $($maxRetries)."
+              $retryCount++
+              if ($retryCount -lt $maxRetries) {
+                # $retryDelay = 5 exponential backoff in seconds:
+                # attempt 2:  5 =  1*5
+                # attempt 3: 10 =  2*5
+                # attempt 4: 20 =  4*5
+                # attempt 5: 40 =  8*5
+                Write-Host "Sleeping for $retryDelay seconds..."
+                Start-Sleep -Seconds $retryDelay
+                $retryDelay = $retryDelay * 2
+              }
+            }
+          }
+
+          if ($retryCount -ge $maxRetries) {
+            Write-Error "Max retry attempts of $maxRetries exhausted. Exiting with error ('exit 1')."
+            exit 1
           }
         env:
           PAYLOAD: ${{ toJson(github.event) }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-

CODEOWNERS

@@ -50,7 +50,7 @@
 /specification/azsadmin/ @deathly809
 
 # PRLabel: %Batch
-/specification/batch/ @jingjlii @paterasMSFT @dpwatrous
+/specification/batch/ @wiboris @dpwatrous @skapur12 @cRui861 @wanghoppe
 
 # PRLabel: %BatchAI
 /specification/batchai/ @alexanderyukhanov
@@ -204,10 +204,10 @@
 /specification/scheduler/ @pinwang81
 
 # PRLabel: %Search
-/specification/search/data-plane/ @arv100kri @bleroy @AlexGhiondea @Mohit-Chakraborty @Azure/api-stewardship-board
+/specification/search/data-plane/ @arv100kri @bleroy @Azure/api-stewardship-board @BevLoh @giulianob
 
 # PRLabel: %Search
-/specification/search/resource-manager/ @abhi1509 @tjacobhi
+/specification/search/resource-manager/ @tjacobhi @conor-joplin @BevLoh
 
 /specification/serialconsole/ @amitchat @craigw @asinn826
 

custom-words.txt

@@ -167,6 +167,7 @@ appendpos
 appfigures
 appid
 appinsights
+Applicationkey
 applynetworkconfigurationupdates
 appservice
 appsettings
@@ -848,6 +849,7 @@ endoftext
 endpointkeys
 endpointname
 endswith
+Entra
 endtime
 enein
 engagementfabric
@@ -1344,6 +1346,7 @@ keyspaces
 keystore
 keytab
 keyvault
+keyvaultkeyuri
 keyvaultproperties
 keyvaulturi
 keyversion
@@ -2936,6 +2939,7 @@ vcores
 vcpu
 vcpus
 vcsa
+vectorizable
 vectorize
 vectorizer
 verifyx
@@ -3739,4 +3743,5 @@ vnetblock
 usedCPUMHz
 totalCPUMHz
 docon
-DialOut
+DialOut
+vectorizers

eng/pipelines/typespec-validation-all.yml

@@ -17,6 +17,7 @@ pr:
     - package.json
     - tsconfig.json
     - eng
+    - specification/common-types
 
 jobs:
 - job: Validate_All_Specs

eng/scripts/Get-TypeSpec-Folders.ps1

@@ -31,6 +31,8 @@ else {
 
   $engFiles = $changedFiles | Where-Object {if ($_) { $_.StartsWith('eng') }}
 
+  $commonTypesFiles = $changedFiles | Where-Object {if ($_) { $_.StartsWith('specification/common-types') }}
+
   $rootFilesImpactingTypeSpec = @(
     ".gitattributes",
     ".prettierrc.json",
@@ -40,7 +42,7 @@ else {
   )
   $repoRootFiles = $changedFiles | Where-Object {$_ -in $rootFilesImpactingTypeSpec}
 
-  if (($Env:BUILD_REPOSITORY_NAME -eq 'azure/azure-rest-api-specs') -and ($engFiles -or $repoRootFiles)) {
+  if (($Env:BUILD_REPOSITORY_NAME -eq 'azure/azure-rest-api-specs') -and ($engFiles -or $commonTypesFiles -or $repoRootFiles)) {
     $changedFiles = $allChangedFiles
   }
   else {
@@ -49,13 +51,22 @@ else {
 }
 
 $typespecFolders = @()
+$skippedTypespecFolders = @()
 foreach ($file in $changedFiles) {
   if ($file -match 'specification\/[^\/]*\/') {
-    $typespecFolder = (Get-ChildItem -path $matches[0] tspconfig.* -Recurse).Directory.FullName | ForEach-Object {if ($_) { [IO.Path]::GetRelativePath($($pwd.path), $_) }}
-    $typespecFolders += $typespecFolder -replace '\\', '/'
+    if (Test-Path $matches[0]) {
+      $typespecFolder = (Get-ChildItem -path $matches[0] tspconfig.* -Recurse).Directory.FullName | ForEach-Object {if ($_) { [IO.Path]::GetRelativePath($($pwd.path), $_) }}
+      $typespecFolders += $typespecFolder -replace '\\', '/'
+    } else {
+      $skippedTypespecFolders += $matches[0]
+    }
   }
 }
 
+foreach ($skippedTypespecFolder in $skippedTypespecFolders | Select-Object -Unique) {
+  Write-Host "Cannot find directory $skippedTypespecFolder"
+}
+
 $typespecFolders = $typespecFolders | Select-Object -Unique | Sort-Object
 
 return $typespecFolders

eng/tools/TypeSpecValidation/src/rules/folder-structure.ts

@@ -1,6 +1,8 @@
 import { globby } from "globby";
+import path from "path";
 import { Rule } from "../rule.js";
 import { RuleResult } from "../rule-result.js";
+import { checkFileExists } from "../utils.js";
 
 export class FolderStructureRule implements Rule {
   readonly name = "FolderStructure";
@@ -18,6 +20,57 @@ export class FolderStructureRule implements Rule {
       }
     });
 
+    // Verify top level folder is lower case
+    let folderStruct = folder.split("/");
+    if (folderStruct[1].match(/[A-Z]/g)) {
+      success = false;
+      errorOutput += `Invalid folder name. Folders under specification/ must be lower case.\n`;
+    }
+
+    let packageFolder = folderStruct[folderStruct.length - 1];
+
+    // Verify package folder is at most 3 levels deep
+    if (folderStruct.length > 4) {
+      success = false;
+      errorOutput += `Please limit TypeSpec folder depth to 3 levels or less`;
+    }
+
+    // Verify second level folder is capitalized after each '.'
+    if (
+      /(^|\. *)([a-z])/g.test(packageFolder) &&
+      !["data-plane", "resource-manager"].includes(packageFolder)
+    ) {
+      success = false;
+      errorOutput += `Invalid folder name. Folders under specification/${folderStruct[1]} must be capitalized after each '.'\n`;
+    }
+
+    // Verify 'Shared' follows 'Management'
+    if (packageFolder.includes("Management") && packageFolder.includes("Shared")) {
+      if (!packageFolder.includes("Management.Shared")) {
+        success = false;
+        errorOutput += `Invalid folder name. For management libraries with a shared component, 'Shared' should follow 'Management'.`;
+      }
+    }
+
+    // Verify tspconfig, main.tsp, examples/
+    let containsMinStruct =
+      (await checkFileExists(path.join(folder, "main.tsp"))) ||
+      (await checkFileExists(path.join(folder, "client.tsp")));
+
+    if (await checkFileExists(path.join(folder, "main.tsp"))) {
+      containsMinStruct =
+        containsMinStruct && (await checkFileExists(path.join(folder, "examples")));
+    }
+
+    if (!packageFolder.includes("Shared")) {
+      containsMinStruct =
+        containsMinStruct && (await checkFileExists(path.join(folder, "tspconfig.yaml")));
+    }
+    if (!containsMinStruct) {
+      success = false;
+      errorOutput += `Invalid folder structure. Package must contain main.tsp or client.tsp, tspconfig.yaml, and examples folder if there's main.tsp.`;
+    }
+
     return {
       success: success,
       stdOutput: stdOutput,