Sync upstream/dev

.azure-pipelines/templates/automation_test.yml

@@ -3,10 +3,18 @@
 parameters:
 - name: pythonVersion
   type: string
-  default: 3.8
+  default: 3.10
 - name: profile
   type: string
   default: latest
+- name: instance_cnt
+  type: string
+  default: '1'
+- name: instance_idx
+  type: string
+  default: '1'
+  # instance_cnt = 8, instance_idx = 3: means we have 8 instances totally, and now we are scheduling modules on third instance
+  # instance_cnt = 1, instance_idx = 1: means we only have 1 instance, so we don't need to schedule modules
 - name: fullTest
   displayName: Run full test?
   type: boolean
@@ -32,21 +40,31 @@ steps:
       echo fullTest: ${{ parameters.fullTest }}
       echo module: ${{ parameters.module }}
       echo Build.Reason: $(Build.Reason)
+      serial_modules="appservice botservice cloud network azure-cli-core azure-cli-telemetry"
 
       # Test specific module
       module="${{ parameters.module }}"
       if [[ -n $module ]]; then
         echo "Running test for module '$module'"
-        azdev test --no-exitfirst --verbose --series $module
+        # Determine whether the module belongs to serial_modules
+        if [[ "$serial_modules" =~ "$module" ]]; then
+          echo "Running in series"
+          azdev test --no-exitfirst --verbose --series $module --pytest-args "--durations=10"
+        else
+          echo "Running in parallels"
+          azdev test --no-exitfirst --verbose $module --pytest-args "--durations=10"
+        fi
         exit 0
       fi
 
       if [[ "$(Build.Reason)" == "PullRequest" && "${{ parameters.fullTest }}" == 'False' ]]; then
         echo "Running incremental test"
-        azdev test --no-exitfirst --repo=./ --src=HEAD --tgt=origin/$(System.PullRequest.TargetBranch) --cli-ci --profile ${{ parameters.profile }} --verbose --series
+        # If CI is set to shallow fetch, target branch should be expilictly fetched.
+        git fetch origin --depth=1 $(System.PullRequest.TargetBranch)
+        azdev test --no-exitfirst --repo=./ --src=HEAD --tgt=origin/$(System.PullRequest.TargetBranch) --cli-ci --profile ${{ parameters.profile }} --verbose --series --pytest-args "--durations=10"
       else
         echo "Running full test"
-        azdev test --no-exitfirst --profile ${{ parameters.profile }} --verbose --series
+        python scripts/ci/automation_full_test.py "${{ parameters.instance_cnt }}" "${{ parameters.instance_idx }}" "${{ parameters.profile }}" "$serial_modules"
       fi
     displayName: "azdev test"
     env:

.github/CODEOWNERS

@@ -4,9 +4,9 @@
 *help.yaml @kairu-ms @jiasli @jsntcy
 *help.yml @kairu-ms @jiasli @jsntcy
 
-/linter_exclusions.yml @jsntcy @kairu-ms
+/linter_exclusions.yml @jsntcy @kairu-ms @zhoxing-ms
 
-/doc/ @jiasli @kairu-ms @jsntcy @dbradish-microsoft
+/doc/ @jiasli @kairu-ms @jsntcy
 /tools/ @kairu-ms @jiasli @wangzelin007 @calvinhzy
 /scripts/ @kairu-ms @jiasli @wangzelin007 @calvinhzy
 /scripts/live_test @kairu-ms @wangzelin007
@@ -24,10 +24,12 @@
 /src/azure-cli/azure/cli/command_modules/apim/ @kevinhillinger @jonlester
 /src/azure-cli/azure/cli/command_modules/appconfig/ @shenmuxiaosen @avanigupta @zhoxing-ms @jsntcy
 /src/azure-cli/azure/cli/command_modules/appservice/ @panchagnula @jsntcy @zhoxing-ms
-/src/azure-cli/azure/cli/command_modules/aro/ @bennerv @hawkowl @jewzaam @m1kola @mwoodson @rogbas
+/src/azure-cli/azure/cli/command_modules/aro/ @bennerv @hawkowl @jewzaam @m1kola @rogbas
 /src/azure-cli/azure/cli/command_modules/backup/ @dragonfly91 @zhoxing-ms @akshayneema @jsntcy
 /src/azure-cli/azure/cli/command_modules/batch/ @bgklein @gingi @dpwatrous @paterasMSFT @zhoxing-ms @jsntcy
 /src/azure-cli/azure/cli/command_modules/batchai/ @AlexanderYukhanov
+/src/azure-cli/azure/cli/command_modules/botservice/ @jiaxuwu2021 @luhan2017
+/src/azure-cli/azure/cli/command_modules/cdn/ @jsntcy @kairu-ms @wangzelin007 @necusjz @t-bzhan
 /src/azure-cli/azure/cli/command_modules/cloud/ @jiasli @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/consumption/ @sandeepnl
 /src/azure-cli/azure/cli/command_modules/container/ @joseph-porter
@@ -44,10 +46,10 @@
 /src/azure-cli/azure/cli/command_modules/iot/ @digimaun @zhoxing-ms
 /src/azure-cli/azure/cli/command_modules/keyvault/ @evelyn-ys @jiasli @calvinhzy
 /src/azure-cli/azure/cli/command_modules/monitor/ @jsntcy @kairu-ms
-/src/azure-cli/azure/cli/command_modules/natgateway/ @khannarheams @jsntcy @kairu-ms
-/src/azure-cli/azure/cli/command_modules/network/ @jsntcy @kairu-ms @wangzelin007
+/src/azure-cli/azure/cli/command_modules/natgateway/ @khannarheams @jsntcy @kairu-ms @necusjz
+/src/azure-cli/azure/cli/command_modules/network/ @jsntcy @kairu-ms @wangzelin007 @necusjz
 /src/azure-cli/azure/cli/command_modules/policyinsights/ @cheggert
-/src/azure-cli/azure/cli/command_modules/privatedns/ @jsntcy @kairu-ms
+/src/azure-cli/azure/cli/command_modules/privatedns/ @jsntcy @kairu-ms @necusjz
 /src/azure-cli/azure/cli/command_modules/profile/ @jiasli @evelyn-ys @calvinhzy
 /src/azure-cli/azure/cli/command_modules/rdbms/ @arde0708 @evelyn-ys @DaeunYim @calvinhzy
 /src/azure-cli/azure/cli/command_modules/resource/ @zhoxing-ms @jsntcy

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -9,6 +9,9 @@ assignees: ''
 
 > ### `az feedback` auto-generates most of the information requested below, as of CLI version 2.0.62
 
+**Related command**
+<!--- Please provide the related command with az {command} if you can, so that we can quickly route to the related team for help. --->
+
 **Describe the bug**
 <!--- A clear and concise description of what the bug is. --->
 

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -7,6 +7,9 @@ assignees: ''
 
 ---
 
+**Related command**
+<!--- Please provide the related command with az {command} if you can, so that we can quickly route to the related team for help. --->
+
 **Is your feature request related to a problem? Please describe.**
 <!--- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] --->
 

.github/ISSUE_TEMPLATE/Service_team_request.yaml

@@ -0,0 +1,75 @@
+name: "[Microsoft Internal / Service Team] Feature Request"
+description: Use this template to create a feature request for microsoft internal or service team
+body:
+  - type: markdown
+    id: example
+    attributes:
+      value: |
+        [How to Request a Feature in CLI](https://github.com/Azure/azure-cli/blob/dev/doc/how_to_request_a_feature_in_cli.md)
+        [A Great Example](https://github.com/Azure/azure-cli/issues/22275)
+  - type: textarea
+    id: command
+    attributes:
+      label: Related command
+      description: Please provide the related commands and parameters with az {command} if you can, so that we can quickly route to the related team for help.
+      placeholder: e.g., `az vm create --image`
+    validations:
+      required: false
+  - type: input
+    id: provider
+    attributes:
+      label: Resource Provider
+      description: What is the Azure resource provider your feature is part of?
+      placeholder: e.g., Microsoft.Compute/disks
+    validations:
+      required: true
+  - type: textarea
+    id: feature-desc
+    attributes:
+      label: Description of Feature or Work Requested
+      description: Provide a brief description of the feature or problem. A link to conceptual documentation may be helpful too.
+      placeholder:
+      value:
+    validations:
+      required: true
+  - type: input
+    id: mini-api
+    attributes:
+      label: Minimum API Version Required
+      description: What is the minimum API version of your service required to implement your feature?
+      placeholder: e.g., 2021-04-01
+    validations:
+      required: true
+  - type: textarea
+    id: swagger
+    attributes:
+      label: Swagger PR link
+      description: Provide a link to the location of your feature(s) in the REST API specs repo. If your feature(s) has corresponding commit or pull request in the REST API specs repo, provide them. This should be on the master branch of the REST API specs repo.
+      placeholder: e.g., https://github.com/Azure/azure-rest-api-specs/pull/16629
+    validations:
+      required: true
+  - type: textarea
+    id: request-example
+    attributes:
+      label: Request Example
+      description: Provide example files which include the request body and response body of REST service.
+      placeholder: e.g., https://github.com/Azure/azure-rest-api-specs/blob/main/specification/compute/resource-manager/Microsoft.Compute/stable/2022-03-01/ComputeRP/examples/virtualMachineExamples/VirtualMachine_Create_CustomImageVmFromAnUnmanagedGeneralizedOsImage.json
+    validations:
+      required: false
+  - type: input
+    id: date
+    attributes:
+      label: Target Date
+      description: If you have a target date for release of this feature/work, please provide it. While we can't guarantee these dates, it will help us prioritize your request against other requests.
+      placeholder: e.g., 2022-07-05
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other context about the feature.
+      placeholder:
+      value:
+    validations:
+      required: false

.github/pull_request_template.md

@@ -1,3 +1,6 @@
+**Related command**
+<!--- Please provide the related command with az {command} if you can, so that we can quickly route to the related person to review. --->
+
 **Description**<!--Mandatory-->
 <!--Why this PR? What is changed? What is the effect? etc. A high-quality description can accelerate the review process.-->
 

Dockerfile

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 #---------------------------------------------------------------------------------------------
 
-ARG PYTHON_VERSION="3.10.2"
+ARG PYTHON_VERSION="3.10.4"
 
 FROM python:${PYTHON_VERSION}-alpine3.15
 

NOTICE.txt

@@ -1185,7 +1185,7 @@ BSD-2-Clause AND BSD-3-Clause
 
 ---------------------------------------------------------
 
-Jinja2 2.11.3 - BSD-2-Clause AND BSD-3-Clause
+Jinja2 3.0.3 - BSD-2-Clause AND BSD-3-Clause
 
 
 Copyright 2007 Pallets

README.md

@@ -149,13 +149,17 @@ If you want to get the latest build from the `dev` branch, you can use our "edge
 
 You can download the latest builds by following the links below:
 
-| Package  | Link                                       |
-| :-------: | :----------------------------------------- |
-| MSI   | https://aka.ms/InstallAzureCliWindowsEdge  |
-| Homebrew Formula | https://aka.ms/InstallAzureCliHomebrewEdge |
-| Ubuntu Xenial Deb | https://aka.ms/InstallAzureCliXenialEdge |
-| Ubuntu Bionic Deb | https://aka.ms/InstallAzureCliBionicEdge |
-| RPM | https://aka.ms/InstallAzureCliRpmEdge |
+|      Package      | Link                                       |
+|:-----------------:|:-------------------------------------------|
+|        MSI        | https://aka.ms/InstallAzureCliWindowsEdge  |
+| Homebrew Formula  | https://aka.ms/InstallAzureCliHomebrewEdge |
+| Ubuntu Xenial Deb | https://aka.ms/InstallAzureCliXenialEdge   |
+| Ubuntu Bionic Deb | https://aka.ms/InstallAzureCliBionicEdge   |
+| Ubuntu Focal Deb  | https://aka.ms/InstallAzureCliFocalEdge    |
+| Ubuntu Impish Deb | https://aka.ms/InstallAzureCliImpishEdge   |
+| Ubuntu Jammy Deb  | https://aka.ms/InstallAzureCliJammyEdge    |
+|      RPM el7      | https://aka.ms/InstallAzureCliRpmEdge      |
+|      RPM el8      | https://aka.ms/InstallAzureCliRpmEl8Edge   |
 
 You can easily install the latest Homebrew edge build with the following command:
 

SECURITY.md

@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.7 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [[email protected]](mailto:[email protected]).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->