Skip to content

{Storage} Synchronize with extensions #26069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MoChilia merged 2 commits into from
Apr 7, 2023
Merged

{Storage} Synchronize with extensions #26069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62ba7df
register blob arguments with track2 SDK for adding --blob-url
MoChilia Apr 6, 2023
a6ba2f3
sync tests
MoChilia Apr 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/azure-cli/azure/cli/command_modules/storage/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem
c.extra('lease', options_list=['--lease-id'], help='Required if the blob has an active lease.')

with self.argument_context('storage blob exists') as c:
c.register_blob_arguments()
c.register_blob_arguments_track2()
c.extra('snapshot', help='The snapshot parameter is an opaque DateTime value that, when present, '
'specifies the snapshot.')

Expand All @@ -974,13 +974,13 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem
'parameter indicates the snapshot version.')

with self.argument_context('storage blob snapshot') as c:
c.register_blob_arguments()
c.register_blob_arguments_track2()
c.register_precondition_options()
c.extra('lease', options_list=['--lease-id'], help='Required if the blob has an active lease.')

with self.argument_context('storage blob set-tier') as c:
from azure.cli.command_modules.storage._validators import (blob_rehydrate_priority_validator)
c.register_blob_arguments()
c.register_blob_arguments_track2()

c.argument('blob_type', options_list=('--type', '-t'), arg_type=get_enum_type(('block', 'page')))
c.argument('tier', validator=blob_tier_validator)
Expand Down Expand Up @@ -1023,7 +1023,7 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem

for item in ['show', 'metadata show', 'metadata update']:
with self.argument_context('storage blob {}'.format(item)) as c:
c.register_blob_arguments()
c.register_blob_arguments_track2()
c.register_precondition_options()
c.extra('snapshot', help='The snapshot parameter is an opaque DateTime value that, when present, '
'specifies the blob snapshot to retrieve.')
Expand Down Expand Up @@ -1148,7 +1148,7 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem

with self.argument_context('storage blob delete') as c:
from .sdkutil import get_delete_blob_snapshot_type_names
c.register_blob_arguments()
c.register_blob_arguments_track2()
c.register_precondition_options()
c.argument('delete_snapshots', arg_type=get_enum_type(get_delete_blob_snapshot_type_names()),
help='Required if the blob has associated snapshots. '
Expand All @@ -1159,7 +1159,7 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem
'specifies the blob snapshot to delete.')

with self.argument_context('storage blob undelete') as c:
c.register_blob_arguments()
c.register_blob_arguments_track2()

with self.argument_context('storage blob delete-batch') as c:
c.ignore('source_container_name')
Expand Down Expand Up @@ -1358,7 +1358,7 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem

with self.argument_context('storage blob query') as c:
from ._validators import validate_text_configuration
c.register_blob_arguments()
c.register_blob_arguments_track2()
c.register_precondition_options()
line_separator = CLIArgumentType(help="The string used to separate records.", default='\n')
column_separator = CLIArgumentType(help="The string used to separate columns.", default=',')
Expand Down
3 changes: 1 addition & 2 deletions src/azure-cli/azure/cli/command_modules/storage/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,7 @@ def get_custom_sdk(custom_module, client_factory, resource_type=ResourceType.DAT
g.storage_command_oauth('metadata update', 'set_blob_metadata')
g.storage_command_oauth('snapshot', 'create_snapshot')
g.storage_command_oauth('update', 'set_http_headers')
g.storage_custom_command_oauth('exists', 'exists', client_factory=cf_blob_service,
transform=create_boolean_result_output_transformer('exists'))
g.storage_command_oauth('exists', 'exists', transform=create_boolean_result_output_transformer('exists'))
g.storage_command_oauth('delete', 'delete_blob')
g.storage_command_oauth('undelete', 'undelete_blob',
transform=create_boolean_result_output_transformer('undeleted'),
Expand Down
Loading