{Storage} Fix secondary storage account read access (#14605)

* fix second

* fix test

Author: Juliehzl

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

@@ -174,7 +174,8 @@ def _get_mgmt_service_client(cli_ctx,
 
 
 def get_data_service_client(cli_ctx, service_type, account_name, account_key, connection_string=None,
-                            sas_token=None, socket_timeout=None, token_credential=None, endpoint_suffix=None):
+                            sas_token=None, socket_timeout=None, token_credential=None, endpoint_suffix=None,
+                            location_mode=None):
     logger.debug('Getting data service client service_type=%s', service_type.__name__)
     try:
         client_kwargs = {'account_name': account_name,
@@ -188,6 +189,8 @@ def get_data_service_client(cli_ctx, service_type, account_name, account_key, co
         if endpoint_suffix:
             client_kwargs['endpoint_suffix'] = endpoint_suffix
         client = service_type(**client_kwargs)
+        if location_mode:
+            client.location_mode = location_mode
     except ValueError as exc:
         _ERROR_STORAGE_MISSING_INFO = get_sdk(cli_ctx, ResourceType.DATA_STORAGE,
                                               'common._error#_ERROR_STORAGE_MISSING_INFO')

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

@@ -23,18 +23,19 @@
 
 
 def get_storage_data_service_client(cli_ctx, service, name=None, key=None, connection_string=None, sas_token=None,
-                                    socket_timeout=None, token_credential=None):
+                                    socket_timeout=None, token_credential=None, location_mode=None):
     return get_data_service_client(cli_ctx, service, name, key, connection_string, sas_token,
                                    socket_timeout=socket_timeout,
                                    token_credential=token_credential,
-                                   endpoint_suffix=cli_ctx.cloud.suffixes.storage_endpoint)
+                                   endpoint_suffix=cli_ctx.cloud.suffixes.storage_endpoint,
+                                   location_mode=location_mode)
 
 
 def generic_data_service_factory(cli_ctx, service, name=None, key=None, connection_string=None, sas_token=None,
-                                 socket_timeout=None, token_credential=None):
+                                 socket_timeout=None, token_credential=None, location_mode=None):
     try:
         return get_storage_data_service_client(cli_ctx, service, name, key, connection_string, sas_token,
-                                               socket_timeout, token_credential)
+                                               socket_timeout, token_credential, location_mode=location_mode)
     except ValueError as val_exception:
         _ERROR_STORAGE_MISSING_INFO = get_sdk(cli_ctx, ResourceType.DATA_STORAGE,
                                               'common._error#_ERROR_STORAGE_MISSING_INFO')
@@ -78,7 +79,8 @@ def blob_data_service_factory(cli_ctx, kwargs):
                                         connection_string=kwargs.pop('connection_string', None),
                                         sas_token=kwargs.pop('sas_token', None),
                                         socket_timeout=kwargs.pop('socket_timeout', None),
-                                        token_credential=kwargs.pop('token_credential', None))
+                                        token_credential=kwargs.pop('token_credential', None),
+                                        location_mode=kwargs.pop('location_mode', None))
 
 
 def table_data_service_factory(cli_ctx, kwargs):

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

@@ -168,6 +168,11 @@ def validate_client_parameters(cmd, namespace):
     if n.sas_token:
         n.sas_token = n.sas_token.lstrip('?')
 
+    # account name with secondary
+    if n.account_name and n.account_name.endswith('-secondary'):
+        n.location_mode = 'secondary'
+        n.account_name = n.account_name[:-10]
+
     # if account name is specified but no key, attempt to query
     if n.account_name and not n.account_key and not n.sas_token:
         logger.warning('There is no credential provided in your command and environment, we will query account key '