Azure · hytao · Dec 31, 2019 · Dec 31, 2019 · Dec 31, 2019 · Dec 31, 2019
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,17 +1,17 @@
 # See for instructions on this file https://help.github.com/articles/about-codeowners/
 
-*help.py @sptramer @Juliehzl
-*help.yaml @sptramer @Juliehzl
-*help.yml  @sptramer @Juliehzl
+*help.py @haroldrandom @Juliehzl
+*help.yaml @haroldrandom @Juliehzl
+*help.yml  @haroldrandom @Juliehzl
 
-/tools/ @zikalino
-/scripts/ @zikalino
-/src/azure-cli-testsdk/ @zikalino
-/src/azure-cli-core/ @jiasli
+/tools/ @haroldrandom @fengzhou-msft
+/scripts/ @haroldrandom @fengzhou-msft
+/src/azure-cli-testsdk/ @bim-msft @MyronFanQiu @haroldrandom
+/src/azure-cli-core/ @jiasli @Juliehzl
 /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
-/src/azure-cli/azure/cli/command_modules/appservice/ @qwordy
+/src/azure-cli/azure/cli/command_modules/appservice/ @qwordy @Juliehzl
 /src/azure-cli/azure/cli/command_modules/backup/ @dragonfly91
 /src/azure-cli/azure/cli/command_modules/batch/ @bgklein
 /src/azure-cli/azure/cli/command_modules/batchai/ @AlexanderYukhanov
@@ -22,17 +22,18 @@
 /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/ @jiasli
+/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
-/src/azure-cli/azure/cli/command_modules/network/ @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
+/src/azure-cli/azure/cli/command_modules/resource/ @Juliehzl @zhoxing-ms
 /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/servicefabric/ @QingChenmsft
-/src/azure-cli/azure/cli/command_modules/sql/ @jaredmoo
+/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/eventhubs/ @v-ajnava
 /src/azure-cli/azure/cli/command_modules/servicebus/ @v-ajnava

diff --git a/Dockerfile b/Dockerfile
@@ -36,7 +36,7 @@ LABEL maintainer="Microsoft" \
 # libintl and icu-libs - required by azure devops artifact (az extension add --name azure-devops)
 RUN apk add --no-cache bash openssh ca-certificates jq curl openssl git zip \
  && apk add --no-cache --virtual .build-deps gcc make openssl-dev libffi-dev musl-dev linux-headers \
- && apk add --no-cache libintl icu-libs \
+ && apk add --no-cache libintl icu-libs libc6-compat \
  && update-ca-certificates
 
 ARG JP_VERSION="0.1.3"

diff --git a/README.md b/README.md
@@ -149,6 +149,12 @@ $ pip3 install --upgrade --pre azure-cli --extra-index-url https://azurecliprod.
 
 The edge build is generated for each PR merged to the `dev` branch as a part of the Azure DevOps Pipelines. 
 
+## Get builds of arbitrary commit or PR
+
+If you would like to get builds of arbitrary commit or PR, see:
+
+[Try new features before release](doc/try_new_features_before_release.md)
+
 ## Developer Setup
 
 If you would like to setup a development environment and contribute to the CLI, see:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -19,32 +19,33 @@ jobs:
         echo "Reject pull request directly to master branch"
         exit 1
 
-- job: CredScan
-  displayName: "Credential Scan"
-
-  pool:
-    vmImage: "windows-2019"
-  steps:
-  - task: CredScan@2
-    inputs:
-      toolMajorVersion: 'V2'
-
-  - task: PostAnalysis@1
-    inputs:
-      AllTools: false
-      APIScan: false
-      BinSkim: false
-      CodesignValidation: false
-      CredScan: true
-      FortifySCA: false
-      FxCop: false
-      ModernCop: false
-      PoliCheck: false
-      RoslynAnalyzers: false
-      SDLNativeRules: false
-      Semmle: false
-      TSLint: false
-      ToolLogsNotFoundAction: 'Standard'
+#- job: CredScan
+#  displayName: "Credential Scan"
+#
+#  pool:
+#    vmImage: "windows-2019"
+#  steps:
+#  - task: CredScan@2
+#    inputs:
+#      toolMajorVersion: 'V2'
+#      suppressionsFile: ./scripts/ci/credscan/CredScanSuppressions.json
+#
+#  - task: PostAnalysis@1
+#    inputs:
+#      AllTools: false
+#      APIScan: false
+#      BinSkim: false
+#      CodesignValidation: false
+#      CredScan: true
+#      FortifySCA: false
+#      FxCop: false
+#      ModernCop: false
+#      PoliCheck: false
+#      RoslynAnalyzers: false
+#      SDLNativeRules: false
+#      Semmle: false
+#      TSLint: false
+#      ToolLogsNotFoundAction: 'Standard'
 
 - job: ExtractMetadata
   displayName: Extract Metadata
@@ -382,10 +383,13 @@ jobs:
     matrix:
       Python27:
         python.version: '2.7'
+        tox_env: 'py27'
       Python36:
         python.version: '3.6'
+        tox_env: 'py36'
       Python38:
         python.version: '3.8'
+        tox_env: 'py38'
   steps:
     - task: UsePythonVersion@0
       displayName: 'Use Python $(python.version)'
@@ -395,6 +399,8 @@ jobs:
       displayName: 'Install pip and tox'
     - bash: ./scripts/ci/unittest.sh
       displayName: 'Run Unit Test'
+      env:
+        TOXENV: $(tox_env)
 
 - job: IntegrationTestAgainstProfiles
   displayName: Integration Test against Profiles

@@ -567,7 +567,7 @@ However, most commonly, the `custom_func_name` and `custom_func_type` kwargs wil
 - `getter_type` - A `CliCommandType` object which will be used to locate the getter. Only needed if the getter is a custom command (uncommon).
 - `setter_name` - The name of the method which will be used to update the object instance using a PUT method. If the method is named `create_or_update` (which is the case for most SDKs), this can be omitted.
 - `setter_type` - A `CliCommandType` object which will be used to locate the setter. Only needed if the setter is a custom command (uncommon).
-- `setter_arg_name` - The name of the argument in the setter which corresponds to the object being updated. If the name if `parameters` (which is the case for most SDKs), this can be omitted.
+- `setter_arg_name` - The name of the argument in the setter which corresponds to the object being updated. If the name is `parameters` (which is the case for most SDKs), this can be omitted.
 - `custom_func_name` (optional) - The name of a method which accepts the object being updated (must be named `instance`), mutates, and returns that object. This is commonly used to add convenience options to the command by listing them in the method signature, similar to a purely custom method. The difference is that a custom command function returns the command result while a generic update custom function returns only the object being updated. A simple custom function might look like:
 
   ```Python

@@ -83,13 +83,19 @@ $ curl https://azurecliprod.blob.core.windows.net/install | bash
 Errors on install with cffi or cryptography
 -------------------------------------------
 
-If you get errors on install on **OS X**, upgrade pip by typing:
+If you get errors on installation on **OS X**, upgrade pip by typing:
 
 ```shell
     pip install --upgrade --force-reinstall pip
 ```
 
-If you get errors on install on **Debian or Ubuntu** such as the examples below,
+If you get errors on installation on **Fedora** such as `No module named '_cffi_backend'`,
+install `python3-cffi` by typing:
+```shell
+    sudo yum install -y python3-cffi
+```
+
+If you get errors on installation on **Debian or Ubuntu** such as the examples below,
 install libssl-dev and libffi-dev by typing:
 
 ```shell

@@ -0,0 +1,32 @@
+Try new features before release
+===
+
+This documentation shows how to try new features in commit or PR before release even if the PR is not merged.
+
+Azure CLI releases new versions every 3 weeks. Many customers and developers are eager to try and test new features before the formal release. Fortunately, Azure CLI project builds artifacts for every commit and PR and you can download them.
+
+## Tutorial for commit
+
+Step 1. Select a commit. Click the √ or × symbol. Click "Details" of a "build package" item.
+
+![](assets/1.PNG)
+
+Step 2. Click "View more details on Azure Pipelines".
+
+![](assets/2.PNG)
+
+Step 3. Click "1 artifact"
+
+![](assets/3.PNG)
+
+Step 4. Download your favorite artifact.
+
+![](assets/4.PNG)
+
+## Tutorial for PR
+
+Step 1. Open a PR no matter it is merged or not. Click "Checks" tab.
+
+![](assets/5.PNG)
+
+Step 2-4. Follow the same steps of tutorial for commit.
@@ -14,6 +14,7 @@
         "src\\azure-cli\\azure\\cli\\command_modules\\appconfig\\tests\\latest\\recordings\\test_azconfig_credential.yaml",
         "src\\azure-cli\\azure\\cli\\command_modules\\appconfig\\tests\\latest\\recordings\\test_azconfig_feature.yaml",
         "src\\azure-cli\\azure\\cli\\command_modules\\appconfig\\tests\\latest\\recordings\\test_azconfig_feature_filter.yaml",
+        "src\\azure-cli\\azure\\cli\\command_modules\\appconfig\\tests\\latest\\recordings\\test_azconfig_import_export_naming_conventions.yaml",
         "src\\azure-cli\\azure\\cli\\command_modules\\appconfig\\tests\\latest\\recordings\\test_azconfig_import_export.yaml",
         "src\\azure-cli\\azure\\cli\\command_modules\\appconfig\\tests\\latest\\recordings\\test_azconfig_kv.yaml"
       ],

@@ -11,7 +11,7 @@ class AzureCli < Formula
 {{ bottle_hash }}
 
   depends_on "[email protected]"
-  depends_on "python"
+  depends_on "python@3.8"
 
 {{ resources }}
 

@@ -3,6 +3,12 @@
 Release History
 ===============
 
+2.0.80
+++++++
+* No changes
+
+2.0.79
+++++++
 * Fix #11586: `az login` is not recorded in server telemetry
 
 2.0.78

@@ -4,7 +4,7 @@
 # --------------------------------------------------------------------------------------------
 from __future__ import print_function
 
-__version__ = "2.0.78"
+__version__ = "2.0.80"
 
 import os
 import sys
@@ -86,6 +86,7 @@ def get_cli_version(self):
     def show_version(self):
         from azure.cli.core.util import get_az_version_string
         from azure.cli.core.commands.constants import SURVEY_PROMPT
+        import colorama
         ver_string, updates_available = get_az_version_string()
         print(ver_string)
         if updates_available == -1:
@@ -97,7 +98,9 @@ def show_version(self):
         else:
             print('Your CLI is up-to-date.')
 
+        colorama.init()  # This could be removed when knack fix is released
         print('\n' + SURVEY_PROMPT)
+        colorama.deinit()  # This could be removed when knack fix is released
 
     def exception_handler(self, ex):  # pylint: disable=no-self-use
         from azure.cli.core.util import handle_exception

@@ -78,7 +78,7 @@ def _print_examples(help_file):
         from colorama import Style
         indent = 0
         _print_indent('Examples', indent)
-        for e in help_file.examples:
+        for e in AzCliHelp.example_provider(help_file):
             indent = 1
             _print_indent(u'{0}'.format(e.short_summary), indent)
             indent = 2
@@ -190,6 +190,11 @@ def update_loaders_with_help_file_contents(self, nouns):
                 file_contents[name] = self._name_to_content[name]
             self.versioned_loaders[ldr_cls_name].update_file_contents(file_contents)
 
+    # This method is meant to be a hook that can be overridden by an extension or module.
+    @staticmethod
+    def example_provider(help_file):
+        return help_file.examples
+
 
 class CliHelpFile(KnackHelpFile):
 

@@ -204,6 +204,19 @@ def _get_version_string(name, version_dict):
     return version_string, updates_available
 
 
+def get_az_version_json():
+    from azure.cli.core.extension import get_extensions
+    versions = {'extensions': {}}
+
+    for dist in get_installed_cli_distributions():
+        versions[dist.key] = dist.version
+    extensions = get_extensions()
+    if extensions:
+        for ext in extensions:
+            versions['extensions'][ext.name] = ext.version or 'Unknown'
+    return versions
+
+
 def get_json_object(json_string):
     """ Loads a JSON string as an object and converts all keys to snake case """
 

@@ -17,7 +17,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.78"
+VERSION = "2.0.80"
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
 try:

@@ -147,7 +147,7 @@ def create_random_name(self, prefix, length):
     def create_guid(self):
         import uuid
         self.test_guid_count += 1
-        moniker = '88888888-0000-0000-0000-00000000' + ("%0.4X" % self.test_guid_count)
+        moniker = '88888888-0000-0000-0000-00000000' + ("%0.4x" % self.test_guid_count)
 
         if self.in_recording:
             name = uuid.uuid4()