Skip to content

[Storage] az storage account file-service-properties update: Add --require-smb-encryption-in-transit and --require-nfs-encryption-in-transit #32619

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
calvinhzy merged 3 commits into from
Jan 13, 2026
+467 −5
Merged

[Storage] az storage account file-service-properties update: Add --require-smb-encryption-in-transit and --require-nfs-encryption-in-transit #32619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c4d41b
`az storage account file-service-properties update`: add ``--require-…
calvinhzy Jan 8, 2026
db7b0c7
Update src/azure-cli/azure/cli/command_modules/storage/operations/acc…
calvinhzy Jan 12, 2026
3131329
simplify code according to pr review
calvinhzy Jan 12, 2026
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
6 changes: 6 additions & 0 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 @@ -762,6 +762,12 @@ def load_arguments(self, _): # pylint: disable=too-many-locals, too-many-statem
c.argument('channel_encryption', arg_group='SMB Setting',
help="SMB channel encryption supported by server. Valid values are AES-128-CCM, AES-128-GCM, "
"AES-256-GCM. Should be passed as a string with delimiter ';' ")
c.argument('require_smb_encryption_in_transit', arg_group='SMB Setting',
arg_type=get_three_state_flag(), options_list=['--require-smb-encryption-in-transit', '--smb-eit'],
help="Whether SMB Encryption in transit is required.")
c.argument('require_nfs_encryption_in_transit', arg_group='NFS Setting',
arg_type=get_three_state_flag(), options_list=['--require-nfs-encryption-in-transit', '--nfs-eit'],
help="Whether NFS Encryption in transit is required.")

with self.argument_context('storage account generate-sas', resource_type=ResourceType.DATA_STORAGE_BLOB) as c:
t_account_permissions = self.get_sdk('_shared.models#AccountSasPermissions',
Expand Down
25 changes: 20 additions & 5 deletions src/azure-cli/azure/cli/command_modules/storage/operations/account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,7 +931,8 @@ def update_blob_service_properties(cmd, instance, enable_change_feed=None, chang
def update_file_service_properties(cmd, instance, enable_delete_retention=None,
delete_retention_days=None, enable_smb_multichannel=None,
versions=None, authentication_methods=None, kerberos_ticket_encryption=None,
channel_encryption=None):
channel_encryption=None, require_smb_encryption_in_transit=None,
require_nfs_encryption_in_transit=None):
from azure.cli.core.azclierror import ValidationError
params = {}
# set delete retention policy according input
Expand All @@ -958,11 +959,18 @@ def update_file_service_properties(cmd, instance, enable_delete_retention=None,
params['share_delete_retention_policy'] = instance.share_delete_retention_policy

# set protocol settings
if not instance.protocol_settings or not instance.protocol_settings.smb:
instance.protocol_settings = cmd.get_models('ProtocolSettings')(smb=cmd.get_models('SmbSetting')())
smbSetting = cmd.get_models('SmbSetting')
nfsSetting = cmd.get_models('NfsSetting')
if not instance.protocol_settings:
instance.protocol_settings = cmd.get_models('ProtocolSettings')(smb=smbSetting(), nfs=nfsSetting())
else:
if not instance.protocol_settings.smb:
instance.protocol_settings.smb = smbSetting()
if not instance.protocol_settings.nfs:
instance.protocol_settings.nfs = nfsSetting()

if enable_smb_multichannel is not None:
instance.protocol_settings.smb.multichannel = cmd.get_models('Multichannel')(enabled=enable_smb_multichannel)

if versions is not None:
instance.protocol_settings.smb.versions = versions
if authentication_methods is not None:
Expand All @@ -971,7 +979,14 @@ def update_file_service_properties(cmd, instance, enable_delete_retention=None,
instance.protocol_settings.smb.kerberos_ticket_encryption = kerberos_ticket_encryption
if channel_encryption is not None:
instance.protocol_settings.smb.channel_encryption = channel_encryption
if instance.protocol_settings and instance.protocol_settings.smb and any(instance.protocol_settings.smb.__dict__.values()):
if require_smb_encryption_in_transit is not None:
instance.protocol_settings.smb.encryption_in_transit = (
cmd.get_models('EncryptionInTransit')(required=require_smb_encryption_in_transit))
if require_nfs_encryption_in_transit is not None:
instance.protocol_settings.nfs.encryption_in_transit = (
cmd.get_models('EncryptionInTransit')(required=require_nfs_encryption_in_transit))

if any(instance.protocol_settings.smb.__dict__.values()) or any(instance.protocol_settings.nfs.__dict__.values()):
params['protocol_settings'] = instance.protocol_settings

return params
Expand Down
Loading