[netappfiles] Anf 448 cli for 2019 10 01 sync upstream

.dockerignore

@@ -12,5 +12,8 @@
 !LICENSE.txt
 # Exclude build droppings, as mentioned in .gitignore
 src/build*
+# Exclude tests
+src/azure-cli/azure/cli/command_modules/*/tests
+# Exclude python cache
 **/*.pyc
 **/__pycache__

.github/CODEOWNERS

@@ -7,7 +7,7 @@
 /tools/ @haroldrandom @fengzhou-msft
 /scripts/ @haroldrandom @fengzhou-msft
 /src/azure-cli-testsdk/ @bim-msft @MyronFanQiu @haroldrandom
-/src/azure-cli-core/ @jiasli @Juliehzl @haroldrandom @fengzhou-msft @qianwens
+/src/azure-cli-core/ @jiasli @Juliehzl @haroldrandom @fengzhou-msft @qianwens @arrownj
 /src/azure-cli/azure/cli/command_modules/acr/ @djyou
 /src/azure-cli/azure/cli/command_modules/acs/ @rjtsdl
 /src/azure-cli/azure/cli/command_modules/advisor/ @Prasanna-Padmanabhan
@@ -17,25 +17,24 @@
 /src/azure-cli/azure/cli/command_modules/batch/ @bgklein
 /src/azure-cli/azure/cli/command_modules/batchai/ @AlexanderYukhanov
 /src/azure-cli/azure/cli/command_modules/cosmosdb/ @dmakwana
-/src/azure-cli/azure/cli/command_modules/cloud/ @jiasli
+/src/azure-cli/azure/cli/command_modules/cloud/ @jiasli @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/container/ @samkreter
 /src/azure-cli/azure/cli/command_modules/consumption/ @sandeepnl
 /src/azure-cli/azure/cli/command_modules/dls/ @lewu-msft
-/src/azure-cli/azure/cli/command_modules/eventgrid/ @kalyanaj
 /src/azure-cli/azure/cli/command_modules/extension/ @zikalino
 /src/azure-cli/azure/cli/command_modules/keyvault/ @bim-msft @fengzhou-msft @jiasli
 /src/azure-cli/azure/cli/command_modules/monitor/ @MyronFanQiu
 /src/azure-cli/azure/cli/command_modules/natgateway/ @khannarheams @MyronFanQiu @haroldrandom
 /src/azure-cli/azure/cli/command_modules/network/ @MyronFanQiu @haroldrandom
 /src/azure-cli/azure/cli/command_modules/privatedns/ @MyronFanQiu @haroldrandom
 /src/azure-cli/azure/cli/command_modules/policyinsights/ @cheggert
-/src/azure-cli/azure/cli/command_modules/profile/ @jiasli
-/src/azure-cli/azure/cli/command_modules/resource/ @Juliehzl @zhoxing-ms
+/src/azure-cli/azure/cli/command_modules/profile/ @jiasli @arrownj
+/src/azure-cli/azure/cli/command_modules/resource/ @Juliehzl @zhoxing-ms @qianwens
 /src/azure-cli/azure/cli/command_modules/role/ @jiasli
-/src/azure-cli/azure/cli/command_modules/storage/ @Juliehzl
+/src/azure-cli/azure/cli/command_modules/storage/ @Juliehzl @qianwens
 /src/azure-cli/azure/cli/command_modules/servicefabric/ @QingChenmsft
 /src/azure-cli/azure/cli/command_modules/sql/ @jaredmoo @Juliehzl
-/src/azure-cli/azure/cli/command_modules/vm/ @qwordy
+/src/azure-cli/azure/cli/command_modules/vm/ @qwordy @arrownj
 /src/azure-cli/azure/cli/command_modules/eventhubs/ @v-ajnava
 /src/azure-cli/azure/cli/command_modules/servicebus/ @v-ajnava
 /src/azure-cli/azure/cli/command_modules/apim/ @kevinhillinger @jonlester

.gitignore

@@ -112,4 +112,7 @@ pip.log
 # Tox
 .tox/
 
+# exe
+*.exe
+
 az_command_coverage.txt

azure-pipelines.yml

@@ -983,7 +983,6 @@ jobs:
    - BuildUbuntuBionic
    - BuildDebianJessie
    - BuildDebianStretch
-   - BuildUbuntuCosmic
    - BuildUbuntuDisco
    - BuildUbuntuEoan
   condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual'))
@@ -1022,13 +1021,6 @@ jobs:
       artifactName: ubuntu-bionic
 
 
-  - task: DownloadPipelineArtifact@1
-    displayName: 'Download Ubuntu:Cosmic Builds'
-    inputs:
-      TargetPath: '$(Build.ArtifactStagingDirectory)/debian'
-      artifactName: ubuntu-cosmic
-
-
   - task: DownloadPipelineArtifact@1
     displayName: 'Download Ubuntu:Disco Builds'
     inputs:
@@ -1077,8 +1069,8 @@ jobs:
        done
 
        # Distros that do require libssl1.1
-       DISTROS=(bionic cosmic disco eoan buster)
-       BASE_IMAGES=(ubuntu:bionic ubuntu:cosmic ubuntu:disco ubuntu:eoan debian:buster)
+       DISTROS=(bionic disco eoan buster)
+       BASE_IMAGES=(ubuntu:bionic ubuntu:disco ubuntu:eoan debian:buster)
 
        for i in ${!DISTROS[@]}; do
            echo "== Test debian package on ${DISTROS[$i]} =="
@@ -1091,36 +1083,6 @@ jobs:
        done
     displayName: 'Bash Script'
 
-- job: BuildUbuntuCosmic
-  displayName: Build Ubuntu Cosmic
-
-  dependsOn: BuildPythonWheel
-  condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual'))
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - task: DownloadPipelineArtifact@1
-    displayName: 'Download Build Artifacts'
-    inputs:
-      TargetPath: '$(Build.ArtifactStagingDirectory)/pypi'
-      artifactName: pypi
-
-
-  - task: Bash@3
-    displayName: 'Bash Script'
-    inputs:
-      targetType: 'filePath'
-      filePath: scripts/release/debian/pipeline.sh
-    env:
-      DISTRO: cosmic
-      DISTRO_BASE_IMAGE: ubuntu:cosmic
-
-  - task: PublishPipelineArtifact@0
-    displayName: 'Publish Artifact: debian'
-    inputs:
-      TargetPath: $(Build.ArtifactStagingDirectory)
-      ArtifactName: ubuntu-cosmic
-
 - job: CheckStyle
   displayName: "Check CLI Style"
 

build_scripts/windows/scripts/build.cmd

@@ -13,6 +13,7 @@ set PYTHON_VERSION=3.6.6
 
 set WIX_DOWNLOAD_URL="https://azurecliprod.blob.core.windows.net/msi/wix310-binaries-mirror.zip"
 set PYTHON_DOWNLOAD_URL="https://azurecliprod.blob.core.windows.net/util/Python366-32.zip"
+set PROPAGATE_ENV_CHANGE_DOWNLOAD_URL="https://azurecliprod.blob.core.windows.net/util/propagate_env_change.zip"
 
 :: Set up the output directory and temp. directories
 echo Cleaning previous build artifacts...
@@ -26,6 +27,7 @@ set TEMP_SCRATCH_FOLDER=%ARTIFACTS_DIR%\cli_scratch
 set BUILDING_DIR=%ARTIFACTS_DIR%\cli
 set WIX_DIR=%ARTIFACTS_DIR%\wix
 set PYTHON_DIR=%ARTIFACTS_DIR%\Python366-32
+set PROPAGATE_ENV_CHANGE_DIR=%~dp0..\propagate_env_change
 
 set REPO_ROOT=%~dp0..\..\..
 
@@ -154,6 +156,20 @@ for /d /r %BUILDING_DIR%\Lib\site-packages\pip %%d in (__pycache__) do (
 
 if %errorlevel% neq 0 goto ERROR
 
+::ensure propagate_env_change.exe is available
+if exist "%PROPAGATE_ENV_CHANGE_DIR%\propagate_env_change.exe" (
+    echo Using existing propagate_env_change.exe at %PROPAGATE_ENV_CHANGE_DIR%
+) else (
+    pushd %PROPAGATE_ENV_CHANGE_DIR%
+    echo Downloading propagate_env_change.exe.
+    curl -o propagate_env_change.zip %PROPAGATE_ENV_CHANGE_DOWNLOAD_URL% -k
+    unzip -q propagate_env_change.zip
+    if %errorlevel% neq 0 goto ERROR
+    del propagate_env_change.zip
+    echo propagate_env_change.exe downloaded and extracted successfully.
+    popd
+)
+
 echo Building MSI...
 msbuild /t:rebuild /p:Configuration=Release %REPO_ROOT%\build_scripts\windows\azure-cli.wixproj
 

doc/authoring_command_modules/README.md

@@ -201,12 +201,12 @@ Submitting Pull Requests
 
 ### Format PR Title
 
-History notes are auto-generated based on commit messages and descriptions starting from [S165](https://github.com/Azure/azure-cli/milestone/82). The commmit message for the squashed merge commit defaults to the PR title. Starting from 01/30/2020, we require all the PR titles to follow the below format:
-1. [**Mandatory**] Each commit message must start with `[Component Name]` or `{Component Name}`. 
+History notes are auto-generated based on PR titles and descriptions starting from [S165](https://github.com/Azure/azure-cli/milestone/82). Starting from 01/30/2020, we require all the PR titles to follow the below format:
+1. [**Mandatory**] Each PR title must start with `[Component Name]` or `{Component Name}`. 
     * `Component Name` shall be replaced by the real ones such as `Storage`, `Compute`. It could be the name of a command module, but in title case with necessary spaces for better readability, such as `API Management`, `Managed Service`. Other possible component names include but are not limited to: `Packaging`, `Misc.`, `Aladdin`.
     * `[]` means this change is customer-facing and the message will be put into `HISTORY.rst`. `{}` means this change is not customer-facing and the message will **NOT** be included in `HISTORY.rst`.
     * If the component name is `Core`, the message will be written in `src/azure-cli-core/HISTORY.rst`. Otherwise, the message will be written in `src/azure-cli/HISTORY.rst`.
-2. [**Mandatory**] If it's a breaking change, the second part should be `BREAKING CHANGE` followed by a colon. In the case of hotfix, put `Hotfix` in this part. For other cases, this part should be empty.
+2. [**Mandatory**] If it's a breaking change, the second part should be `BREAKING CHANGE` followed by a colon. In the case of hotfix, put `Hotfix` in this part. If it's related to fixing an issue, put `Fix #number` in this part. For other cases, this part could be empty.
 3. [**Recommendation**] If the change can be mapped into a command, then the next part could be the command name, followed by a colon.
 4. [**Recommendation**] Use the right verb with present-tense in original form to descibe what is done:
     * **Add** for new features.
@@ -215,22 +215,23 @@ History notes are auto-generated based on commit messages and descriptions start
     * **Remove** for deprecated features removed in this release.
     * **Fix** for any bug fixes.
 
-An example title of customer-facing change PR:
+Examples of customer-facing change PR title:
 
->[Storage] BREAKING CHANGE: az storage remove: remove --auth-mode argument
+>[Storage] BREAKING CHANGE: az storage remove: remove --auth-mode argument  
+>[ARM] Fix #10246: az resource tag crashes when the parameter --ids passed in is resource group ID
 
-An example title of non-customer-facing change PR:
+An example of non-customer-facing change PR title:
 
 >{Aladdin} Add help example for dns
 
 ### Format PR Description
 
-If you would like to write multiple history notes for one PR, please write the notes under `History Notes` section in the PR description,  following the same format described above. In this case, the PR title should be a summary of all the changes in this PR and will not be put into `HISTORY.rst`.
+If you would like to write multiple history notes for one PR, please write the notes under `History Notes` section in the PR description, following the same format described above. The PR template already contains the history note template, just change it if needed. In this case, the PR title should be a summary of all the changes in this PR and will not be put into `HISTORY.rst`. You can delete the `History Notes` section if not needed.
 
 Other than that, you can put any reasonable information in the description above the `History Notes` part.
 
-### Only Modify HISTORY.rst for Hotfix
-As described above, history notes will be auto-generated and inserted into `HISTORY.rst` during release. When submitting a normal PR, you don't need to modify `HISTORY.rst` manually. In the case of hotfix, you should create a hotfix branch based on release branch and submit a PR to merge hotfix into release. In this PR, if you have customer-facing changes, you need to modify `HISTORY.rst` to add history notes. Later on you also need to merge the hotfix branch into dev branch and the second part of the PR title should be `Hotfix`. The auto-generation of history notes for the next release will ignore the commit that contains `Hotfix`.
+### Submit Hotfix
+In the case of hotfix, you should create a hotfix branch based on release branch and submit a PR to merge hotfix into release. In this PR, the second part of the PR title should be `Hotfix`. If you have customer-facing changes, you need to modify `HISTORY.rst` to add history notes. The auto generated history notes for the next release will ignore the PR that contains `Hotfix`. You also need to submit a PR to merge the release branch back into dev branch before next release. Do **NOT** squash and merge this PR. After the PR gets approved by code owners, you should fast forward dev to release on your local machine and then push dev to upstream repository. 
 
 An example title of hotfix change PR:
 

doc/command_guidelines.md

@@ -420,8 +420,7 @@ Virtual Network Rule Arguments
 
 ## Coding Practices
 
-- All code must support Python 2 & 3.
-The CLI supports 2.7, 3.5, 3.6, 3.7 and 3.8
+- All code must support Python 3.5, 3.6, 3.7 and 3.8
 - PRs to Azure/azure-cli and Azure/azure-cli-extensions must pass CI
 - Code must pass style checks with pylint and pep8
 - (*) All commands should have tests

doc/configuring_your_machine.md

@@ -1,7 +1,7 @@
 Setting up your development environment
 ========================================
 The Azure Python CLI projects sources are located on GitHub (https://github.com/Azure/azure-cli/). In order to contribute to the project, you are expected to:
--    Have a GitHub account. For Microsoft contributors, follow the guidelines on https://opensourcehub.microsoft.com/ to create, configure and link your account
+-    Have a GitHub account. For Microsoft contributors, follow the guidelines on https://opensource.microsoft.com/ to create, configure and link your account
 -    Fork the  https://github.com/Azure/azure-cli/ repository into your private GitHub account
 -    Create pull requests against the https://github.com/azure/azure-cli repository to get your code changes merged into the project repository.
 
@@ -20,7 +20,7 @@ The Azure Python CLI projects sources are located on GitHub (https://github.com/
 1. Both VS 2015 and 2017 support Python development, but VS 2015 is more relible, particular on the intellisense and "Test Explorer". VS 2019's Python support is being actively improved, and we will recommend it here once the evalution result is promising.  
 2. Steps to setup VS 2015:
 
-   - You can install VS 2015 from https://visualstudio.microsoft.com/vs/older-downloads/
+   - You can install VS 2015 from https://visualstudio.microsoft.com/vs/older-downloads/#visual-studio-2015-family
    - Click menu "View->Other Windows->Python Environment" and create a new one by pointing to a local installed Python like 3.7.0.
    - Click menu "File->New Project", and in the dialog select "Python->From Existing Python Code". This will create a project from your local clone.
    - Go through the wizard
@@ -38,7 +38,7 @@ The Azure Python CLI projects sources are located on GitHub (https://github.com/
 Experimental steps – still haven’t been able to get virtual environments to work well with VSCode
 
 1. Install VS Code
-2. Install (one of) the python extension(s) (https://marketplace.visualstudio.com/items?itemName=donjayamanne.python)
+2. Install (one of) the python extension(s) (https://marketplace.visualstudio.com/items?itemName=ms-python.python)
 3. Put [breakpoints](https://code.visualstudio.com/docs/editor/debugging#_breakpoints) in your code, then click on the Debug icon in the Activity Bar on the side of Visual Studio Code, and select `Azure CLI Debug` from the drop down menu. After that, press the play button to start debugging.
 4. To add custom arguments to the command that you want to debug, press the gear icon beside the drop down menu and modify the `args` field in `launch.json`
 

doc/debug/debug_in_vs_code.md

@@ -4,7 +4,7 @@
 
 * Visual Studio Code [Link](http://code.visualstudio.com/)
 * Visual Studio Code Python Extension [Link](https://marketplace.visualstudio.com/items?itemName=donjayamanne.python)
-* Python 2.7 or 3.5
+* Python 3.5+
 * Set up development environment [Link](https://github.com/Azure/azure-cli/blob/master/doc/configuring_your_machine.md)
 
 ## Quick start

doc/extensions/authoring.md

@@ -119,11 +119,11 @@ See [Extension Metadata](metadata.md) for more information.
 
 - When you run `az --version` it will list your normal extensions directory as well as any directories being used to find developer extensions. Developer extensions will appear in the output with a path next to the version number.
 
-### Test your extension on both Python 2 & 3
+### Test your extension on Python 3
 
-- The CLI supports both Python 2 & 3 so verify that your extension does the same.
-- You can create both a Python 2 and 3 virtual environment and run your extension in both.
-- e.g. `virtualenv env27` and `virtualenv -p /usr/local/bin/python3 env`.
+- The CLI supports Python 3.5, 3.6, 3.7, 3.8 so verify that your extension does the same.
+- You can create virtual environments for different versions and run your extension in them.
+- e.g. `python3.6 -m venv env36` and `python3.8 -m venv env38`.
 
 
 :zap: IMPORTANT :zap: