Skip to content

[ServiceBus] Fix #24741: Remove invalid arguments for entity update commands #24801

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

Closed
PramodValavala-MSFT wants to merge 1 commit into from
Closed

[ServiceBus] Fix #24741: Remove invalid arguments for entity update commands #24801

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
31 changes: 5 additions & 26 deletions src/azure-cli/azure/cli/command_modules/servicebus/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,10 @@ def cli_sbqueue_create(cmd, client, resource_group_name, namespace_name, queue_n
parameters=queue_params)


def cli_sbqueue_update(instance, lock_duration=None,
max_size_in_megabytes=None, requires_duplicate_detection=None, requires_session=None,
def cli_sbqueue_update(instance, lock_duration=None, max_size_in_megabytes=None,
default_message_time_to_live=None, dead_lettering_on_message_expiration=None,
duplicate_detection_history_time_window=None, max_delivery_count=None, status=None,
auto_delete_on_idle=None, enable_partitioning=None, enable_express=None,
auto_delete_on_idle=None, enable_express=None,
forward_to=None, forward_dead_lettered_messages_to=None, enable_batched_operations=None,
max_message_size_in_kilobytes=None):

Expand All @@ -189,12 +188,6 @@ def cli_sbqueue_update(instance, lock_duration=None,
if max_size_in_megabytes:
instance.max_size_in_megabytes = max_size_in_megabytes

if requires_duplicate_detection is not None:
instance.requires_duplicate_detection = requires_duplicate_detection

if requires_session is not None:
instance.requires_session = requires_session

if default_message_time_to_live:
instance.default_message_time_to_live = return_valid_duration(default_message_time_to_live, instance.default_message_time_to_live)
elif instance.default_message_time_to_live > timedelta(days=DURATION_LIMIT):
Expand All @@ -219,9 +212,6 @@ def cli_sbqueue_update(instance, lock_duration=None,
elif instance.auto_delete_on_idle > timedelta(days=DURATION_LIMIT):
instance.auto_delete_on_idle = None

if enable_partitioning is not None:
instance.enable_partitioning = enable_partitioning

if enable_express is not None:
instance.enable_express = enable_express

Expand Down Expand Up @@ -301,10 +291,9 @@ def cli_sbtopic_create(cmd, client, resource_group_name, namespace_name, topic_n


def cli_sbtopic_update(instance, default_message_time_to_live=None,
max_size_in_megabytes=None, requires_duplicate_detection=None,
duplicate_detection_history_time_window=None,
max_size_in_megabytes=None, duplicate_detection_history_time_window=None,
enable_batched_operations=None, status=None, support_ordering=None, auto_delete_on_idle=None,
enable_partitioning=None, enable_express=None, max_message_size_in_kilobytes=None):
enable_express=None, max_message_size_in_kilobytes=None):

from datetime import timedelta
from azure.cli.command_modules.servicebus.constants import DURATION_LIMIT
Expand All @@ -317,9 +306,6 @@ def cli_sbtopic_update(instance, default_message_time_to_live=None,
if max_size_in_megabytes:
instance.max_size_in_megabytes = max_size_in_megabytes

if requires_duplicate_detection is not None:
instance.requires_duplicate_detection = requires_duplicate_detection

if duplicate_detection_history_time_window:
instance.duplicate_detection_history_time_window = return_valid_duration(duplicate_detection_history_time_window, instance.duplicate_detection_history_time_window)
elif instance.duplicate_detection_history_time_window > timedelta(days=DURATION_LIMIT):
Expand All @@ -339,9 +325,6 @@ def cli_sbtopic_update(instance, default_message_time_to_live=None,
elif instance.auto_delete_on_idle > timedelta(days=DURATION_LIMIT):
instance.auto_delete_on_idle = None

if enable_partitioning is not None:
instance.enable_partitioning = enable_partitioning

if enable_express is not None:
instance.enable_express = enable_express

Expand Down Expand Up @@ -419,8 +402,7 @@ def cli_sbsubscription_create(cmd, client, resource_group_name, namespace_name,
parameters=subscription_params)


def cli_sbsubscription_update(instance, lock_duration=None,
requires_session=None, default_message_time_to_live=None,
def cli_sbsubscription_update(instance, lock_duration=None, default_message_time_to_live=None,
dead_lettering_on_message_expiration=None,
max_delivery_count=None, status=None, enable_batched_operations=None,
auto_delete_on_idle=None, forward_to=None, forward_dead_lettered_messages_to=None, dead_lettering_on_filter_evaluation_exceptions=None):
Expand All @@ -433,9 +415,6 @@ def cli_sbsubscription_update(instance, lock_duration=None,
elif instance.lock_duration > timedelta(days=DURATION_LIMIT):
instance.lock_duration = None

if requires_session is not None:
instance.requires_session = requires_session

if default_message_time_to_live:
instance.default_message_time_to_live = return_valid_duration(default_message_time_to_live, instance.default_message_time_to_live)
elif instance.default_message_time_to_live > timedelta(days=DURATION_LIMIT):
Expand Down