Merge branch 'main' into main

.github/CODEOWNERS

@@ -37,7 +37,7 @@
 /specification/applicationinsights/data-plane/Monitor.Exporters/ @ramthi @trask @hectorhdzg @lzchen @Azure/api-stewardship-board
 
 # PRLabel: %Container Apps
-/specification/app/ @jijohn14 @Juliehzl
+/specification/app/ @Juliehzl
 
 # PRLabel: %Code Signing
 /specification/codesigning/data-plane @Azure/api-stewardship-board
@@ -62,7 +62,7 @@
 /specification/billing/ @wilcobmsft @asarkar84
 
 # PRLabel: %Network - CDN
-/specification/cdn/ @jorinmejia @yunhemsft @jessicl-ms @rrahulms @t-bzhan @ChenglongLiu
+/specification/cdn/ @jorinmejia @yunhemsft @jessicl-ms @rrahulms @ChenglongLiu @Ptnan7
 
 # PRLabel: %Cognitive Services
 /specification/cognitiveservices/ @felixwa @yangyuan
@@ -275,13 +275,13 @@
 ###########
 # Eng Sys
 ###########
-/.gitattributes     @weshaggard @mikeharder @konrad-jamrozik
-/.gitignore         @weshaggard @mikeharder @konrad-jamrozik
-/.prettierrc.json   @weshaggard @mikeharder @konrad-jamrozik
-/package-lock.json  @weshaggard @mikeharder @konrad-jamrozik
-/package.json       @weshaggard @mikeharder @konrad-jamrozik
-/tsconfig.json      @weshaggard @mikeharder @konrad-jamrozik
-/.azure-pipelines/  @weshaggard @mikeharder @konrad-jamrozik @benbp
-/.github/           @weshaggard @mikeharder @konrad-jamrozik @benbp
-/eng/               @weshaggard @mikeharder @konrad-jamrozik @benbp
-/scripts/           @weshaggard @mikeharder @konrad-jamrozik
+/.gitattributes     @weshaggard @mikeharder 
+/.gitignore         @weshaggard @mikeharder 
+/.prettierrc.json   @weshaggard @mikeharder 
+/package-lock.json  @weshaggard @mikeharder 
+/package.json       @weshaggard @mikeharder 
+/tsconfig.json      @weshaggard @mikeharder 
+/.azure-pipelines/  @weshaggard @mikeharder @benbp
+/.github/           @weshaggard @mikeharder @benbp
+/eng/               @weshaggard @mikeharder @benbp
+/scripts/           @weshaggard @mikeharder 

.github/policies/resourceManagement.yml

@@ -2530,18 +2530,6 @@ configuration:
       - removeLabel:
           label: no-recent-activity
       description: 
-    - if:
-      - payloadType: Issue_Comment
-      - and:
-        - isPullRequest
-      then:
-      - if:
-        - commentContains:
-            pattern: "^/pr RequestMerge$"
-            isRegex: true
-        then:
-        - addLabel:
-            label: MergeRequested
     - if:
       - payloadType: Pull_Request
       then:

.github/workflows/tsp-client-test.yaml

@@ -15,7 +15,8 @@ on:
       - .github/workflows/tsp-client-test.yaml
       - eng/tools/package.json
       - eng/tools/tsconfig.json
-      - eng/tools/tsp-client/**
+      - eng/tools/tsp-client-tests/**
+      - specification/common-types
       - specification/keyvault
       - specification/sphere
 

.github/workflows/typespec-requirement.yaml

@@ -23,8 +23,6 @@ jobs:
         with:
           node-version: 20.0
 
-      - run: npm --version --loglevel info
-
       - run: npm ci
 
       - run: npm ls -a

.gitignore

@@ -131,3 +131,15 @@ eng/tools/**/dist
 # No package-lock.json files should be commited except the top-level.
 **/package-lock.json
 !/package-lock.json
+
+# No Armstrong outputs should be commited except the tf files.
+**/terraform/**/*.json
+**/terraform/**/*.md
+**/terraform/**/*.html
+**/terraform/**/*.txt
+**/terraform/**/*.hcl
+**/terraform/**/*.tfstate
+**/terraform/**/*.backup
+**/terraform/**/tfplan
+**/terraform/**/.terraform
+!**/terraform/**/*.tf

cSpell.json

@@ -201,7 +201,8 @@
                 "aksadvancednetworking",
                 "PDBs",
                 "undrainable",
-                "Undrainable"
+                "Undrainable",
+                "acnstls"
             ]
         },
         {
@@ -1023,6 +1024,12 @@
                 "Messsage"
             ]
         },
+        {
+            "filename": "**/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/**/*json",
+            "words": [
+                "automigration"
+            ]
+        },
         {
             "filename": "**/specification/cognitiveservices/data-plane/FormRecognizer/**/FormRecognizer.json",
             "words": [
@@ -1114,7 +1121,12 @@
                 "Groundedness",
                 "AOAI",
                 "testconnection",
-                "aoai"
+                "aoai",
+                "SecretExpiry",
+                "expirableSecret",
+                "expireAfterHours",
+                "expire",
+                "expirable"
             ]
         },
         {
@@ -1201,7 +1213,9 @@
                 "discretizing",
                 "subscores",
                 "vectorizing",
-                "onelake"
+                "onelake",
+                "tiktoken",
+                "Matryoshka"
             ]
         },
         {
@@ -1377,6 +1391,16 @@
             "words": [
                 "systemversionname"
             ]
+        },
+        {
+            "filename": "**/specification/iotoperations/resource-manager/Microsoft.IoTOperations/**/*.json",
+            "words": [
+                "akri",
+                "opcua",
+                "websockets",
+                "opentelemetry",
+                "parquet"
+            ]
         }
     ],
     "enableFiletypes": [
@@ -1385,4 +1409,5 @@
     "ignoreWords": [
         "trafficcontrollerspec"
     ]
+
 }