fix queue issue to directly use azure-storage-queue sdk, not multiapi repo sdk. This is since the path in the queue sdk is hardcoded, multiapi wrap would not work

calvinhzy · calvinhzy · commit 5f986c8db670 · 2025-12-10T10:31:06.000+08:00
diff --git a/src/azure-cli-core/azure/cli/core/profiles/_shared.py b/src/azure-cli-core/azure/cli/core/profiles/_shared.py
@@ -118,7 +118,7 @@ class ResourceType(Enum):  # pylint: disable=too-few-public-methods
     DATA_STORAGE_BLOB = ('azure.multiapi.storagev2.blob', None)
     DATA_STORAGE_FILEDATALAKE = ('azure.multiapi.storagev2.filedatalake', None)
     DATA_STORAGE_FILESHARE = ('azure.multiapi.storagev2.fileshare', None)
-    DATA_STORAGE_QUEUE = ('azure.multiapi.storagev2.queue', None)
+    DATA_STORAGE_QUEUE = ('azure.storage.queue', None)
     DATA_STORAGE_TABLE = ('azure.data.tables', None)
     DATA_BATCH = ('azure.batch', None)
 
@@ -207,7 +207,7 @@ def default_api_version(self):
         ResourceType.DATA_STORAGE_BLOB: '2026-02-06',
         ResourceType.DATA_STORAGE_FILEDATALAKE: '2026-02-06',
         ResourceType.DATA_STORAGE_FILESHARE: '2026-02-06',
-        ResourceType.DATA_STORAGE_QUEUE: '2026-02-06',
+        ResourceType.DATA_STORAGE_QUEUE: None,
         ResourceType.DATA_STORAGE_TABLE: None,
         ResourceType.MGMT_SERVICEBUS: None,
         ResourceType.MGMT_EVENTHUB: None,
diff --git a/src/azure-cli/azure/cli/command_modules/storage/commands.py b/src/azure-cli/azure/cli/command_modules/storage/commands.py
@@ -711,13 +711,13 @@ def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.MGM
                           transform=transform_cors_list_output)
 
     queue_client_sdk = CliCommandType(
-        operations_tmpl='azure.multiapi.storagev2.queue._queue_client#QueueClient.{}',
+        operations_tmpl='azure.storage.queue._queue_client#QueueClient.{}',
         client_factory=cf_queue_client, resource_type=ResourceType.DATA_STORAGE_QUEUE)
 
     with self.command_group('storage queue', command_type=queue_client_sdk, is_preview=True,
                             custom_command_type=get_custom_sdk('queue', cf_queue_client,
                                                                ResourceType.DATA_STORAGE_QUEUE),
-                            resource_type=ResourceType.DATA_STORAGE_QUEUE, min_api='2018-03-28') as g:
+                            resource_type=ResourceType.DATA_STORAGE_QUEUE) as g:
         from ._format import transform_boolean_for_table
         from ._transformers import create_boolean_result_output_transformer
 
@@ -741,7 +741,7 @@ def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.MGM
     with self.command_group('storage queue policy', command_type=queue_client_sdk, is_preview=True,
                             custom_command_type=get_custom_sdk('access_policy', cf_queue_client,
                                                                ResourceType.DATA_STORAGE_QUEUE),
-                            resource_type=ResourceType.DATA_STORAGE_QUEUE, min_api='2018-03-28') as g:
+                            resource_type=ResourceType.DATA_STORAGE_QUEUE) as g:
         from ._transformers import (transform_acl_list_output, transform_queue_policy_output,
                                     transform_queue_policy_json_output)
         g.storage_custom_command_oauth('create', 'create_acl_policy')
@@ -757,7 +757,7 @@ def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.MGM
     with self.command_group('storage message', command_type=queue_client_sdk, is_preview=True,
                             custom_command_type=get_custom_sdk('queue', cf_queue_client,
                                                                ResourceType.DATA_STORAGE_QUEUE),
-                            resource_type=ResourceType.DATA_STORAGE_QUEUE, min_api='2018-03-28') as g:
+                            resource_type=ResourceType.DATA_STORAGE_QUEUE) as g:
         from ._transformers import (transform_message_list_output, transform_message_output)
         from ._format import transform_message_show
 
@@ -773,13 +773,13 @@ def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.MGM
         g.storage_command_oauth('update', 'update_message', transform=transform_message_output)
 
     queue_service_sdk = CliCommandType(
-        operations_tmpl='azure.multiapi.storagev2.queue._queue_service_client#QueueServiceClient.{}',
+        operations_tmpl='azure.storage.queue._queue_service_client#QueueServiceClient.{}',
         client_factory=cf_queue_service, resource_type=ResourceType.DATA_STORAGE_QUEUE)
 
     with self.command_group('storage queue', command_type=queue_service_sdk, is_preview=True,
                             custom_command_type=get_custom_sdk('queue', cf_queue_service,
                                                                ResourceType.DATA_STORAGE_QUEUE),
-                            resource_type=ResourceType.DATA_STORAGE_QUEUE, min_api='2018-03-28') as g:
+                            resource_type=ResourceType.DATA_STORAGE_QUEUE) as g:
         from ._transformers import transform_queue_stats_output
         g.storage_command_oauth('stats', 'get_service_stats', transform=transform_queue_stats_output)
         g.storage_custom_command_oauth('list', 'list_queues', transform=transform_storage_list_output)
diff --git a/src/azure-cli/requirements.py3.Darwin.txt b/src/azure-cli/requirements.py3.Darwin.txt
@@ -86,6 +86,7 @@ azure-monitor-query==1.2.0
 azure-multiapi-storage==1.7.0b1
 azure-nspkg==3.0.2
 azure-storage-common==1.4.2
+azure-storage-queue==12.15.0b1
 azure-synapse-accesscontrol==0.5.0
 azure-synapse-artifacts==0.21.0
 azure-synapse-managedprivateendpoints==0.4.0
diff --git a/src/azure-cli/requirements.py3.Linux.txt b/src/azure-cli/requirements.py3.Linux.txt
@@ -86,6 +86,7 @@ azure-monitor-query==1.2.0
 azure-multiapi-storage==1.7.0b1
 azure-nspkg==3.0.2
 azure-storage-common==1.4.2
+azure-storage-queue==12.15.0b1
 azure-synapse-accesscontrol==0.5.0
 azure-synapse-artifacts==0.21.0
 azure-synapse-managedprivateendpoints==0.4.0
diff --git a/src/azure-cli/requirements.py3.windows.txt b/src/azure-cli/requirements.py3.windows.txt
@@ -86,6 +86,7 @@ azure-monitor-query==1.2.0
 azure-multiapi-storage==1.7.0b1
 azure-nspkg==3.0.2
 azure-storage-common==1.4.2
+azure-storage-queue==12.15.0b1
 azure-synapse-accesscontrol==0.5.0
 azure-synapse-artifacts==0.21.0
 azure-synapse-managedprivateendpoints==0.4.0
diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py
@@ -129,6 +129,7 @@
     'azure-monitor-query==1.2.0',
     'azure-multiapi-storage==1.7.0b1',
     'azure-storage-common~=1.4',
+    'azure-storage-queue==12.15.0b1',
     'azure-synapse-accesscontrol~=0.5.0',
     'azure-synapse-artifacts~=0.21.0',
     'azure-synapse-managedprivateendpoints~=0.4.0',
