Merge branch 'main' into copilot/update-lease-files-script

Author: tejaswiMinnu

eng/common/pipelines/templates/steps/create-pull-request.yml

@@ -1,5 +1,6 @@
-# Expects azuresdk-github-pat is set to the PAT for azure-sdk
-# Expects the buildtools to be cloned
+# Expects AuthToken to be a valid GitHub token.
+# Defaults to azuresdk-github-pat for backwards compatibility.
+# New callers should pass AuthToken: '' to auto-login via login-to-github.yml.
 
 parameters:
   BaseBranchName: $(Build.SourceBranch)
@@ -21,8 +22,19 @@ parameters:
   SkipCheckingForChanges: false
   CloseAfterOpenForTesting: false
   OpenAsDraft: false
+  AuthToken: $(azuresdk-github-pat)
+  # PushAuthToken: for cross-org pushes (pushing to PROwner's fork in a different org).
+  # Defaults to AuthToken when not specified.
+  PushAuthToken: ''
 
 steps:
+- ${{ if eq(parameters.AuthToken, '') }}:
+  - template: /eng/common/pipelines/templates/steps/login-to-github.yml
+    parameters:
+      TokenOwners:
+        - ${{ parameters.RepoOwner }}
+      ScriptDirectory: ${{ parameters.ScriptDirectory }}
+
 - template: /eng/common/pipelines/templates/steps/git-push-changes.yml
   parameters:
     BaseRepoBranch: ${{ parameters.PRBranchName }}
@@ -34,6 +46,7 @@ steps:
     WorkingDirectory: ${{ parameters.WorkingDirectory }}
     ScriptDirectory: ${{ parameters.ScriptDirectory }}
     SkipCheckingForChanges: ${{ parameters.SkipCheckingForChanges }}
+    AuthToken: ${{ coalesce(parameters.PushAuthToken, parameters.AuthToken, '$(GH_TOKEN)') }}
 
 - task: PowerShell@2
   displayName: Create pull request
@@ -48,7 +61,7 @@ steps:
       -BaseBranch "${{ parameters.BaseBranchName }}"
       -PROwner "${{ parameters.PROwner }}"
       -PRBranch "${{ parameters.PRBranchName }}"
-      -AuthToken "$(azuresdk-github-pat)"
+      -AuthToken "${{ coalesce(parameters.AuthToken, '$(GH_TOKEN)') }}"
       -PRTitle "${{ parameters.PRTitle }}"
       -PRBody "${{ coalesce(parameters.PRBody, parameters.CommitMsg, parameters.PRTitle) }}"
       -PRLabels "${{ parameters.PRLabels }}"

eng/common/pipelines/templates/steps/create-tags-and-git-release.yml

@@ -8,8 +8,16 @@ parameters:
   ScriptDirectory: eng/common/scripts
   NpmConfigUserConfig: ''
   NpmConfigRegistry: ''
+  AuthToken: $(azuresdk-github-pat)
 
 steps:
+- ${{ if eq(parameters.AuthToken, '') }}:
+  - template: /eng/common/pipelines/templates/steps/login-to-github.yml
+    parameters:
+      TokenOwners:
+        - ${{ split(parameters.RepoId, '/')[0] }}
+      ScriptDirectory: ${{ parameters.ScriptDirectory }}
+
 - task: PowerShell@2
   displayName: 'Verify Package Tags and Create Git Releases'
   inputs:
@@ -24,7 +32,7 @@ steps:
     pwsh: true
   timeoutInMinutes: 5
   env:
-    GH_TOKEN: $(azuresdk-github-pat)
+    GH_TOKEN: ${{ coalesce(parameters.AuthToken, '$(GH_TOKEN)') }}
     SYSTEM_ACCESSTOKEN: $(System.AccessToken)
     ${{ if ne(parameters.NpmConfigUserConfig, '') }}:
       npm_config_userconfig: ${{ parameters.NpmConfigUserConfig }}

eng/common/pipelines/templates/steps/git-push-changes.yml

@@ -5,11 +5,19 @@ parameters:
   TargetRepoOwner: Azure
   TargetRepoName: $(Build.Repository.Name)
   PushArgs:
-  WorkingDirectory: $(System.DefaultWorkingDirectory)'
+  WorkingDirectory: $(System.DefaultWorkingDirectory)
   ScriptDirectory: eng/common/scripts
   SkipCheckingForChanges: false
+  AuthToken: $(azuresdk-github-pat)
 
 steps:
+- ${{ if eq(parameters.AuthToken, '') }}:
+  - template: /eng/common/pipelines/templates/steps/login-to-github.yml
+    parameters:
+      TokenOwners:
+        - ${{ parameters.TargetRepoOwner }}
+      ScriptDirectory: ${{ parameters.ScriptDirectory }}
+
 - task: PowerShell@2
   displayName: Check for changes
   condition: and(succeeded(), eq(${{ parameters.SkipCheckingForChanges }}, false))
@@ -31,7 +39,7 @@ steps:
 - template: /eng/common/pipelines/templates/steps/emit-rate-limit-metrics.yml
   parameters:
     GitHubUser: azure-sdk
-    GitHubToken: $(azuresdk-github-pat)
+    GitHubToken: ${{ coalesce(parameters.AuthToken, '$(GH_TOKEN)') }}
 
 - task: PowerShell@2
   displayName: Push changes
@@ -43,6 +51,6 @@ steps:
     arguments: >
       -PRBranchName "${{ parameters.BaseRepoBranch }}"
       -CommitMsg "${{ parameters.CommitMsg }}"
-      -GitUrl "https://$(azuresdk-github-pat)@github.com/${{ parameters.BaseRepoOwner }}/$(RepoNameWithoutOwner).git"
+      -GitUrl "https://x-access-token:${{ coalesce(parameters.AuthToken, '$(GH_TOKEN)') }}@github.com/${{ parameters.BaseRepoOwner }}/$(RepoNameWithoutOwner).git"
       -PushArgs "${{ parameters.PushArgs }}"
       -SkipCommit $${{ parameters.SkipCheckingForChanges }}

specification/cdn/resource-manager/Microsoft.Cdn/Cdn/DeploymentVersion.tsp

@@ -17,6 +17,7 @@ namespace Microsoft.Cdn;
  * Deployment version object
  */
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 @parentResource(Profile)
 model DeploymentVersion
   is Azure.ResourceManager.ProxyResource<DeploymentVersionProperties> {
@@ -29,6 +30,7 @@ model DeploymentVersion
 }
 
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 @armResourceOperations
 interface DeploymentVersions {
   /**

specification/cdn/resource-manager/Microsoft.Cdn/Cdn/KeyGroup.tsp

@@ -17,6 +17,7 @@ namespace Microsoft.Cdn;
  * Contains a list of references of UrlSigningKey type secret objects.
  */
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 @parentResource(Profile)
 model KeyGroup is Azure.ResourceManager.ProxyResource<KeyGroupProperties> {
   ...ResourceNameParameter<
@@ -31,16 +32,19 @@ model KeyGroup is Azure.ResourceManager.ProxyResource<KeyGroupProperties> {
  * Defines a KeyGroup response body for long-running operations.
  */
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 model KeyGroupAcceptedBody {
   /**
    * Defines a KeyGroup response body
    */
   @bodyRoot
   @added(Versions.v2025_09_01_preview)
+  @removed(Versions.v2025_12_01)
   _: KeyGroup;
 }
 
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 @armResourceOperations
 interface KeyGroups {
   /**

specification/cdn/resource-manager/Microsoft.Cdn/Cdn/KnowledgeSource.tsp

@@ -17,6 +17,7 @@ namespace Microsoft.Cdn;
  * Defines a knowledge source resource for a web agent.
  */
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 @parentResource(WebAgent)
 model KnowledgeSource
   is Azure.ResourceManager.ProxyResource<KnowledgeSourceProperties> {
@@ -32,16 +33,19 @@ model KnowledgeSource
  * Defines a KnowledgeSource response body for long-running operation
  */
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 model KnowledgeSourceAcceptedBody {
   /**
    * Defines a KnowledgeSource response body
    */
   @bodyRoot
   @added(Versions.v2025_09_01_preview)
+  @removed(Versions.v2025_12_01)
   _: KnowledgeSource;
 }
 
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 @armResourceOperations
 interface KnowledgeSources {
   /**

specification/cdn/resource-manager/Microsoft.Cdn/Cdn/ProfileAgent.tsp

@@ -17,6 +17,7 @@ namespace Microsoft.Cdn;
  * An agent link (web agent association) within a CDN profile.
  */
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 @parentResource(Profile)
 model ProfileAgent
   is Azure.ResourceManager.ProxyResource<ProfileAgentProperties> {
@@ -32,16 +33,19 @@ model ProfileAgent
  * Defines a ProfileAgent response body for long-running operations.
  */
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 model ProfileAgentAcceptedBody {
   /**
    * Defines a ProfileAgent response body
    */
   @bodyRoot
   @added(Versions.v2025_09_01_preview)
+  @removed(Versions.v2025_12_01)
   _: ProfileAgent;
 }
 
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 @armResourceOperations
 interface ProfileAgents {
   /**

specification/cdn/resource-manager/Microsoft.Cdn/Cdn/RuleSet.tsp

@@ -2,13 +2,14 @@ import "@azure-tools/typespec-azure-core";
 import "@azure-tools/typespec-azure-resource-manager";
 import "@typespec/openapi";
 import "@typespec/rest";
+import "@typespec/versioning";
 import "./models.tsp";
 import "./Profile.tsp";
 
 using TypeSpec.Rest;
+using TypeSpec.Versioning;
 using Azure.ResourceManager;
 using TypeSpec.Http;
-using TypeSpec.OpenAPI;
 
 namespace Microsoft.Cdn;
 /**
@@ -35,14 +36,31 @@ interface RuleSets {
    * Creates a new rule set within the specified profile.
    */
   #suppress "@azure-tools/typespec-azure-resource-manager/arm-put-operation-response-codes" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  @removed(Versions.v2025_12_01)
+  @renamedFrom(Versions.v2025_12_01, "create")
+  @sharedRoute
   @put
-  create is Azure.ResourceManager.Legacy.CreateOrUpdateAsync<
+  createV1 is Azure.ResourceManager.Legacy.CreateOrUpdateAsync<
     RuleSet,
     void,
     Response = ArmResponse<RuleSet> | ArmCreatedResponse<RuleSet>,
     Error = ErrorResponse
   >;
 
+  /**
+   * Creates or update a batch rule set within the specified profile along with the rules associate to it.
+   */
+  @added(Versions.v2025_12_01)
+  @sharedRoute
+  @Azure.Core.useFinalStateVia("azure-async-operation")
+  create is Azure.ResourceManager.Legacy.CreateOrReplaceAsync<
+    RuleSet,
+    OptionalRequestBody = true,
+    Response = ArmResponse<RuleSet> | (ArmCreatedResponse<RuleSet> &
+      ArmAsyncOperationHeader<FinalResult = RuleSet> &
+      ArmLroLocationHeader<FinalResult = RuleSet>) | ErrorResponse
+  >;
+
   /**
    * Deletes an existing AzureFrontDoor rule set with the specified rule set name under the specified subscription, resource group and profile.
    */
@@ -79,3 +97,8 @@ interface RuleSets {
 @@doc(RuleSet.properties,
   "The JSON object that contains the properties of the Rule Set to create."
 );
+
+// Mark batch mode properties as added in version 2025-12-01
+@@added(RuleSetProperties.batchMode, Versions.v2025_12_01);
+@@added(RuleSetProperties.rules, Versions.v2025_12_01);
+@@added(BatchRuleProperties, Versions.v2025_12_01);

specification/cdn/resource-manager/Microsoft.Cdn/Cdn/WebAgent.tsp

@@ -16,6 +16,7 @@ namespace Microsoft.Cdn;
  * Defines a web agent resource for Azure CDN.
  */
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 model WebAgent is Azure.ResourceManager.TrackedResource<WebAgentProperties> {
   ...ResourceNameParameter<
     Resource = WebAgent,
@@ -29,16 +30,19 @@ model WebAgent is Azure.ResourceManager.TrackedResource<WebAgentProperties> {
  * Defines a WebAgent response body for long-running operations.
  */
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 model WebAgentAcceptedBody {
   /**
    * Defines a WebAgent response body
    */
   @bodyRoot
   @added(Versions.v2025_09_01_preview)
+  @removed(Versions.v2025_12_01)
   _: WebAgent;
 }
 
 @added(Versions.v2025_09_01_preview)
+@removed(Versions.v2025_12_01)
 @armResourceOperations
 interface WebAgents {
   /**