[CDN] Add support for Rules engine feature

azure-cli.pyproj

@@ -1324,6 +1324,9 @@
     <Content Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\sample_policy_param_def.json" />
     <Content Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\sample_policy_rule.json" />
     <Content Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\sample_policy_set.json" />
+    <Content Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\sample_policy_set_grouping.json" />
+    <Content Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\sample_policy_groups_def.json" />
+    <Content Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\sample_policy_groups_def2.json" />
     <Content Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\simple_deploy.json" />
     <Content Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\simple_deploy_parameters.json" />
     <Content Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\test-object.json" />
@@ -1336,6 +1339,7 @@
     <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\linux\template.json" />
     <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\windows\parameter.json" />
     <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\template\windows\template.json" />
+    <Content Include="command_modules\azure-cli-servicefabric\azure\cli\command_modules\servicefabric\tests\policy.json" />
     <Content Include="command_modules\azure-cli-servicefabric\HISTORY.rst" />
     <Content Include="command_modules\azure-cli-servicefabric\setup.cfg" />
     <Content Include="command_modules\azure-cli-sql\HISTORY.rst" />

azure-cli2017.pyproj

@@ -297,10 +297,12 @@
     <Compile Include="azure-cli\azure\cli\command_modules\backup\custom_base.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\backup\custom_common.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\backup\custom_afs.py" />
+    <Compile Include="azure-cli\azure\cli\command_modules\backup\custom_wl.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\backup\custom_help.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\backup\tests\latest\preparers.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\backup\tests\latest\test_backup_commands.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\backup\tests\latest\test_afs_commands.py" />
+    <Compile Include="azure-cli\azure\cli\command_modules\backup\tests\latest\test_workload_commands.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\backup\tests\latest\__init__.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\backup\tests\__init__.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\backup\_client_factory.py" />
@@ -840,6 +842,7 @@
     <Compile Include="azure-cli\azure\cli\command_modules\servicebus\__init__.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\commands.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\custom.py" />
+    <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\tests\latest\test_sf_commands.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\_client_factory.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\_help.py" />
     <Compile Include="azure-cli\azure\cli\command_modules\servicefabric\_params.py" />
@@ -1420,6 +1423,7 @@
     <Content Include="azure-cli\azure\cli\command_modules\servicefabric\template\linux\template.json" />
     <Content Include="azure-cli\azure\cli\command_modules\servicefabric\template\windows\parameter.json" />
     <Content Include="azure-cli\azure\cli\command_modules\servicefabric\template\windows\template.json" />
+    <Content Include="azure-cli\azure\cli\command_modules\servicefabric\tests\policy.json" />
     <Content Include="azure-cli\azure\cli\command_modules\storage\tests\latest\mgmt_policy.json" />
     <Content Include="azure-cli\azure\cli\command_modules\vm\linter_exclusions.yml" />
     <Content Include="azure-cli\azure\cli\command_modules\vm\tests\latest\aliases.json" />

src/azure-cli-core/HISTORY.rst

@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.0.78
+++++++
+* Plug in HaTS survey
+
 2.0.77
 ++++++
 * Add deprecate message for Python 2.7

src/azure-cli-core/azure/cli/core/__init__.py

@@ -4,7 +4,7 @@
 # --------------------------------------------------------------------------------------------
 from __future__ import print_function
 
-__version__ = "2.0.77"
+__version__ = "2.0.78"
 
 import os
 import sys
@@ -85,6 +85,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
         ver_string, updates_available = get_az_version_string()
         print(ver_string)
         if updates_available == -1:
@@ -96,6 +97,8 @@ def show_version(self):
         else:
             print('Your CLI is up-to-date.')
 
+        print('\n' + SURVEY_PROMPT)
+
     def exception_handler(self, ex):  # pylint: disable=no-self-use
         from azure.cli.core.util import handle_exception
         return handle_exception(ex)

src/azure-cli-core/azure/cli/core/_help.py

@@ -7,6 +7,7 @@
 import argparse
 
 from azure.cli.core.commands import ExtensionCommandSource
+from azure.cli.core.commands.constants import SURVEY_PROMPT
 
 from knack.help import (HelpFile as KnackHelpFile, CommandHelpFile as KnackCommandHelpFile,
                         GroupHelpFile as KnackGroupHelpFile, ArgumentGroupRegistry as KnackArgumentGroupRegistry,
@@ -150,6 +151,7 @@ def new_normalize_text(s):
     def show_help(self, cli_name, nouns, parser, is_group):
         self.update_loaders_with_help_file_contents(nouns)
         super(AzCliHelp, self).show_help(cli_name, nouns, parser, is_group)
+        print(SURVEY_PROMPT)
 
     def _register_help_loaders(self):
         import azure.cli.core._help_loaders as help_loaders

src/azure-cli-core/azure/cli/core/cloud.py

@@ -66,7 +66,9 @@ def __init__(self,
                  active_directory_data_lake_resource_id=None,
                  vm_image_alias_doc=None,
                  media_resource_id=None,
-                 ossrdbms_resource_id=None):
+                 ossrdbms_resource_id=None,
+                 log_analytics_resource_id=None,
+                 app_insights_resource_id=None):
         # Attribute names are significant. They are used when storing/retrieving clouds from config
         self.management = management
         self.resource_manager = resource_manager
@@ -81,6 +83,8 @@ def __init__(self,
         self.vm_image_alias_doc = vm_image_alias_doc
         self.media_resource_id = media_resource_id
         self.ossrdbms_resource_id = ossrdbms_resource_id
+        self.log_analytics_resource_id = log_analytics_resource_id
+        self.app_insights_resource_id = app_insights_resource_id
 
     def has_endpoint_set(self, endpoint_name):
         try:
@@ -172,7 +176,9 @@ def _arm_to_cli_mapper(arm_dict):
             vm_image_alias_doc=arm_dict['vmImageAliasDoc'],  # pylint: disable=line-too-long
             media_resource_id=arm_dict['media'],
             ossrdbms_resource_id=_get_ossrdbms_resource_id(arm_dict['name']),  # pylint: disable=line-too-long # change once ossrdbms_resource_id is available via ARM
-            active_directory_data_lake_resource_id=arm_dict['activeDirectoryDataLake'] if 'activeDirectoryDataLake' in arm_dict else None),  # pylint: disable=line-too-long
+            active_directory_data_lake_resource_id=arm_dict['activeDirectoryDataLake'] if 'activeDirectoryDataLake' in arm_dict else None,  # pylint: disable=line-too-long
+            app_insights_resource_id=arm_dict['appInsightsResourceId'] if 'appInsightsResourceId' in arm_dict else None,
+            log_analytics_resource_id=arm_dict['logAnalyticsResourceId'] if 'logAnalyticsResourceId' in arm_dict else None),  # pylint: disable=line-too-long
         suffixes=CloudSuffixes(
             storage_endpoint=arm_dict['suffixes']['storage'],
             keyvault_dns=arm_dict['suffixes']['keyVaultDns'],
@@ -223,7 +229,9 @@ def __str__(self):
         active_directory_data_lake_resource_id='https://datalake.azure.net/',
         vm_image_alias_doc='https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-compute/quickstart-templates/aliases.json',  # pylint: disable=line-too-long
         media_resource_id='https://rest.media.azure.net',
-        ossrdbms_resource_id='https://ossrdbms-aad.database.windows.net'),
+        ossrdbms_resource_id='https://ossrdbms-aad.database.windows.net',
+        app_insights_resource_id='https://api.applicationinsights.io',
+        log_analytics_resource_id='https://api.loganalytics.io'),
     suffixes=CloudSuffixes(
         storage_endpoint='core.windows.net',
         keyvault_dns='.vault.azure.net',
@@ -246,7 +254,9 @@ def __str__(self):
         microsoft_graph_resource_id='https://microsoftgraph.chinacloudapi.cn',
         vm_image_alias_doc='https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-compute/quickstart-templates/aliases.json',  # pylint: disable=line-too-long
         media_resource_id='https://rest.media.chinacloudapi.cn',
-        ossrdbms_resource_id='https://ossrdbms-aad.database.chinacloudapi.cn'),
+        ossrdbms_resource_id='https://ossrdbms-aad.database.chinacloudapi.cn',
+        app_insights_resource_id='https://api.applicationinsights.azure.cn',
+        log_analytics_resource_id='https://api.loganalytics.azure.cn'),
     suffixes=CloudSuffixes(
         storage_endpoint='core.chinacloudapi.cn',
         keyvault_dns='.vault.azure.cn',
@@ -267,7 +277,9 @@ def __str__(self):
         microsoft_graph_resource_id='https://graph.microsoft.us/',
         vm_image_alias_doc='https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-compute/quickstart-templates/aliases.json',  # pylint: disable=line-too-long
         media_resource_id='https://rest.media.usgovcloudapi.net',
-        ossrdbms_resource_id='https://ossrdbms-aad.database.usgovcloudapi.net'),
+        ossrdbms_resource_id='https://ossrdbms-aad.database.usgovcloudapi.net',
+        app_insights_resource_id='https://api.applicationinsights.us',
+        log_analytics_resource_id='https://api.loganalytics.us'),
     suffixes=CloudSuffixes(
         storage_endpoint='core.usgovcloudapi.net',
         keyvault_dns='.vault.usgovcloudapi.net',

src/azure-cli-core/azure/cli/core/commands/__init__.py

@@ -313,7 +313,12 @@ def get_api_version(self, resource_type=None, operation_group=None):
         resource_type = resource_type or self.command_kwargs.get('resource_type', None)
         return self.loader.get_api_version(resource_type=resource_type, operation_group=operation_group)
 
-    def supported_api_version(self, resource_type=None, min_api=None, max_api=None, operation_group=None):
+    def supported_api_version(self, resource_type=None, min_api=None, max_api=None,
+                              operation_group=None, parameter_name=None):
+        if min_api and parameter_name:
+            parameter_name = None
+        if parameter_name is not None and parameter_name in self.arguments:
+            min_api = self.arguments[parameter_name].type.settings.get('min_api', None)
         resource_type = resource_type or self.command_kwargs.get('resource_type', None)
         return self.loader.supported_api_version(resource_type=resource_type, min_api=min_api, max_api=max_api,
                                                  operation_group=operation_group)

src/azure-cli-core/azure/cli/core/commands/constants.py

@@ -3,6 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
+from colorama import Fore, Style
 from knack.parser import ARGPARSE_SUPPORTED_KWARGS
 
 
@@ -29,3 +30,6 @@
 DEFAULT_QUERY_TIME_RANGE = 3600000
 
 BLACKLISTED_MODS = ['context', 'shell', 'documentdb', 'component']
+
+SURVEY_PROMPT = Fore.YELLOW + Style.BRIGHT + 'Please let us know how we are doing: ' + Fore.BLUE \
+    + 'https://aka.ms/clihats' + Style.RESET_ALL

src/azure-cli-core/azure/cli/core/profiles/_shared.py

@@ -134,7 +134,7 @@ def default_api_version(self):
         ResourceType.MGMT_RESOURCE_FEATURES: '2015-12-01',
         ResourceType.MGMT_RESOURCE_LINKS: '2016-09-01',
         ResourceType.MGMT_RESOURCE_LOCKS: '2016-09-01',
-        ResourceType.MGMT_RESOURCE_POLICY: '2019-06-01',
+        ResourceType.MGMT_RESOURCE_POLICY: '2019-09-01',
         ResourceType.MGMT_RESOURCE_RESOURCES: '2019-07-01',
         ResourceType.MGMT_RESOURCE_SUBSCRIPTIONS: '2016-06-01',
         ResourceType.MGMT_NETWORK_DNS: '2018-05-01',

src/azure-cli-core/setup.py

@@ -17,7 +17,7 @@
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.77"
+VERSION = "2.0.78"
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
 try:
@@ -69,7 +69,7 @@
     'requests~=2.20',
     'six~=1.12',
     'wheel==0.30.0',
-    'azure-mgmt-resource~=4.0',
+    'azure-mgmt-resource~=6.0',
 ]
 
 TESTS_REQUIRE = [

src/azure-cli-core/tox.ini

@@ -6,6 +6,6 @@ skip_missing_interpreters = True
 deps = pytest
        mock
        pip
-       azure-mgmt-resource~=4.0.0
+       azure-mgmt-resource~=6.0.0
        -e ../azure-cli-telemetry
 commands = pytest

src/azure-cli/HISTORY.rst

@@ -3,21 +3,76 @@
 Release History
 ===============
 
+
+2.0.78
+++++++
+
 **ACR**
 
 * Support Local context in acr task run
 
+**ACS**
+
+* [BREAKING CHANGE]az openshift create: rename `--workspace-resource-id` to `--workspace-id`.
+
+**AMS**
+
+* Update show commands to return 3 when resource not found
+
+**AppConfig**
+
+* Fix bug when appending api-version to request url. The existing solution doesn't work with pagination.
+* Support showing languages besides English as our backend service support unicode for globalization.
+
 **AppService**
 
 * Fix issue #11217: webapp: az webapp config ssl upload should support slot parameter
+* Fix issue #10965: Error: Name cannot be empty. Allow remove by ip_address and subnet
+* Add support for importing certificates from Key Vault `az webapp config ssl import`
+
+**ARM**
+
+* Update azure-mgmt-resource package to use 6.0.0
+* Cross Tenant Support for `az group deployment create` command by adding new parameter `--aux-subs`
+* Add new parameter `--metadata` to support adding metadata information for policy set definitions.
+
+**Backup**
+
+* Added Backup support for SQL and SAP Hana workload.
+
+**BotService**
+
+* [Breaking change] Remove '--version' flag from preview command 'az bot create'. Only v4 SDK bots are supported.
+* Add name availability check for 'az bot create'.
+* Add support for updating the icon URL for a bot via 'az bot update'.
+* Add support for updating a Direct Line channel via 'az bot directline update'.
+* Add '--enable-enhanced-auth' flag support to 'az bot directline create'.
+* The following command groups are GA and not in preview: 'az bot authsetting'.
+* The following commands in 'az bot' are GA and not in preview: 'create', 'prepare-deploy', 'show', 'delete', 'update'.
+* Fix 'az bot prepare-deploy' changing '--proj-file-path' value to lower case (e.g. "Test.csproj" to "test.csproj").
 
 **Compute**
 
-* vmss create/update: Add --scale-in-policy, which decides which virtual machines are chosen for removal when a VMSS is scaled-in
+* vmss create/update: Add --scale-in-policy, which decides which virtual machines are chosen for removal when a VMSS is scaled-in.
+* vm/vmss update: Add --priority.
+* vm/vmss update: Add --max-price.
+* Add disk-encryption-set command group (create, show, update, delete, list).
+* disk create: Add --encryption-type and --disk-encryption-set.
+* vm/vmss create: Add --os-disk-encryption-set and --data-disk-encryption-sets.
+
+**Cdn**
+
+* Add support for rulesEngine feature
+* Add commands for rule managemnt: 'az cdn endpoint rule'
 
 **Core**
 
 * Remove support for Python 3.4
+* Plug in HaTS survey in multiple commands
+
+**DLS**
+
+* Update ADLS sdk version (0.0.48).
 
 **Install**
 
@@ -29,29 +84,58 @@ Release History
 
 **Key Vault**
 
-* Fix #10846: Calling az keyvault secret show-deleted --id <value> still says secret_name "can not" be none
-* Fix #11084: Confusing encoding information
+* Fix #8095: `az keyvault storage remove`: improve the help message
+* Fix #8921: `az keyvault key/secret/certificate list/list-deleted/list-versions`: fix the validation bug on parameter `--maxresults`
+* Fix #10512: `az keyvault set-policy`: improve the error message when none of `--object-id`, `--spn` or `--upn` is specified
+* Fix #10846: `az keyvault secret show-deleted`: when `--id` is specified, `--name/-n` is not required
+* Fix #11084: `az keyvault secret download`: improve the help message of parameter `--encoding`
 
 **Network**
 
-* az network list-service-aliases: support list service aliases which can be used for Service Endpoint Policies
+* az network application-gateway probe: Support --port option to specify a port for probing backend servers when create and update
+* az network application-gateway url-path-map create/update: bug fix for `--waf-policy`
+* az network application-gateway: support `--rewrite-rule-set`
+* az network list-service-aliases: Support list service aliases which can be used for Service Endpoint Policies
+* az network dns zone import: Support .@ in record name
 
 **Packaging**
 
 * Add back edge builds for pip install
 * Add Ubuntu eoan package
 
+**Policy**
+
+* Support for Policy API version 2019-09-01.
+* az policy set-definition: Support grouping within policy set definitions with `--definition-groups` parameter
+
+**Redis**
+
+* Add preview param `--replicas-per-master` to `az redis create` command
+* Update azure-mgmt-redis from 6.0.0 to 7.0.0rc1
+
+**ServiceFabric**
+
+* Fixes in node-type add logic including #10963: Adding new node type with durability level Gold will always throw CLI error
+* Update ServiceFabricNodeVmExt version to 1.1 in creation template
+
+**SQL**
+
+* Added "--read-scale" and "--read-replicas" parameters to sql db create and update commands, to support read scale management.
+
 **Storage**
 
 * GA Release Large File Shares property for storage account create and update command
 * GA Release User Delegation SAS token Support
+* Add new commands `az storage account blob-service-properties show` and `az storage account blob-service-properties update --enable-change-feed` to manage blob service properties for storage account.
+* [COMING BREAKING CHANGE] `az storage copy`: `*` character is no longer supported as a wildcard in URL, but new parameters --include-pattern and --exclude-pattern will be added with `*` wildcard support.
+* Fix issue #11043: Support to remove whole container/share in `az storage remove` command
 
 2.0.77
 ++++++
 
 **ACR**
 
-* Deprecated paramater `--branch` from acr task create/update
+* Deprecated parameter `--branch` from acr task create/update
 
 **Azure Red Hat OpenShift**
 

src/azure-cli/azure/cli/__init__.py

@@ -11,4 +11,4 @@
 pkg_resources.declare_namespace(__name__)
 
 __author__ = "Microsoft Corporation <[email protected]>"
-__version__ = "2.0.77"
+__version__ = "2.0.78"

src/azure-cli/azure/cli/command_modules/acs/_format.py

@@ -19,7 +19,7 @@ def _aks_agentpool_table_format(result):
     parsed = compile_jmes("""{
         name: name,
         osType: osType,
-        kubernetesVersion: kubernetesVersion,
+        kubernetesVersion: orchestratorVersion,
         vmSize: vmSize,
         osDiskSizeGB: osDiskSizeGB,
         count: count,