Skip to content

[Storage] WIP: align CLI with storage TypeSpec migration #33310

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

Draft
l0lawrence wants to merge 1 commit into
base: dev
Choose a base branch
from
+8 −8
Draft

[Storage] WIP: align CLI with storage TypeSpec migration #33310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 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 @@ -227,9 +227,9 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem
arg_group='Azure Files Identity Based Authentication',
help='Default share permission for users using Kerberos authentication if RBAC role is not assigned.')

t_blob_tier = self.get_sdk('_generated.models._azure_blob_storage_enums#AccessTierOptional',
t_blob_tier = self.get_sdk('_generated.models._enums#AccessTier',
resource_type=ResourceType.DATA_STORAGE_BLOB)
t_rehydrate_priority = self.get_sdk('_generated.models._azure_blob_storage_enums#RehydratePriority',
t_rehydrate_priority = self.get_sdk('_generated.models._enums#RehydratePriority',
resource_type=ResourceType.DATA_STORAGE_BLOB)
tier_type = CLIArgumentType(
arg_type=get_enum_type(t_blob_tier),
Expand Down Expand Up @@ -922,7 +922,7 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem

with self.argument_context('storage blob list') as c:
from ._validators import get_include_help_string
t_blob_include = self.get_sdk('_generated.models._azure_blob_storage_enums#ListBlobsIncludeItem',
t_blob_include = self.get_sdk('_generated.models._enums#ListBlobsIncludeItem',
resource_type=ResourceType.DATA_STORAGE_BLOB)
c.register_container_arguments()
c.argument('delimiter',
Expand Down Expand Up @@ -1930,7 +1930,7 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem
c.argument('expiry', type=get_datetime_type(True), help='expiration UTC datetime in (Y-m-d\'T\'H:M:S\'Z\')')

with self.argument_context('storage share delete') as c:
t_delete_snapshot = self.get_sdk('_generated.models._azure_file_storage_enums#DeleteSnapshotsOptionType',
t_delete_snapshot = self.get_sdk('_generated.models._enums#DeleteSnapshotsOptionType',
resource_type=ResourceType.DATA_STORAGE_FILESHARE)
c.extra('share_name', share_name_type, options_list=('--name', '-n'), required=True)
c.argument('delete_snapshots', arg_type=get_enum_type(t_delete_snapshot),
Expand Down Expand Up @@ -2086,14 +2086,14 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem
c.extra('group', help='Only applicable to NFS Files. Only work together with parameter '
'`--owner-copy-mode Override`. The owner group identifier (GID) '
'to be set on the directory. The default value is 0 (root group).')
t_file_mode_copy_mode_type = self.get_sdk('_generated.models._azure_file_storage_enums#ModeCopyMode',
t_file_mode_copy_mode_type = self.get_sdk('_generated.models._enums#ModeCopyMode',
resource_type=ResourceType.DATA_STORAGE_FILESHARE)
c.extra('file_mode_copy_mode',
arg_type=get_enum_type(t_file_mode_copy_mode_type),
help='Only applicable to NFS Files. Applicable only when the copy source is a File. '
'Determines the copy behavior of the mode bits of the destination file. '
'If not populated, the destination file will have the default File Mode.')
t_owner_copy_mode_type = self.get_sdk('_generated.models._azure_file_storage_enums#OwnerCopyMode',
t_owner_copy_mode_type = self.get_sdk('_generated.models._enums#OwnerCopyMode',
resource_type=ResourceType.DATA_STORAGE_FILESHARE)
c.extra('owner_copy_mode', arg_type=get_enum_type(t_owner_copy_mode_type),
help='Only applicable to NFS Files. Applicable only when the copy source is a File. '
Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli/azure/cli/command_modules/storage/_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,11 +1400,11 @@ def page_blob_tier_validator_track2(cmd, namespace):

try:
namespace.premium_page_blob_tier = getattr(cmd.get_models(
'_generated.models._azure_blob_storage_enums#PremiumPageBlobAccessTier'), namespace.tier)
'_generated.models._enums#PremiumPageBlobAccessTier'), namespace.tier)
except AttributeError:
from azure.cli.command_modules.storage.sdkutil import get_blob_tier_names_track2
tier_names = get_blob_tier_names_track2(
cmd.cli_ctx, '_generated.models._azure_blob_storage_enums#PremiumPageBlobAccessTier')
cmd.cli_ctx, '_generated.models._enums#PremiumPageBlobAccessTier')
raise ValueError('Unknown premium page blob tier name. Choose among {}'.format(', '.join(tier_names)))


Expand Down
Loading