Merge branch 'dev' of https://github.com/Azure/azure-cli into 34595145-infra-upgrade-pools-to-ubuntu2404

Author: DanielMicrosoft

src/azure-cli/azure/cli/command_modules/resource/_utils.py

@@ -87,12 +87,7 @@ def _build_preflight_error_message(preflight_error):
 
 
 def _build_http_response_error_message(http_error):
-    from azure.core.exceptions import StreamClosedError, StreamConsumedError
-    try:
-        error_txt = http_error.response.internal_response.text
-        error_info = json.loads(error_txt)['error']
-    except (StreamClosedError, StreamConsumedError):
-        error_info = http_error.response.json()['error']
+    error_info = http_error.response.json()['error']
     error_details = error_info.pop('details') if 'details' in error_info else []
     err_messages = [f'{json.dumps(error_info)}']
 

src/azure-cli/azure/cli/command_modules/storage/_params.py

@@ -794,6 +794,8 @@ def load_arguments(self, _):  # pylint: disable=too-many-locals, too-many-statem
         c.argument('properties', or_policy_type, validator=validate_or_policy)
         c.argument('prefix_match', prefix_math_type)
         c.argument('min_creation_time', min_creation_time_type)
+        c.argument('enable_metrics', arg_type=get_three_state_flag(),
+                   help='Indicates whether object replication metrics feature is enabled for the policy.')
 
     for item in ['create', 'update']:
         with self.argument_context('storage account or-policy {}'.format(item),

src/azure-cli/azure/cli/command_modules/storage/commands.py

@@ -213,7 +213,7 @@ def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.MGM
         operations_tmpl='azure.cli.command_modules.storage.operations.account#{}',
         client_factory=cf_or_policy)
 
-    with self.command_group('storage account or-policy', or_policy_sdk, is_preview=True,
+    with self.command_group('storage account or-policy', or_policy_sdk,
                             resource_type=ResourceType.MGMT_STORAGE,
                             custom_command_type=or_policy_custom_type) as g:
         g.show_command('show', 'get')
@@ -222,7 +222,7 @@ def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.MGM
         g.generic_update_command('update', setter_name='update_or_policy', setter_type=or_policy_custom_type)
         g.command('delete', 'delete')
 
-    with self.command_group('storage account or-policy rule', or_policy_sdk, is_preview=True,
+    with self.command_group('storage account or-policy rule', or_policy_sdk,
                             resource_type=ResourceType.MGMT_STORAGE,
                             custom_command_type=or_policy_custom_type) as g:
         g.custom_show_command('show', 'get_or_rule')

src/azure-cli/azure/cli/command_modules/storage/operations/account.py

@@ -988,14 +988,15 @@ def list_encryption_scope(client, resource_group_name, account_name,
 # pylint: disable=no-member
 def create_or_policy(cmd, client, account_name, resource_group_name=None, properties=None, source_account=None,
                      destination_account=None, policy_id="default", rule_id=None, source_container=None,
-                     destination_container=None, min_creation_time=None, prefix_match=None):
+                     destination_container=None, min_creation_time=None, prefix_match=None, enable_metrics=None):
     from azure.core.exceptions import HttpResponseError
     ObjectReplicationPolicy = cmd.get_models('ObjectReplicationPolicy')
 
     if properties is None:
         rules = []
-        ObjectReplicationPolicyRule, ObjectReplicationPolicyFilter = \
-            cmd.get_models('ObjectReplicationPolicyRule', 'ObjectReplicationPolicyFilter')
+        ObjectReplicationPolicyRule, ObjectReplicationPolicyFilter, ObjectReplicationPolicyPropertiesMetrics = \
+            cmd.get_models('ObjectReplicationPolicyRule', 'ObjectReplicationPolicyFilter',
+                           'ObjectReplicationPolicyPropertiesMetrics')
         if source_container and destination_container:
             rule = ObjectReplicationPolicyRule(
                 rule_id=rule_id,
@@ -1006,7 +1007,8 @@ def create_or_policy(cmd, client, account_name, resource_group_name=None, proper
             rules.append(rule)
         or_policy = ObjectReplicationPolicy(source_account=source_account,
                                             destination_account=destination_account,
-                                            rules=rules)
+                                            rules=rules,
+                                            metrics=ObjectReplicationPolicyPropertiesMetrics(enabled=enable_metrics))
     else:
         or_policy = properties
     try:
@@ -1021,8 +1023,8 @@ def create_or_policy(cmd, client, account_name, resource_group_name=None, proper
         raise ex
 
 
-def update_or_policy(client, parameters, resource_group_name, account_name, object_replication_policy_id=None,
-                     properties=None, source_account=None, destination_account=None, ):
+def update_or_policy(cmd, client, parameters, resource_group_name, account_name, object_replication_policy_id=None,
+                     properties=None, source_account=None, destination_account=None, enable_metrics=None):
 
     if source_account is not None:
         parameters.source_account = source_account
@@ -1034,6 +1036,10 @@ def update_or_policy(client, parameters, resource_group_name, account_name, obje
         if "policyId" in properties.keys() and properties["policyId"]:
             object_replication_policy_id = properties["policyId"]
 
+    if enable_metrics is not None:
+        ObjectReplicationPolicyPropertiesMetrics = cmd.get_models('ObjectReplicationPolicyPropertiesMetrics')
+        parameters.metrics = ObjectReplicationPolicyPropertiesMetrics(enabled=enable_metrics)
+
     return client.create_or_update(resource_group_name=resource_group_name, account_name=account_name,
                                    object_replication_policy_id=object_replication_policy_id, properties=parameters)
 

src/azure-cli/azure/cli/command_modules/storage/tests/latest/recordings/test_storage_account_or_policy.yaml

@@ -2417,16 +2417,20 @@ def test_storage_account_or_policy(self, resource_group, source_account, destina
 
         # Create ORS policy on destination account
         result = self.cmd('storage account or-policy create -n {dest_sc} -s {src_sc} --dcont {dcont} '
-                          '--scont {scont} -t "2020-02-19T16:05:00Z"').get_output_in_json()
+                          '--scont {scont} -t "2020-02-19T16:05:00Z" --enable-metrics True').get_output_in_json()
         self.assertIn('policyId', result)
         self.assertIn('ruleId', result['rules'][0])
         self.assertEqual(result["rules"][0]["filters"]["minCreationTime"], "2020-02-19T16:05:00Z")
+        self.assertEqual(result["metrics"]["enabled"], True)
 
         self.kwargs.update({
             'policy_id': result["policyId"],
             'rule_id': result["rules"][0]["ruleId"]
         })
 
+        self.cmd('storage account or-policy update -g {rg} -n {dest_sc} -s {src_sc} --policy-id {policy_id} '
+                 '--enable-metrics False', checks=[JMESPathCheck('metrics.enabled', False)])
+
         # Get policy properties from destination account
         self.cmd('storage account or-policy show -g {rg} -n {dest_sc} --policy-id {policy_id}') \
             .assert_with_checks(JMESPathCheck('type', "Microsoft.Storage/storageAccounts/objectReplicationPolicies")) \

src/azure-cli/azure/cli/command_modules/storage/tests/latest/test_storage_account_scenarios.py

@@ -133,7 +133,7 @@ def _match_location(loc, locations):
 
 
 # pylint: disable=line-too-long
-def is_sku_available(cmd, sku_info, zone):
+def is_sku_available(sku_info, zone):
     """
     The SKU is unavailable in the following cases:
     1. regional restriction and the region is restricted
@@ -146,16 +146,12 @@ def is_sku_available(cmd, sku_info, zone):
     if not sku_info.get('restrictions', []):
         return is_available
     for restriction in sku_info['restrictions']:
-        if restriction.get('reason_code', '') == 'NotAvailableForSubscription':
-            # The attribute location_info is not supported in versions 2017-03-30 and earlier
-            if cmd.supported_api_version(max_api='2017-03-30'):
-                is_available = False
-                break
+        if restriction.get('reasonCode', '') == 'NotAvailableForSubscription':
             if restriction['type'] == 'Zone' and not (
-                    set(sku_info['location_info'][0].get('zones', []) or []) - set(restriction['restriction_info'].get('zones', []) or [])):
+                    set(sku_info['locationInfo'][0].get('zones', []) or []) - set(restriction['restrictionInfo'].get('zones', []) or [])):
                 is_restrict_zone = True
             if restriction['type'] == 'Location' and (
-                    sku_info['location_info'][0]['location'] in (restriction['restriction_info'].get('locations', []) or [])):
+                    sku_info['locationInfo'][0]['location'] in (restriction['restrictionInfo'].get('locations', []) or [])):
                 is_restrict_location = True
 
             if is_restrict_location or (is_restrict_zone and zone):

src/azure-cli/azure/cli/command_modules/vm/_vm_utils.py

@@ -1349,7 +1349,7 @@ def list_skus(cmd, location=None, size=None, zone=None, show_all=None, resource_
     if not show_all:
         available_skus = []
         for sku_info in result:
-            if is_sku_available(cmd, sku_info, zone):
+            if is_sku_available(sku_info, zone):
                 available_skus.append(sku_info)
         result = available_skus
     if resource_type:

src/azure-cli/azure/cli/command_modules/vm/custom.py

@@ -2299,47 +2299,47 @@ def test_list_compute_skus_partially_unavailable(self, client_factory_mock):
         restriction_info_zone = mock.MagicMock()
         restriction_info_zone.zones = [1, 2, 3]
         restriction_zone = mock.MagicMock()
-        restriction_zone.reason_code = 'NotAvailableForSubscription'
+        restriction_zone.reasonCode = 'NotAvailableForSubscription'
         restriction_zone.type = 'Zone'
-        restriction_zone.restriction_info = restriction_info_zone
+        restriction_zone.restrictionInfo = restriction_info_zone
         restriction_info_location = mock.MagicMock()
         restriction_info_location.locations = ['location']
         restriction_location = mock.MagicMock()
-        restriction_location.reason_code = 'NotAvailableForSubscription'
+        restriction_location.reasonCode = 'NotAvailableForSubscription'
         restriction_location.type = 'Location'
-        restriction_location.restriction_info = restriction_info_location
+        restriction_location.restrictionInfo = restriction_info_location
 
         # zonal restriction but not regional restriction
         restrictions = [restriction_zone]
         np.restrictions = restrictions
         # show skus supporting availability zones
-        is_available = is_sku_available(cmd, np, True)
+        is_available = is_sku_available(np, True)
         self.assertFalse(is_available)
         # not show skus supporting availability zones
-        is_available = is_sku_available(cmd, np, None)
+        is_available = is_sku_available(np, None)
         self.assertTrue(is_available)
 
         # not all zones are restricted
         restriction_info_zone.zones = [1, 2]
-        is_available = is_sku_available(cmd, np, True)
+        is_available = is_sku_available(np, True)
         self.assertTrue(is_available)
-        is_available = is_sku_available(cmd, np, None)
+        is_available = is_sku_available(np, None)
         self.assertTrue(is_available)
 
         # regional restriction but not zonal restriction
         restrictions = [restriction_location]
         np.restrictions = restrictions
-        is_available = is_sku_available(cmd, np, True)
+        is_available = is_sku_available(np, True)
         self.assertFalse(is_available)
-        is_available = is_sku_available(cmd, np, None)
+        is_available = is_sku_available(np, None)
         self.assertFalse(is_available)
 
         # regional restriction and zonal restriction
         restrictions = [restriction_location, restriction_zone]
         np.restrictions = restrictions
-        is_available = is_sku_available(cmd, np, True)
+        is_available = is_sku_available(np, True)
         self.assertFalse(is_available)
-        is_available = is_sku_available(cmd, np, None)
+        is_available = is_sku_available(np, None)
         self.assertFalse(is_available)