[Storage] Fix #22845: az storage account genarete-sas: Fix the flag --auth-mode login cause AttributeError

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

@@ -7,6 +7,7 @@
 
 import os
 from azure.cli.command_modules.storage._client_factory import storage_client_factory, cf_sa_for_keys
+from azure.cli.command_modules.storage._validators import _query_account_key
 from azure.cli.core.util import get_file_json, shell_safe_json_parse, find_child_item
 from azure.cli.core.profiles import ResourceType, get_sdk
 from knack.log import get_logger
@@ -30,18 +31,23 @@ def regenerate_key(cmd, client, account_name, key_name, resource_group_name=None
 def generate_sas(cmd, client, services, resource_types, permission, expiry, start=None,
                  ip=None, protocol=None, **kwargs):
     from azure.cli.core.azclierror import RequiredArgumentMissingError
-    if not client.account_name or not client.credential or not client.credential.account_key:
-        error_msg = """
-        Missing/Invalid credentials to access storage service. The following variations are accepted:
-            (1) account name and key (--account-name and --account-key options or
-                set AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_KEY environment variables)
-            (2) account name (--account-name option or AZURE_STORAGE_ACCOUNT environment variable;
-                this will make calls to query for a storage account key using login credentials)
-            (3) connection string (--connection-string option or
-                set AZURE_STORAGE_CONNECTION_STRING environment variable); some shells will require
-                quoting to preserve literal character interpretation.
-        """
-        raise RequiredArgumentMissingError(error_msg)
+
+    try:
+        if not client.account_name or not client.credential or not client.credential.account_key:
+            error_msg = """
+            Missing/Invalid credentials to access storage service. The following variations are accepted:
+                (1) account name and key (--account-name and --account-key options or
+                    set AZURE_STORAGE_ACCOUNT and AZURE_STORAGE_KEY environment variables)
+                (2) account name (--account-name option or AZURE_STORAGE_ACCOUNT environment variable;
+                    this will make calls to query for a storage account key using login credentials)
+                (3) connection string (--connection-string option or
+                    set AZURE_STORAGE_CONNECTION_STRING environment variable); some shells will require
+                    quoting to preserve literal character interpretation.
+            """
+            raise RequiredArgumentMissingError(error_msg)
+    except AttributeError:
+        if client.account_name:
+            client.credential.account_key = _query_account_key(cmd.cli_ctx, client.account_name)
 
     t_account_sas = get_sdk(cmd.cli_ctx, ResourceType.DATA_STORAGE_BLOB,
                             '_shared.shared_access_signature#SharedAccessSignature')

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

@@ -1,2 +1,2 @@
 interactions: []
-version: 1
+version: 1