From 06810531cfbc31c84a24615130129c56a03114bd Mon Sep 17 00:00:00 2001 From: shiyingchen Date: Wed, 1 Feb 2023 17:40:32 +0800 Subject: [PATCH 1/2] remove blob list from storage-preview & storage-blob-preview --- .../azext_storage_blob_preview/_params.py | 20 ---------------- .../azext_storage_blob_preview/commands.py | 3 --- .../operations/blob.py | 24 ------------------- .../azext_storage_preview/_params.py | 4 ---- .../azext_storage_preview/commands.py | 9 ------- .../azext_storage_preview/operations/blob.py | 7 ------ 6 files changed, 67 deletions(-) diff --git a/src/storage-blob-preview/azext_storage_blob_preview/_params.py b/src/storage-blob-preview/azext_storage_blob_preview/_params.py index 3d4dc6a9959..670d6a6cd90 100644 --- a/src/storage-blob-preview/azext_storage_blob_preview/_params.py +++ b/src/storage-blob-preview/azext_storage_blob_preview/_params.py @@ -343,26 +343,6 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem c.extra('lease_id', help='Required if the blob has an active lease.', required=True) c.extra('if_tags_match_condition', tags_condition_type) - with self.argument_context('storage blob list') as c: - from .track2_util import get_include_help_string - t_blob_include = self.get_sdk('_generated.models._azure_blob_storage_enums#ListBlobsIncludeItem', - resource_type=CUSTOM_DATA_STORAGE_BLOB) - c.register_container_arguments() - c.argument('delimiter', - help='When the request includes this parameter, the operation returns a BlobPrefix element in the ' - 'result list that acts as a placeholder for all blobs whose names begin with the same substring ' - 'up to the appearance of the delimiter character. The delimiter may be a single character or a ' - 'string.') - c.argument('include', help="Specify one or more additional datasets to include in the response. " - "Options include: {}. Can be combined.".format(get_include_help_string(t_blob_include)), - validator=validate_included_datasets_v2) - c.argument('marker', arg_type=marker_type) - c.argument('num_results', arg_type=num_results_type) - c.argument('prefix', - help='Filter the results to return only blobs whose name begins with the specified prefix.') - c.argument('show_next_marker', action='store_true', is_preview=True, - help='Show nextMarker in result when specified.') - for item in ['show', 'update']: with self.argument_context('storage blob metadata {}'.format(item), resource_type=CUSTOM_DATA_STORAGE_BLOB) \ as c: diff --git a/src/storage-blob-preview/azext_storage_blob_preview/commands.py b/src/storage-blob-preview/azext_storage_blob_preview/commands.py index eeec5e7f6d6..b461a970a01 100644 --- a/src/storage-blob-preview/azext_storage_blob_preview/commands.py +++ b/src/storage-blob-preview/azext_storage_blob_preview/commands.py @@ -49,9 +49,6 @@ def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.DAT create_boolean_result_output_transformer, transform_blob_list_output from ._validators import (process_blob_download_batch_parameters, process_blob_delete_batch_parameters, process_blob_upload_batch_parameters) - g.storage_custom_command_oauth('list', 'list_blobs', client_factory=cf_container_client, - transform=transform_blob_list_output, - table_transformer=transform_blob_output) g.storage_command_oauth('delete', 'delete_blob') g.storage_custom_command_oauth('download', 'download_blob', transform=transform_blob_json_output) g.storage_command_oauth('exists', 'exists', transform=create_boolean_result_output_transformer('exists')) diff --git a/src/storage-blob-preview/azext_storage_blob_preview/operations/blob.py b/src/storage-blob-preview/azext_storage_blob_preview/operations/blob.py index 1d5881164be..eb86fe57c5f 100644 --- a/src/storage-blob-preview/azext_storage_blob_preview/operations/blob.py +++ b/src/storage-blob-preview/azext_storage_blob_preview/operations/blob.py @@ -536,30 +536,6 @@ def generate_sas_container_uri(client, cmd, container_name, permission=None, return sas_token - -def list_blobs(client, delimiter=None, include=None, marker=None, num_results=None, prefix=None, - show_next_marker=None, **kwargs): - from ..track2_util import list_generator - - if delimiter: - generator = client.walk_blobs(name_starts_with=prefix, include=include, results_per_page=num_results, **kwargs) - else: - generator = client.list_blobs(name_starts_with=prefix, include=include, results_per_page=num_results, **kwargs) - - pages = generator.by_page(continuation_token=marker) # BlobPropertiesPaged - result = list_generator(pages=pages, num_results=num_results) - - if show_next_marker: - next_marker = {"nextMarker": pages.continuation_token} - result.append(next_marker) - else: - if pages.continuation_token: - logger.warning('Next Marker:') - logger.warning(pages.continuation_token) - - return result - - def list_containers(client, include_metadata=False, include_deleted=False, marker=None, num_results=None, prefix=None, show_next_marker=None, **kwargs): from ..track2_util import list_generator diff --git a/src/storage-preview/azext_storage_preview/_params.py b/src/storage-preview/azext_storage_preview/_params.py index 12f95696cd0..70edd99260d 100644 --- a/src/storage-preview/azext_storage_preview/_params.py +++ b/src/storage-preview/azext_storage_preview/_params.py @@ -532,10 +532,6 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem 'the file owning group, and others. Both symbolic (rwxrw-rw-) and 4-digit ' 'octal notation (e.g. 0766) are supported.') - with self.argument_context('storage blob list') as c: - c.argument('include', validator=validate_included_datasets, default='mc') - c.argument('num_results', arg_type=num_results_type) - with self.argument_context('storage blob move') as c: from ._validators import validate_move_file c.argument('source_path', options_list=['--source-blob', '-s'], validator=validate_move_file, diff --git a/src/storage-preview/azext_storage_preview/commands.py b/src/storage-preview/azext_storage_preview/commands.py index 6055163604d..3f55da22e50 100644 --- a/src/storage-preview/azext_storage_preview/commands.py +++ b/src/storage-preview/azext_storage_preview/commands.py @@ -104,15 +104,6 @@ def _adls_deprecate_message(self): msg += " https://github.com/Azure/azure-cli/blob/dev/src/azure-cli/azure/cli/command_modules/storage/docs/ADLS%20Gen2.md" return msg - # Change existing Blob Commands - with self.command_group('storage blob', command_type=adls_base_blob_sdk) as g: - from ._format import transform_blob_output - from ._transformers import transform_storage_list_output - g.storage_command_oauth('list', 'list_blobs', transform=transform_storage_list_output, - table_transformer=transform_blob_output, - deprecate_info=self.deprecate(redirect="az storage fs file list", hide=True, - message_func=_adls_deprecate_message)) - # New Blob Commands with self.command_group('storage blob', command_type=adls_base_blob_sdk, custom_command_type=get_custom_sdk('blob', adls_blob_data_service_factory, diff --git a/src/storage-preview/azext_storage_preview/operations/blob.py b/src/storage-preview/azext_storage_preview/operations/blob.py index e92121695e2..c56a0010e4f 100644 --- a/src/storage-preview/azext_storage_preview/operations/blob.py +++ b/src/storage-preview/azext_storage_preview/operations/blob.py @@ -56,13 +56,6 @@ def delete_directory(client, container_name, directory_name): count += 1 logger.info("Took {} call(s) to finish moving.".format(count)) - -def list_blobs(client, container_name, prefix=None, num_results=None, include='mc', - delimiter=None, marker=None, timeout=None): - client.list_blobs(container_name, prefix, num_results, include, - delimiter, marker, timeout) - - def list_directory(client, container_name, directory_path, prefix=None, num_results=None, include='mc', delimiter=None, marker=None, timeout=None): ''' From 5e71b9f504a38731a192377407850bd080121c1b Mon Sep 17 00:00:00 2001 From: shiyingchen Date: Thu, 2 Feb 2023 11:00:48 +0800 Subject: [PATCH 2/2] add one new line --- .../azext_storage_blob_preview/operations/blob.py | 1 + src/storage-preview/azext_storage_preview/operations/blob.py | 1 + 2 files changed, 2 insertions(+) diff --git a/src/storage-blob-preview/azext_storage_blob_preview/operations/blob.py b/src/storage-blob-preview/azext_storage_blob_preview/operations/blob.py index eb86fe57c5f..725181d9e9a 100644 --- a/src/storage-blob-preview/azext_storage_blob_preview/operations/blob.py +++ b/src/storage-blob-preview/azext_storage_blob_preview/operations/blob.py @@ -536,6 +536,7 @@ def generate_sas_container_uri(client, cmd, container_name, permission=None, return sas_token + def list_containers(client, include_metadata=False, include_deleted=False, marker=None, num_results=None, prefix=None, show_next_marker=None, **kwargs): from ..track2_util import list_generator diff --git a/src/storage-preview/azext_storage_preview/operations/blob.py b/src/storage-preview/azext_storage_preview/operations/blob.py index c56a0010e4f..1523c6b9fdb 100644 --- a/src/storage-preview/azext_storage_preview/operations/blob.py +++ b/src/storage-preview/azext_storage_preview/operations/blob.py @@ -56,6 +56,7 @@ def delete_directory(client, container_name, directory_name): count += 1 logger.info("Took {} call(s) to finish moving.".format(count)) + def list_directory(client, container_name, directory_path, prefix=None, num_results=None, include='mc', delimiter=None, marker=None, timeout=None): '''