jqhuangonearth · jqhuangonearth · Jan 19, 2021 · Dec 22, 2020 · Dec 22, 2020 · Dec 22, 2020
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,21 +1,21 @@
 # See for instructions on this file https://help.github.com/articles/about-codeowners/
 
-*help.py @haroldrandom
-*help.yaml @haroldrandom
-*help.yml  @haroldrandom
+*help.py @msyyc
+*help.yaml @msyyc
+*help.yml @msyyc
 
-/linter_exclusions.yml @jsntcy @haroldrandom @kairu-ms
+/linter_exclusions.yml @jsntcy @kairu-ms
 
 /doc/ @jiasli @qwordy @dbradish-microsoft
-/tools/ @haroldrandom @fengzhou-msft
-/scripts/ @haroldrandom @fengzhou-msft
+/tools/ @fengzhou-msft @jiasli
+/scripts/ @fengzhou-msft @jiasli
 /scripts/live_test @qwordy
-/src/azure-cli-testsdk/ @bim-msft @jsntcy @haroldrandom
-/src/azure-cli-core/ @jiasli @Juliehzl @haroldrandom @fengzhou-msft @evelyn-ys @jsntcy @houk-ms
+/src/azure-cli-testsdk/ @jsntcy @jiasli @kairu-ms @qwordy
+/src/azure-cli-core/ @jiasli @Juliehzl @fengzhou-msft @evelyn-ys @jsntcy @houk-ms
 /src/azure-cli/azure/cli/command_modules/acr/ @djyou @fengzhou-msft @yungezz
 /src/azure-cli/azure/cli/command_modules/acs/ @rjtsdl @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/advisor/ @Prasanna-Padmanabhan
-/src/azure-cli/azure/cli/command_modules/appconfig/ @shenmuxiaosen @avanigupta @bim-msft @qwordy
+/src/azure-cli/azure/cli/command_modules/appconfig/ @shenmuxiaosen @avanigupta @qwordy
 /src/azure-cli/azure/cli/command_modules/appservice/ @qwordy @Juliehzl
 /src/azure-cli/azure/cli/command_modules/backup/ @dragonfly91 @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/batch/ @bgklein @gingi @dpwatrous @paterasMSFT @qwordy
@@ -25,15 +25,16 @@
 /src/azure-cli/azure/cli/command_modules/container/ @zhoxing-ms @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/consumption/ @sandeepnl
 /src/azure-cli/azure/cli/command_modules/dls/ @akharit @rahuldutta90 @Juliehzl @jsntcy
-/src/azure-cli/azure/cli/command_modules/extension/ @fengzhou-msft @haroldrandom
-/src/azure-cli/azure/cli/command_modules/keyvault/ @bim-msft @fengzhou-msft @yungezz @houk-ms
+/src/azure-cli/azure/cli/command_modules/dms/ @temandr @binuj
+/src/azure-cli/azure/cli/command_modules/extension/ @fengzhou-msft @msyyc
+/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 @haroldrandom @kairu-ms @msyyc
-/src/azure-cli/azure/cli/command_modules/network/ @jsntcy @haroldrandom @kairu-ms @msyyc
-/src/azure-cli/azure/cli/command_modules/privatedns/ @jsntcy @haroldrandom @kairu-ms @msyyc
+/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/privatedns/ @jsntcy @kairu-ms @msyyc
 /src/azure-cli/azure/cli/command_modules/policyinsights/ @cheggert
 /src/azure-cli/azure/cli/command_modules/profile/ @jiasli @evelyn-ys @fengzhou-msft
-/src/azure-cli/azure/cli/command_modules/rdbms/ @Juliehzl @evelyn-ys
+/src/azure-cli/azure/cli/command_modules/rdbms/ @arde0708 @Juliehzl @evelyn-ys
 /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/storage/ @Juliehzl @jsntcy @zhoxing-ms @evelyn-ys
@@ -47,4 +48,5 @@
 /src/azure-cli/azure/cli/command_modules/aro/ @mjudeikis @jim-minter
 /src/azure-cli/azure/cli/command_modules/util/ @jiasli @Juliehzl @zhoxing-ms
 /src/azure-cli/azure/cli/command_modules/synapse/ @idear1203 @sunsw1994 @aim-for-better
-/src/azure-cli/azure/cli/command_modules/hdinsight/ @aim-for-better @haroldrandom @Juliehzl
+/src/azure-cli/azure/cli/command_modules/hdinsight/ @aim-for-better @Juliehzl @kairu-ms
+/src/azure-cli/azure/cli/command_modules/databoxedge/ @evelyn-ys @Juliehzl
diff --git a/NOTICE.txt b/NOTICE.txt
diff --git a/README.md b/README.md
@@ -200,4 +200,4 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
 
 If you would like to become an active contributor to this project please
-follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://azure.github.io/guidelines.html).
+follow the instructions provided in [Microsoft Open Source Guidelines](https://opensource.microsoft.com/collaborate).
diff --git a/azure-pipelines-full-tests.yml b/azure-pipelines-full-tests.yml
@@ -43,12 +43,14 @@ jobs:
         inputs:
           versionSpec: 3.7
 
-      - task: Bash@3
+      - script: |
+          if [[ "$(Build.Reason)" == "PullRequest" ]]; then
+            branch=$(System.PullRequest.TargetBranch)
+          else
+            branch=$(Build.SourceBranchName)
+          fi
+          scripts/release/pypi/build.sh $branch
         displayName: 'Run Wheel Build Script'
-        inputs:
-          targetType: 'filePath'
-          filePath: scripts/release/pypi/build.sh
-          arguments: $(System.PullRequest.TargetBranch)
 
       - task: PublishPipelineArtifact@0
         displayName: 'Publish Artifact: pypi'

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -279,12 +279,14 @@ jobs:
       versionSpec: 3.7
 
 
-  - task: Bash@3
+  - script: |
+      if [[ "$(Build.Reason)" == "PullRequest" ]]; then
+        branch=$(System.PullRequest.TargetBranch)
+      else
+        branch=$(Build.SourceBranchName)
+      fi
+      scripts/release/pypi/build.sh $branch
     displayName: 'Run Wheel Build Script'
-    inputs:
-      targetType: 'filePath'
-      filePath: scripts/release/pypi/build.sh
-      arguments: $(System.PullRequest.TargetBranch)
 
 
   - task: PublishPipelineArtifact@0
@@ -329,17 +331,17 @@ jobs:
        echo "== Testing pip install on Python 3.6 =="
        docker run \
          --rm -v $PYPI_FILES:/mnt/pypi python:3.6 \
-         /bin/bash -c "ls /mnt/pypi && pip install -f /mnt/pypi -q azure-cli==$CLI_VERSION && az self-test && az --version && sleep 5"
+         /bin/bash -c "ls /mnt/pypi && pip install -f /mnt/pypi -q azure-cli==$CLI_VERSION.* && az self-test && az --version && sleep 5"
 
        echo "== Testing pip install on Python 3.7 =="
        docker run \
          --rm -v $PYPI_FILES:/mnt/pypi python:3.7 \
-         /bin/bash -c "ls /mnt/pypi && pip install -f /mnt/pypi -q azure-cli==$CLI_VERSION && az self-test && az --version && sleep 5"
+         /bin/bash -c "ls /mnt/pypi && pip install -f /mnt/pypi -q azure-cli==$CLI_VERSION.* && az self-test && az --version && sleep 5"
 
        echo "== Testing pip install on Python 3.8 =="
        docker run \
          --rm -v $PYPI_FILES:/mnt/pypi python:3.8 \
-         /bin/bash -c "ls /mnt/pypi && pip install -f /mnt/pypi -q azure-cli==$CLI_VERSION && az self-test && az --version && sleep 5"
+         /bin/bash -c "ls /mnt/pypi && pip install -f /mnt/pypi -q azure-cli==$CLI_VERSION.* && az self-test && az --version && sleep 5"
 
     displayName: 'Test pip Install'
 
@@ -574,7 +576,8 @@ jobs:
   displayName: Test Homebrew Package
   timeoutInMinutes: 180
   dependsOn: BuildHomebrewFormula
-  condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual'))
+  # condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual'))
+  condition: false
   pool:
     vmImage: 'macOS-10.14'
   steps:

diff --git a/doc/sphinx/azhelpgen/doc_source_map.json b/doc/sphinx/azhelpgen/doc_source_map.json
@@ -74,5 +74,6 @@
     "apim": "src/azure-cli/azure/cli/command_modules/apim/_help.py",
     "aro": "src/azure-cli/azure/cli/command_modules/aro/_help.py",
     "util": "src/azure-cli/azure/cli/command_modules/util/_help.py",
-    "synapse": "src/azure-cli/azure/cli/command_modules/synapse/_help.py"
+    "synapse": "src/azure-cli/azure/cli/command_modules/synapse/_help.py",
+    "databoxedge": "src/azure-cli/azure/cli/command_modules/databoxedge/_help.py"
 }
diff --git a/doc/track_2_migration_guidance.md b/doc/track_2_migration_guidance.md
@@ -0,0 +1,115 @@
+# Track 2 Migration Guidance
+
+Azure CLI is built upon Azure Python SDK. Recently Azure Python SDK announced next generation product. It is named Track 2 SDK. The old version of SDK is named Track 1. It claims that it has great advantages than Track 1 SDK. It is not compatible with Track 1 SDK. Azure CLI developers need to spend considerable time and do some work to migrate 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.
+
+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)
+
+Below is a list of typical issues.
+
+1. [Long running operation function name change](#long-running-operation-function-name-change)
+2. [Property name change](#property-name-change)
+3. [Class name change](#class-name-change)
+4. [Error type change](#error-type-change)
+5. [No enum type](#no-enum-type)
+6. [Class hierarchy change](#class-hierarchy-change)
+7. [Obtaining Subscription](#obtaining-subscription)
+8. [Multi-API support](#multi-api-support)
+9. [Fixing mocked object](#fixing-mocked-object)
+10. [Modifying patch_models.py to include missing packages](#modifying-patch_modelspy-to-include-missing-packages)
+11. [Missing x-ms-authorization-auxiliary](#missing-external-tenant-authentication-support)
+
+### Long running operation function name change
+
+Long running operations have changed their function names in Track 2 SDK. A `begin_` prefix is added. For example, `create_or_update` becomes `begin_create_or_update`. `delete` becomes `begin_delete`. It is a naming convention in Track 2 SDK to indicate that an operation is a long running operation. Test cases can reveal most instances, but if a command has no test, it may be missed. A reliable approach is going through all methods to see whether they are long running operations.
+
+### Property name change
+
+Some of property names change in Track 2 SDK.
+
+Examples:
+
+```
+hyperVgeneration -> hyperVGeneration
+disk_mbps_read_only -> disk_m_bps_read_only
+disk_mbps_read_write -> disk_m_bps_read_write
+virtual_machine_extension_type -> type_properties_type
+type1 -> type_properties_type
+instance_ids -> vm_instance_i_ds
+diskMbpsReadWrite -> diskMBpsReadWrite
+```
+
+Some changes are unnecessary, even wrong in English. I opened [Azure/autorest.python#850](https://github.com/Azure/autorest.python/issues/850) to track this problem.
+
+### Class name change
+
+Some of class names change in Track 2 SDK.
+
+Examples:
+
+```
+VirtualMachineIdentityUserAssignedIdentitiesValue -> UserAssignedIdentitiesValue
+```
+
+### Error type change
+
+Error type changes in Track2 SDK.
+
+Examples:
+
+```
+CloudError -> azure.core.exceptions.ResourceNotFoundError
+```
+
+### No enum type
+
+Track 2 SDK removes enum type and adopts string type instead. It loses the validation on values. Anyway, do not use `obj.value` any longer. Just use `obj`.
+
+### Class hierarchy change
+
+The class hierarchy may change in Track 2 SDK. Some properties are not flattened. They are wrapped in classes. 
+
+Examples:
+
+In VMSS `begin_update_instances`, a new type `VirtualMachineScaleSetVMInstanceRequiredIDs` is added.
+
+In DiskAccess `begin_create_or_update`, location and tags are moved to a nested structure `DiskAccess`, `disk_access = DiskAccess(location=location, tags=tags)`
+
+### Obtaining subscription
+
+There are various ways to obtain subscription ID. Obtaining it from `client.config` does not work in Track 2 SDK any longer.
+
+Examples:
+
+```
+subscription = client.config.subscription_id ->
+from azure.cli.core.commands.client_factory import get_subscription_id
+subscription = get_subscription_id(cmd.cli_ctx)
+```
+
+In this example, the reason that old one fails is that `config` is renamed to `_config` in Track 2 SDK.
+
+### Multi-API support
+
+Remember to support multi-API. It reveals multi-API error when Track 2 SDK is adopted if we don't run live test for all tests. Actually the original code is wrong. It doesn't handle multi-API support well.
+
+### Fixing mocked object
+
+The problem I met is property name change. It is hard to find the line of code that causes the error. Please update mocked object construction code and make sure it is up-to-date.
+
+### Modifying patch_models.py to include missing packages
+
+It is only used in CI jobs. It patches some code to SDK. This file should be deprecated. It was written long time ago. But for now, just modify this file and add missing packages.
+
+### Missing external tenant authentication support
+
+External tenant authentication support is missing in Azure CLI Core and Azure Core package. In request header, we use x-ms-authorization-auxiliary to pass auxiliary authorization token. Compute module is the first customer to have this requirement in Track 2 SDK. In azure/core/pipeline/policies/_authentication.py, there is a class BearerTokenCredentialPolicy. It simplifies bearer token authorization header configuration. However, auxiliary bearer token authorization is not supported in Azure Core policies [1] yet. The current solution is getting tokens manually, setting headers in client constructor or in operation call time manually. They said they will support this policy in the future. Azure CLI Core also needs an upgrade to provide better interfaces for Track 2 SDK users.
+
+You are welcome to contribute to this document if you have experience of Track 2 SDK.
+
+### References
+
+[1] https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/core/azure-core/CLIENT_LIBRARY_DEVELOPER.md#available-policies
diff --git a/linter_exclusions.yml b/linter_exclusions.yml
@@ -662,6 +662,11 @@ backup item show:
     backup_management_type:
       rule_exclusions:
       - option_length_too_long
+backup job list:
+  parameters:
+    backup_management_type:
+      rule_exclusions:
+      - option_length_too_long
 backup policy create:
   parameters:
     backup_management_type:

diff --git a/scripts/ci/credscan/CredScanSuppressions.json b/scripts/ci/credscan/CredScanSuppressions.json
@@ -56,6 +56,7 @@
         "src\\azure-cli\\azure\\cli\\command_modules\\appservice\\tests\\latest\\recordings\\test_webapp_e2e.yaml",
         "src\\azure-cli\\azure\\cli\\command_modules\\appservice\\tests\\latest\\recordings\\test_webapp_list_deployment_logs.yaml",
         "src\\azure-cli\\azure\\cli\\command_modules\\appservice\\tests\\latest\\recordings\\test_webapp_up_statichtml_e2e.yaml",
+        "src\\azure-cli\\azure\\cli\\command_modules\\appservice\\tests\\latest\\recordings\\test_webapp_up_generate_default_name.yaml",
         "src\\azure-cli\\azure\\cli\\command_modules\\appservice\\tests\\latest\\recordings\\test_windows_to_linux_fail.yaml"
       ],
       "_justification": "[AppService] response body contains random value recognized as secret"

diff --git a/scripts/live_test/HISTORY.rst b/scripts/live_test/HISTORY.rst
@@ -3,6 +3,11 @@
 Release History
 ===============
 
+0.10.0 (12/30/2020)
+++++++
+
+* Update index.html.
+
 0.9.0 (11/23/2020)
 ++++++
 

diff --git a/scripts/live_test/generate_index.py b/scripts/live_test/generate_index.py
@@ -114,6 +114,9 @@ def render(data, container, container_url, testdata, USER_REPO, USER_BRANCH, COM
     <a href=https://microsoft-my.sharepoint.com/:w:/p/fey/EZGC9LwrN3RAscVS5ylG4HMBX9h7W0ZSA7CDrhXN5Lvx6g?e=V8HUmd>User Manual of Live Test Pipeline</a>
     (Please read it)
     <br>
+    <a href=https://microsoft-my.sharepoint.com/:w:/p/fey/EcgPLHSkef9Mi14Rjx79N9sBvyVDO4b_V97BMcoI1HTq-A?e=Ioap3B>Upgrading API Versions in Azure CLI Live Test Pipeline</a>
+    (Advanced feature)
+    <br>
     <a href=https://msit.powerbi.com/groups/8de24d49-e97c-4672-9bfc-45fee0ec58f7/reports/65dfcfce-5d59-4dc9-8bc5-3726443c8fe1/ReportSection>Power BI Report</a>
     (History data, beautiful charts and tables)
     </p>

diff --git a/scripts/release/homebrew/docker/formula_generate.py b/scripts/release/homebrew/docker/formula_generate.py
@@ -121,9 +121,8 @@ def update_formula() -> str:
     resp.raise_for_status()
     text = resp.text
 
-    # update url, version and sha256 of azure-cli
+    # update url and sha256 of azure-cli
     text = re.sub('url ".*"', 'url "{}"'.format(HOMEBREW_UPSTREAM_URL), text, 1)
-    text = re.sub('version ".*"', 'version "{}"'.format(CLI_VERSION), text, 1)
     upstream_sha = compute_sha256(HOMEBREW_UPSTREAM_URL)
     text = re.sub('sha256 ".*"', 'sha256 "{}"'.format(upstream_sha), text, 1)
     text = re.sub('.*revision.*\n', '', text, 1)  # remove revision for previous version if exists
@@ -134,7 +133,15 @@ def update_formula() -> str:
     line_idx_to_remove = set()
     upgrade = False
     for idx, line in enumerate(lines):
-        if line.strip().startswith("resource"):
+        # In released formula, the url is in the release tag format, such as
+        # "https://github.com/Azure/azure-cli/archive/azure-cli-2.17.1.tar.gz".
+        # version is extracted from url. During build, the url is in the format like
+        # "https://codeload.github.com/Azure/azure-cli/legacy.tar.gz/7e09fd50c9ef02e1ed7d4709c7ab1a71acd3840b".
+        # We need to add the version explicitly after url.
+        # We will change the url in our release pipeline and remove version.
+        if line.startswith("  url"):
+            lines[idx] = lines[idx] + '\n' + '  version "{}"'.format(CLI_VERSION)
+        elif line.strip().startswith("resource"):
             m = re.search(r'resource "(.*)" do', line)
             if m is not None:
                 pack = m.group(1)

diff --git a/scripts/release/pypi/build.sh b/scripts/release/pypi/build.sh
@@ -12,6 +12,7 @@ set -ev
 cd $BUILD_SOURCESDIRECTORY
 
 branch=$1
+echo "Branch $branch"
 
 echo "Search setup files from `pwd`."
 python --version
@@ -20,8 +21,8 @@ pip install -U pip setuptools wheel
 pip list
 
 script_dir=`cd $(dirname $BASH_SOURCE[0]); pwd`
-echo $script_dir
-if [[ "$branch" != "release" ]]; then
+
+if [[ "$branch" == "dev" ]]; then
     . $script_dir/../../ci/version.sh post`date -u '+%Y%m%d%H%M%S'`
 fi
 

diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst
@@ -3,6 +3,18 @@
 Release History
 ===============
 
+2.18.0
+++++++
+* Print INFO log from SDK (#15676)
+
+2.17.1
+++++++
+* No changes
+
+2.17.0
+++++++
+* Minor fixes
+
 2.16.0
 ++++++
 * Add 2020-09-01-hybrid API profile for AzureStack (#15096)