Merge remote-tracking branch 'azure/dev' into Aladdin-src

.azure-pipelines/templates/azdev_setup.yml

@@ -13,7 +13,7 @@ steps:
       chmod +x env/bin/activate
       . env/bin/activate
       python -m pip install -U pip
-      pip install azdev==0.1.32
+      pip install azdev
       azdev --version
 
       if [ -z "$CLI_EXT_REPO_PATH" ]; then

.github/CODEOWNERS

@@ -1,60 +1,60 @@
 # See for instructions on this file https://help.github.com/articles/about-codeowners/
 
-*help.py @msyyc @jiasli @jsntcy
-*help.yaml @msyyc @jiasli @jsntcy
-*help.yml @msyyc @jiasli @jsntcy
+*help.py @kairu-ms @jiasli @jsntcy
+*help.yaml @kairu-ms @jiasli @jsntcy
+*help.yml @kairu-ms @jiasli @jsntcy
 
 /linter_exclusions.yml @jsntcy @kairu-ms
 
-/doc/ @jiasli @qwordy @dbradish-microsoft
-/tools/ @fengzhou-msft @jiasli
-/scripts/ @fengzhou-msft @jiasli
-/scripts/live_test @qwordy
-/src/azure-cli-testsdk/ @jsntcy @jiasli @kairu-ms @qwordy
-/src/azure-cli-core/ @jiasli @Juliehzl @fengzhou-msft @evelyn-ys @jsntcy @houk-ms @kairu-ms
-/src/azure-cli-core/azure/cli/core/extension/ @msyyc @fengzhou-msft
+/doc/ @jiasli @kairu-ms @jsntcy @dbradish-microsoft
+/tools/ @kairu-ms @jiasli
+/scripts/ @kairu-ms @jiasli
+/scripts/live_test @Juliehzl @kairu-ms
+/src/azure-cli-testsdk/ @jsntcy @jiasli @kairu-ms
+/src/azure-cli-core/ @jiasli @Juliehzl @evelyn-ys @jsntcy @kairu-ms
+/src/azure-cli-core/azure/cli/core/extension/ @jsntcy @kairu-ms
 /src/azure-cli-core/azure/cli/core/_profile.py @jiasli @evelyn-ys
 /src/azure-cli-core/azure/cli/core/adal_authentication.py @jiasli @evelyn-ys
 /src/azure-cli-core/azure/cli/core/msal_authentication.py @jiasli @evelyn-ys
 /src/azure-cli-core/azure/cli/core/style.py @jiasli @evelyn-ys @zhoxing-ms
-/src/azure-cli/azure/cli/command_modules/acr/ @fengzhou-msft @yungezz @northtyphoon @rosanch
-/src/azure-cli/azure/cli/command_modules/acs/ @fengzhou-msft @zqingqing1 @gtracer @xizhamsft @andyliuliming
+/src/azure-cli/azure/cli/command_modules/acr/ @Juliehzl @zhoxing-ms @northtyphoon @rosanch
+/src/azure-cli/azure/cli/command_modules/acs/ @Juliehzl @zhoxing-ms @zqingqing1 @gtracer @xizhamsft @andyliuliming @fumingzhang
 /src/azure-cli/azure/cli/command_modules/advisor/ @Prasanna-Padmanabhan
 /src/azure-cli/azure/cli/command_modules/apim/ @kevinhillinger @jonlester
-/src/azure-cli/azure/cli/command_modules/appconfig/ @shenmuxiaosen @avanigupta @qwordy @zhoxing-ms
+/src/azure-cli/azure/cli/command_modules/appconfig/ @shenmuxiaosen @avanigupta @Juliehzl @zhoxing-ms
 /src/azure-cli/azure/cli/command_modules/appservice/ @Juliehzl @panchagnula
 /src/azure-cli/azure/cli/command_modules/aro/ @mjudeikis @jim-minter
-/src/azure-cli/azure/cli/command_modules/backup/ @dragonfly91 @fengzhou-msft @qwordy @akshayneema
-/src/azure-cli/azure/cli/command_modules/batch/ @bgklein @gingi @dpwatrous @paterasMSFT @qwordy @zhoxing-ms
+/src/azure-cli/azure/cli/command_modules/backup/ @dragonfly91 @Juliehzl @zhoxing-ms @akshayneema
+/src/azure-cli/azure/cli/command_modules/batch/ @bgklein @gingi @dpwatrous @paterasMSFT @Juliehzl @zhoxing-ms
 /src/azure-cli/azure/cli/command_modules/batchai/ @AlexanderYukhanov
-/src/azure-cli/azure/cli/command_modules/cloud/ @jiasli @fengzhou-msft @Juliehzl
+/src/azure-cli/azure/cli/command_modules/cloud/ @jiasli @Juliehzl
 /src/azure-cli/azure/cli/command_modules/consumption/ @sandeepnl
-/src/azure-cli/azure/cli/command_modules/container/ @zhoxing-ms @fengzhou-msft
-/src/azure-cli/azure/cli/command_modules/cosmosdb/ @dmakwana @kristynhamasaki @Juliehzl
+/src/azure-cli/azure/cli/command_modules/container/ @Juliehzl @zhoxing-ms
+/src/azure-cli/azure/cli/command_modules/cosmosdb/ @dmakwana @kristynhamasaki @Juliehzl @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/databoxedge/ @evelyn-ys @Juliehzl
 /src/azure-cli/azure/cli/command_modules/dls/ @akharit @rahuldutta90 @Juliehzl @jsntcy
 /src/azure-cli/azure/cli/command_modules/dms/ @temandr @binuj
 /src/azure-cli/azure/cli/command_modules/eventhubs/ @v-ajnava
 /src/azure-cli/azure/cli/command_modules/eventgrid/ @Juliehzl @evelyn-ys @VidyaKukke
-/src/azure-cli/azure/cli/command_modules/extension/ @fengzhou-msft @msyyc
-/src/azure-cli/azure/cli/command_modules/feedback/ @fengzhou-msft @jiasli
+/src/azure-cli/azure/cli/command_modules/extension/ @jsntcy @kairu-ms
+/src/azure-cli/azure/cli/command_modules/feedback/ @jiasli @kairu-ms
 /src/azure-cli/azure/cli/command_modules/hdinsight/ @aim-for-better @Juliehzl @kairu-ms
-/src/azure-cli/azure/cli/command_modules/iot/ @digimaun
-/src/azure-cli/azure/cli/command_modules/keyvault/ @fengzhou-msft @yungezz @houk-ms
-/src/azure-cli/azure/cli/command_modules/monitor/ @msyyc @jsntcy @kairu-ms
-/src/azure-cli/azure/cli/command_modules/natgateway/ @khannarheams @jsntcy @kairu-ms @msyyc
-/src/azure-cli/azure/cli/command_modules/network/ @jsntcy @kairu-ms @msyyc
+/src/azure-cli/azure/cli/command_modules/iot/ @digimaun @zhoxing-ms
+/src/azure-cli/azure/cli/command_modules/keyvault/ @evelyn-ys @jiasli
+/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
 /src/azure-cli/azure/cli/command_modules/policyinsights/ @cheggert
-/src/azure-cli/azure/cli/command_modules/privatedns/ @jsntcy @kairu-ms @msyyc
-/src/azure-cli/azure/cli/command_modules/profile/ @jiasli @evelyn-ys @fengzhou-msft
+/src/azure-cli/azure/cli/command_modules/privatedns/ @jsntcy @kairu-ms
+/src/azure-cli/azure/cli/command_modules/profile/ @jiasli @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/rdbms/ @arde0708 @Juliehzl @evelyn-ys @DaeunYim
 /src/azure-cli/azure/cli/command_modules/resource/ @Juliehzl @zhoxing-ms
-/src/azure-cli/azure/cli/command_modules/role/ @jiasli @evelyn-ys @jsntcy @fengzhou-msft
+/src/azure-cli/azure/cli/command_modules/role/ @jiasli @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/search/ @huangbolun @kairu-ms
-/src/azure-cli/azure/cli/command_modules/servicebus/ @v-ajnava @fengzhou-msft
-/src/azure-cli/azure/cli/command_modules/servicefabric/ @QingChenmsft @qwordy @Juliehzl
+/src/azure-cli/azure/cli/command_modules/servicebus/ @v-ajnava @Juliehzl @zhoxing-ms
+/src/azure-cli/azure/cli/command_modules/servicefabric/ @QingChenmsft @Juliehzl @zhoxing-ms
 /src/azure-cli/azure/cli/command_modules/sql/ @jaredmoo @Juliehzl @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/storage/ @Juliehzl @jsntcy @zhoxing-ms @evelyn-ys
 /src/azure-cli/azure/cli/command_modules/synapse/ @idear1203 @sunsw1994 @aim-for-better
 /src/azure-cli/azure/cli/command_modules/util/ @jiasli @Juliehzl @zhoxing-ms @evelyn-ys
-/src/azure-cli/azure/cli/command_modules/vm/ @qwordy @houk-ms @yungezz @Juliehzl @zhoxing-ms
+/src/azure-cli/azure/cli/command_modules/vm/ @Juliehzl @zhoxing-ms

.vscode/launch.json

@@ -9,7 +9,12 @@
             "program": "${workspaceRoot}/src/azure-cli/azure/cli/__main__.py",
             "cwd": "${workspaceRoot}",
             "args": [
-                "--help"
+                "ts",
+                "export",
+                "-s",
+                 "/subscriptions/a1bfa635-f2bf-42f1-86b5-848c674fc321/resourceGroups/Gokul-TestRG4/providers/Microsoft.Resources/templateSpecs/testTS/versions/1",
+                "--output-folder",
+                 "C:\\Users\\daetienn\\Desktop\\ExportBugOutput2"
             ],
             "console": "integratedTerminal",
             "debugOptions": [

azure-cli.pyproj

@@ -163,7 +163,6 @@
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\custom.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\tests\latest\test_webapp_commands.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\tests\latest\test_webapp_commands_thru_mock.py" />
-    <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\vsts_cd_provider.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_appservice_utils.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_client_factory.py" />
     <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_completers.py" />

azure-cli2017.pyproj

@@ -280,7 +280,6 @@
     <Compile Include="azure-cli\azure\cli\command_modules\appservice\tests\__init__.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\appservice\tunnel.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\appservice\utils.py" />
-    <Compile Include="azure-cli\azure\cli\command_modules\appservice\vsts_cd_provider.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\appservice\_appservice_utils.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\appservice\_client_factory.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\appservice\_completers.py" />
@@ -1488,4 +1487,4 @@
     </Interpreter>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
-</Project>
+</Project>

azure-pipelines.yml

@@ -682,7 +682,7 @@ jobs:
 
 - job: TestYumPackage
   displayName: Test Yum Package
-
+  timeoutInMinutes: 120
   dependsOn: BuildYumPackage
   condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual', 'Schedule'))
   pool:

doc/install_linux_prerequisites.md

@@ -25,7 +25,7 @@ The commands to run to install the dependencies for some common distributions ar
   * [6.7](#redhat-rhel-67)
   * [7.2](#redhat-rhel-72)
 * [SUSE](#suse-opensuse-132)
-* [CoreOS](#coreos-stable-899150--beta-101010--alpha-101010)
+* [Flatcar](#flatcar)
 
 ### Ubuntu 12.04 LTS
 Python 2.7.3 should be already on the machine. Install Python 3.6+ if needed.
@@ -93,6 +93,6 @@ Python 2.7.8 should be already on the machine. Install Python 3.6+ if needed.
 sudo zypper refresh && sudo zypper --non-interactive install gcc libffi-devel python-devel openssl-devel
 ```
 
-### CoreOS Stable-899.15.0 / Beta-1010.1.0 / Alpha-1010.1.0
+### Flatcar
 
-Python is not installed by default.
+Python is installed in the Azure-specific distribution of Flatcar, but is installed into the non-standard location `/usr/share/oem/python/bin/python`.

doc/managed_identity_command_guideline.md

@@ -0,0 +1,38 @@
+## Overview
+This document provides a common design of the CLI command interface for supporting Managed Identity in Azure CLI. New commands should follow it while existing commands can stay the same before a deprecation plan.
+
+## Command interface
+
+### Enable managed identity during resource creation
+Use `--mi-system-assigned` to enable system-assigned identity and `--mi-user-assigned` with space separated resource IDs to add user-assigned identities.
+
+```
+# <resource> can be acr, webapp, vm or any other resources that support managed identity
+az <resource> create ... --mi-system-assigned --mi-user-assigned <AzureResourceId1> <AzureResourceId2>
+```
+
+### Operate managed identity on existing resource
+Create the `identity` subgroup under the main resource command group. Support the below operations:
+
+1. Assign identities with `identity assign` command
+
+    Use `--system-assigned` to enable system assigned identity and `--user-assigned` with space separated resource IDs to add user assigned identities.
+    ```
+    az <resource> identity assign ... --system-assigned --user-assigned <AzureResourceId1> <AzureResourceId2>
+    ```
+2. Remove identities with `identity remove` command
+
+    Use `--system-assigned` to remove system assigned identity and `--user-assigned` with space separated resource IDs to remove specified user assigned identities.
+    ```
+    az <resource> identity remove ... --system-assigned --user-assigned <AzureResourceId1> <AzureResourceId2>
+    ```
+    For the convenience scenario to remove all user assigned identities, `--user-assigned` with no values should remove all user assigned identities with proper warnings.
+    ```
+    az <resource> identity remove ... --user-assigned
+    ```
+3. Show identities with `identity show` command
+
+    Use this command to show the managed identity type, tenant IDs and principal IDs of the system assigned identities and all user assigned identities.
+    ```
+    az <resource> identity show ...
+    ```

doc/sphinx/azhelpgen/azhelpgen.py

@@ -5,7 +5,7 @@
 
 import argparse
 import json
-from mock import patch
+from unittest.mock import patch
 from os.path import expanduser
 from docutils import nodes
 from docutils.statemachine import ViewList
@@ -51,7 +51,7 @@ def make_rst(self):
             if help_file.deprecate_info:
                 yield '{}:deprecated: {}'.format(INDENT, help_file.deprecate_info._get_message(help_file.deprecate_info))
             if not is_command:
-                top_group_name = help_file.command.split()[0] if help_file.command else 'az' 
+                top_group_name = help_file.command.split()[0] if help_file.command else 'az'
                 yield '{}:docsource: {}'.format(INDENT, doc_source_map[top_group_name] if top_group_name in doc_source_map else '')
             else:
                 top_command_name = help_file.command.split()[0] if help_file.command else ''
@@ -61,7 +61,7 @@ def make_rst(self):
 
             if is_command and help_file.parameters:
                group_registry = ArgumentGroupRegistry(
-                  [p.group_name for p in help_file.parameters if p.group_name]) 
+                  [p.group_name for p in help_file.parameters if p.group_name])
 
                for arg in sorted(help_file.parameters,
                                 key=lambda p: group_registry.get_group_priority(p.group_name)

doc/track_2_migration_guidance.md

@@ -2,9 +2,9 @@
 
 Azure CLI is built on Azure Python SDKs. Recently, Azure Python SDK team announced the next generation product, named Track 2 SDK. The old version of SDK is called Track 1 SDK. It claims that it has some advantages than Track 1 SDK. It is not compatible with Track 1 SDK. A considerable number of work days are required for Azure CLI developers to migrate their modules from Track 1 SDK to Track 2 SDK. Let's see an example of Track 2 SDK. [azure-mgmt-compute 17.0.0b1](https://pypi.org/project/azure-mgmt-compute/17.0.0b1/) introduces important breaking changes and important new features like unified authentication and asynchronous programming.
 
-This document summarizes typical issues and solutions when adopting Track 2 SDK in Azure CLI.
+This document summarizes the steps to apply the changes for migration, typical changes when adopting Track 2 SDK in Azure CLI.
 
-Example PRs:
+## Example PRs
 1. [Compute PR #15750](https://github.com/Azure/azure-cli/pull/15750)
 2. [Network PR #16245](https://github.com/Azure/azure-cli/pull/16245)
 3. [Network PR #16350](https://github.com/Azure/azure-cli/pull/16350)
@@ -13,7 +13,16 @@ Example PRs:
 6. [AppConfig PR #16376](https://github.com/Azure/azure-cli/pull/16376)
 7. [AppService PR #17146](https://github.com/Azure/azure-cli/pull/17146)
 
-Below is a list of typical issues.
+## Steps to apply the changes for migration
+1. Upgrade the version of your SDK to track 2 SDK in [setup.py](https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/setup.py), [requirements.py3.Darwin.txt](https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/requirements.py3.Darwin.txt), [requirements.py3.Linux.txt](https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/requirements.py3.Linux.txt) and [requirements.py3.windows.txt](https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/requirements.py3.windows.txt).
+2. Run command `azdev setup` to apply track 2 SDK to your local virtual environment.
+3. Run style check with command `azdev style your_module_name` and fix the errors returned from the command.
+4. Run linter check with command `azdev linter your_module_name` and fix the errors returned from the command.
+5. Run tests with command `azdev test your_module_name --no-exitfirst` and fix the errors returned from the command.
+6. Run tests lively with command `azdev test your_module_name --live --no-exitfirst` and fix the errors returned from the command.
+7. Create the pull request for migration.
+
+## Typical changes.
 
 1. [Long running operation function name change](#long-running-operation-function-name-change)
 2. [Property name change](#property-name-change)