Skip to content
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

Jump to bottom

[ServiceBus] add keyword override support to update_ methods in mgmt module #18210

Merged
merged 19 commits into from
May 5, 2021
Merged

[ServiceBus] add keyword override support to update_ methods in mgmt module #18210

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1305015
add keyword override support
yunhaoling Apr 21, 2021
1a6c80e
updat impl
yunhaoling Apr 22, 2021
7b09800
add test and recordings
yunhaoling Apr 22, 2021
8d535cf
version bump, changelog update
yunhaoling Apr 22, 2021
fd4f29b
bug fix log
yunhaoling Apr 22, 2021
c54e4fd
fix pylint
yunhaoling Apr 22, 2021
5e06035
fix pylint and mypy
yunhaoling Apr 22, 2021
ae831d1
pr review feedback
yunhaoling Apr 22, 2021
ff61fc1
Update sdk/servicebus/azure-servicebus/CHANGELOG.md
yunhaoling Apr 23, 2021
a633599
Merge remote-tracking branch 'central/master' into yuling/sb/update_k…
yunhaoling Apr 26, 2021
366a063
Merge branch 'yuling/sb/update_keyword_overrides' of https://github.c…
yunhaoling Apr 26, 2021
3602c2f
Merge remote-tracking branch 'central/master' into yuling/sb/update_k…
yunhaoling Apr 29, 2021
4250615
review feedback
yunhaoling Apr 29, 2021
a55b94e
fix mypy and pylint
yunhaoling Apr 29, 2021
f36310e
fix pylint
yunhaoling Apr 29, 2021
106973d
Merge branch 'master' into yuling/sb/update_keyword_overrides
yunhaoling May 3, 2021
0370d6b
header bearer should use normalized path to generate token instead of…
yunhaoling May 3, 2021
8ff0874
Merge branch 'yuling/sb/update_keyword_overrides' of https://github.c…
yunhaoling May 3, 2021
1f3ffa4
update code snippets to show update keyword argument usage
yunhaoling May 4, 2021
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
Next Next commit
updat impl
  • Loading branch information
@yunhaoling
yunhaoling committed Apr 22, 2021
commit 1a6c80eb048a15717f62e6303740dac0fbbd1b72
16 changes: 9 additions & 7 deletions sdk/servicebus/azure-servicebus/azure/servicebus/aio/management/_management_client_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,8 @@ async def update_queue(
)
)

override_properties_with_keyword_arguments(queue, **kwargs)
property_keyword_arguments = {key: kwargs.pop(key) for key in set(kwargs.keys()) if key in queue.keys()}
swathipil marked this conversation as resolved.
Show resolved Hide resolved
override_properties_with_keyword_arguments(queue, **property_keyword_arguments)
yunhaoling marked this conversation as resolved.
Show resolved Hide resolved

to_update = queue._to_internal_entity()

Expand Down Expand Up @@ -673,7 +674,8 @@ async def update_topic(
"""

topic = deepcopy(create_properties_from_dict_if_needed(topic, TopicProperties))
override_properties_with_keyword_arguments(topic, **kwargs)
property_keyword_arguments = {key: kwargs.pop(key) for key in set(kwargs.keys()) if key in topic.keys()}
override_properties_with_keyword_arguments(topic, **property_keyword_arguments)
to_update = topic._to_internal_entity()

to_update.default_message_time_to_live = avoid_timedelta_overflow( # type: ignore
Expand Down Expand Up @@ -944,10 +946,9 @@ async def update_subscription(
self.fully_qualified_namespace,
)
)
override_properties_with_keyword_arguments(
subscription,
**kwargs
)
property_keyword_arguments = {key: kwargs.pop(key) for key in set(kwargs.keys()) if key in subscription.keys()}
override_properties_with_keyword_arguments(subscription, **property_keyword_arguments)

to_update = subscription._to_internal_entity()

to_update.default_message_time_to_live = avoid_timedelta_overflow( # type: ignore
Expand Down Expand Up @@ -1150,7 +1151,8 @@ async def update_rule(
_validate_topic_and_subscription_types(topic_name, subscription_name)
# we should not mutate the input, making a copy first for update
rule = deepcopy(create_properties_from_dict_if_needed(rule, RuleProperties))
override_properties_with_keyword_arguments(rule, **kwargs)
property_keyword_arguments = {key: kwargs.pop(key) for key in set(kwargs.keys()) if key in rule.keys()}
override_properties_with_keyword_arguments(rule, **property_keyword_arguments)
to_update = rule._to_internal_entity()

create_entity_body = CreateRuleBody(
Expand Down
16 changes: 3 additions & 13 deletions sdk/servicebus/azure-servicebus/azure/servicebus/management/_management_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,10 +431,7 @@ def update_queue(self, queue, **kwargs):
)

property_keyword_arguments = {key: kwargs.pop(key) for key in set(kwargs.keys()) if key in queue.keys()}
override_properties_with_keyword_arguments(
queue,
**property_keyword_arguments
)
override_properties_with_keyword_arguments(queue, **property_keyword_arguments)

to_update = queue._to_internal_entity()
to_update.default_message_time_to_live = avoid_timedelta_overflow(
Expand Down Expand Up @@ -668,10 +665,7 @@ def update_topic(self, topic, **kwargs):
# we should not mutate the input, making a copy first for update
topic = deepcopy(create_properties_from_dict_if_needed(topic, TopicProperties))
property_keyword_arguments = {key: kwargs.pop(key) for key in set(kwargs.keys()) if key in topic.keys()}
override_properties_with_keyword_arguments(
topic,
**property_keyword_arguments
)
override_properties_with_keyword_arguments(topic, **property_keyword_arguments)
to_update = topic._to_internal_entity()

to_update.default_message_time_to_live = avoid_timedelta_overflow( # type: ignore
Expand Down Expand Up @@ -939,7 +933,6 @@ def update_subscription(self, topic_name, subscription, **kwargs):
self.fully_qualified_namespace,
)
)

property_keyword_arguments = {key: kwargs.pop(key) for key in set(kwargs.keys()) if key in subscription.keys()}
override_properties_with_keyword_arguments(subscription, **property_keyword_arguments)

Expand Down Expand Up @@ -1135,10 +1128,7 @@ def update_rule(self, topic_name, subscription_name, rule, **kwargs):
# we should not mutate the input, making a copy first for update
rule = deepcopy(create_properties_from_dict_if_needed(rule, RuleProperties))
property_keyword_arguments = {key: kwargs.pop(key) for key in set(kwargs.keys()) if key in rule.keys()}
override_properties_with_keyword_arguments(
rule,
**property_keyword_arguments
)
override_properties_with_keyword_arguments(rule, **property_keyword_arguments)
to_update = rule._to_internal_entity()

create_entity_body = CreateRuleBody(
Expand Down
6 changes: 3 additions & 3 deletions sdk/servicebus/azure-servicebus/azure/servicebus/management/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,6 @@ def override_properties_with_keyword_arguments(properties, **kwargs):
# type: (PropertiesType, Any) -> None
if not kwargs:
return
intersection_keys = set.intersection(set(properties.keys()), set(kwargs.keys()))
for key in intersection_keys:
properties[key] = kwargs.get(key)
for key in kwargs.keys():
if key in properties.keys():
properties[key] = kwargs.get(key)
swathipil marked this conversation as resolved.
Show resolved Hide resolved