Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Address review comments
  • Loading branch information
VidyaKukke committed Mar 26, 2021
commit 310efdf0221fa7ed0ce0cbcd17256410004e3e45
20 changes: 9 additions & 11 deletions src/azure-cli/azure/cli/command_modules/eventgrid/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -973,9 +973,6 @@ def _get_event_subscription_info( # pylint: disable=too-many-locals,too-many-
storage_queue_msg_ttl is not None:
raise CLIError('usage error: --storage-queue-msg-ttl is only applicable for endpoint type StorageQueue.')

if storage_queue_msg_ttl is not None:
storage_queue_msg_ttl = storage_queue_msg_ttl

destination = None
if endpoint is not None:
destination = _get_endpoint_destination(
Expand Down Expand Up @@ -1273,9 +1270,6 @@ def _update_event_subscription_internal( # pylint: disable=too-many-locals,too-
if endpoint_type.lower() != WEBHOOK_DESTINATION.lower() and endpoint is None:
raise CLIError('Invalid usage: Since --endpoint-type is specified, a valid endpoint must also be specified.')

if storage_queue_msg_ttl is not None:
storage_queue_msg_ttl = storage_queue_msg_ttl

tennant_id = None
application_id = None

Expand Down Expand Up @@ -1422,11 +1416,15 @@ def _get_storage_queue_destination(endpoint, storage_queue_msg_ttl):
'/subscriptions/id/resourceGroups/rg/providers/Microsoft.Storage/' +
'storageAccounts/sa1/queueServices/default/queues/queueName')

destination = StorageQueueEventSubscriptionDestination(
resource_id=queue_items[0],
queue_name=queue_items[1],
queue_message_time_to_live_in_seconds=storage_queue_msg_ttl)

if storage_queue_msg_ttl is not None:
destination = StorageQueueEventSubscriptionDestination(
resource_id=queue_items[0],
queue_name=queue_items[1],
queue_message_time_to_live_in_seconds=storage_queue_msg_ttl)
else:
destination = StorageQueueEventSubscriptionDestination(
resource_id=queue_items[0],
queue_name=queue_items[1])
return destination


Expand Down