From cd37161b28e56bfa805c8a00615a7e5cac073ab0 Mon Sep 17 00:00:00 2001 From: l0lawrence Date: Fri, 5 Apr 2024 15:28:32 -0700 Subject: [PATCH] shorten operation names --- sdk/eventgrid/azure-eventgrid/README.md | 12 +++++----- .../azure/eventgrid/_operations/_patch.py | 10 ++++----- .../azure/eventgrid/aio/_operations/_patch.py | 10 ++++----- .../sample_acknowledge_operation_async.py | 2 +- .../sample_all_operations_async.py | 8 +++---- .../sample_binary_mode_async.py | 2 +- .../sample_publish_receive_renew_async.py | 4 ++-- .../sample_publish_release_receive_async.py | 8 +++---- .../sample_receive_operation_async.py | 2 +- .../sample_reject_operation_async.py | 2 +- .../sample_release_operation_async.py | 2 +- .../sample_renew_locks_operation_async.py | 2 +- .../sample_acknowledge_operation.py | 2 +- .../sample_all_operations.py | 8 +++---- .../sample_binary_mode.py | 2 +- .../sample_publish_receive_renew.py | 4 ++-- .../sample_publish_release_receive.py | 8 +++---- .../sample_receive_operation.py | 2 +- .../sample_reject_operation.py | 2 +- .../sample_release_operation.py | 2 +- .../sample_renew_locks_operation.py | 2 +- .../azure-eventgrid/tests/test_dual_client.py | 4 ++-- .../azure-eventgrid/tests/test_eg_client.py | 22 +++++++++---------- .../tests/test_eg_client_exceptions.py | 22 +++++++++---------- 24 files changed, 72 insertions(+), 72 deletions(-) diff --git a/sdk/eventgrid/azure-eventgrid/README.md b/sdk/eventgrid/azure-eventgrid/README.md index b2199055305d..9952c57507f8 100644 --- a/sdk/eventgrid/azure-eventgrid/README.md +++ b/sdk/eventgrid/azure-eventgrid/README.md @@ -12,7 +12,7 @@ Azure Event Grid is a fully-managed intelligent event routing service that allow ## _Disclaimer_ -This is a beta release of Azure EventGrid's `EventGridClient`. `EventGridClient` supports `send`, `receive_cloud_events`, `acknowledge_cloud_events` , `release_cloud_events`, `reject_cloud_events`, and `renew_cloud_event_locks` operations. Please refer to the [samples](https://github.com/Azure/azure-sdk-for-python/tree/feature/eventgrid/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples) for further information. +This is a beta release of Azure EventGrid's `EventGridClient`. `EventGridClient` supports `send`, `receive`, `acknowledge` , `release`, `reject`, and `renew_locks` operations. Please refer to the [samples](https://github.com/Azure/azure-sdk-for-python/tree/feature/eventgrid/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples) for further information. ## Getting started @@ -316,32 +316,32 @@ sub_name = os.environ["EVENTGRID_EVENT_SUBSCRIPTION_NAME"] credential = AzureKeyCredential(key) client = EventGridClient(endpoint, credential, level=ClientLevel.STANDARD) -events = client.receive_cloud_events(topic_name, sub_name, max_events=4) +events = client.receive(topic_name, sub_name, max_events=4) for e in events: renew_tokens = e.broker_properties.lock_token - renew_result = client.renew_cloud_events_lock( + renew_result = client.renew_locks( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=renew_tokens, ) release_tokens = events[0].broker_properties.lock_token -release_result = client.release_cloud_events( +release_result = client.release( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=release_tokens, ) ack_tokens = events[1].broker_properties.lock_token -ack_result = client.acknowledge_cloud_events( +ack_result = client.acknowledge( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=ack_tokens, ) reject_tokens = events[2].broker_properties.lock_token -reject_result = client.reject_cloud_events( +reject_result = client.reject( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=reject_tokens, diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_patch.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_patch.py index 7c238b81dfeb..cde0db4f1926 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_patch.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_patch.py @@ -417,7 +417,7 @@ def _publish( @use_standard_only @distributed_trace - def receive_cloud_events( + def receive( self, topic_name: str, subscription_name: str, @@ -468,7 +468,7 @@ def receive_cloud_events( @use_standard_only @distributed_trace - def acknowledge_cloud_events( + def acknowledge( self, topic_name: str, subscription_name: str, @@ -504,7 +504,7 @@ def acknowledge_cloud_events( @api_version_validation( params_added_on={"2023-10-01-preview": ["release_delay_in_seconds"]}, ) - def release_cloud_events( + def release( self, topic_name: str, subscription_name: str, @@ -541,7 +541,7 @@ def release_cloud_events( @use_standard_only @distributed_trace - def reject_cloud_events( + def reject( self, topic_name: str, subscription_name: str, @@ -576,7 +576,7 @@ def reject_cloud_events( @api_version_validation( method_added_on="2023-10-01-preview", ) - def renew_cloud_event_locks( + def renew_locks( self, topic_name: str, subscription_name: str, diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_patch.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_patch.py index d3e9d72f5a1a..70d55e829fb9 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_patch.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_patch.py @@ -248,7 +248,7 @@ def _http_response_error_handler(self, exception, level): @use_standard_only @distributed_trace_async - async def receive_cloud_events( + async def receive( self, topic_name: str, subscription_name: str, @@ -299,7 +299,7 @@ async def receive_cloud_events( @use_standard_only @distributed_trace_async - async def acknowledge_cloud_events( + async def acknowledge( self, topic_name: str, subscription_name: str, @@ -332,7 +332,7 @@ async def acknowledge_cloud_events( @api_version_validation( params_added_on={"2023-10-01-preview": ["release_delay_in_seconds"]}, ) - async def release_cloud_events( + async def release( self, topic_name: str, subscription_name: str, @@ -369,7 +369,7 @@ async def release_cloud_events( @use_standard_only @distributed_trace_async - async def reject_cloud_events( + async def reject( self, topic_name: str, subscription_name: str, @@ -401,7 +401,7 @@ async def reject_cloud_events( @api_version_validation( method_added_on="2023-10-01-preview", ) - async def renew_cloud_event_locks( + async def renew_locks( self, topic_name: str, subscription_name: str, diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_acknowledge_operation_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_acknowledge_operation_async.py index fc4556b55a65..acbde2f1e706 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_acknowledge_operation_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_acknowledge_operation_async.py @@ -37,7 +37,7 @@ async def run(): try: async with client: lock_tokens = ["token"] - ack_events = await client.acknowledge_cloud_events( + ack_events = await client.acknowledge( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=lock_tokens, diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_all_operations_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_all_operations_async.py index 0bed8a6ddc74..ac862916ab27 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_all_operations_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_all_operations_async.py @@ -66,7 +66,7 @@ async def run(): # Receive Published Cloud Events try: - receive_results = await client.receive_cloud_events( + receive_results = await client.receive( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=10, @@ -95,7 +95,7 @@ async def run(): if len(release_events) > 0: try: - release_result = await client.release_cloud_events( + release_result = await client.release( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=release_events, @@ -108,7 +108,7 @@ async def run(): if len(acknowledge_events) > 0: try: - ack_result = await client.acknowledge_cloud_events( + ack_result = await client.acknowledge( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=acknowledge_events, @@ -121,7 +121,7 @@ async def run(): if len(reject_events) > 0: try: - reject_result = await client.reject_cloud_events( + reject_result = await client.reject( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=reject_events, diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_binary_mode_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_binary_mode_async.py index 23ddeb5abd90..3e9d918cd15c 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_binary_mode_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_binary_mode_async.py @@ -47,7 +47,7 @@ async def run(): cloud_event = CloudEvent(data=json.dumps({"hello":"data"}).encode("utf-8"), source="https://example.com", type="example", datacontenttype="application/json") await client.send(topic_name=TOPIC_NAME, events=cloud_event, binary_mode=True) - receive_result = await client.receive_cloud_events( + receive_result = await client.receive( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=10, diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_publish_receive_renew_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_publish_receive_renew_async.py index 04cd15696d9e..020b830b6e5e 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_publish_receive_renew_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_publish_receive_renew_async.py @@ -42,13 +42,13 @@ async def run(): await client.send(topic_name=TOPIC_NAME, events=cloud_event) # Receive CloudEvents and parse out lock tokens - receive_result = await client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=10, max_wait_time=10) + receive_result = await client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=10, max_wait_time=10) lock_tokens_to_release = [] for item in receive_result.value: lock_tokens_to_release.append(item.broker_properties.lock_token) # Renew lock tokens - renew_events = await client.renew_cloud_event_locks( + renew_events = await client.renew_locks( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=lock_tokens_to_release, diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_publish_release_receive_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_publish_release_receive_async.py index 804500c1d727..d1b5d0c6bbe3 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_publish_release_receive_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_publish_release_receive_async.py @@ -42,7 +42,7 @@ async def run(): await client.send(topic_name=TOPIC_NAME, events=cloud_event) # Receive CloudEvents and parse out lock tokens - receive_result = await client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15) + receive_result = await client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15) lock_tokens_to_release = [] for item in receive_result.value: lock_tokens_to_release.append(item.broker_properties.lock_token) @@ -50,7 +50,7 @@ async def run(): print("Received events:", receive_result.value) # Release a LockToken - release_events = await client.release_cloud_events( + release_events = await client.release( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, release_delay_in_seconds=60, @@ -59,11 +59,11 @@ async def run(): print("Released Event:", release_events) # Receive CloudEvents again - receive_result = await client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15) + receive_result = await client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15) print("Received events after release:", receive_result.value) # Acknowledge a LockToken that was released - acknowledge_events = await client.acknowledge_cloud_events( + acknowledge_events = await client.acknowledge( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=lock_tokens_to_release, diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_receive_operation_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_receive_operation_async.py index 03ce721b4199..c166adc49d84 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_receive_operation_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_receive_operation_async.py @@ -36,7 +36,7 @@ async def run(): # Receive CloudEvents try: async with client: - receive_result = await client.receive_cloud_events( + receive_result = await client.receive( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=10, diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_reject_operation_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_reject_operation_async.py index 194c78bfaae3..c8ccc0c30a6c 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_reject_operation_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_reject_operation_async.py @@ -37,7 +37,7 @@ async def run(): try: async with client: tokens = ["token"] - reject_events = await client.reject_cloud_events( + reject_events = await client.reject( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=tokens, diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_release_operation_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_release_operation_async.py index 62c540af93f2..cdb308dd6aac 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_release_operation_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_release_operation_async.py @@ -37,7 +37,7 @@ async def run(): try: async with client: tokens = ["token"] - release_events = await client.release_cloud_events( + release_events = await client.release( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, release_delay_in_seconds=10, diff --git a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_renew_locks_operation_async.py b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_renew_locks_operation_async.py index 349f18991ee0..09e672fc9661 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_renew_locks_operation_async.py +++ b/sdk/eventgrid/azure-eventgrid/samples/async_samples/eventgrid_client_samples/sample_renew_locks_operation_async.py @@ -35,7 +35,7 @@ async def run(): # Renew a lockToken try: lock_tokens = ["token"] - release_events = await client.renew_cloud_event_locks( + release_events = await client.renew_locks( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=lock_tokens, diff --git a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_acknowledge_operation.py b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_acknowledge_operation.py index 68d57ae30bda..c7c2df51bed1 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_acknowledge_operation.py +++ b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_acknowledge_operation.py @@ -34,7 +34,7 @@ # Acknowledge a CloudEvent try: lock_tokens = ["token"] - ack_events = client.acknowledge_cloud_events( + ack_events = client.acknowledge( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=lock_tokens, diff --git a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_all_operations.py b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_all_operations.py index 68b9ea7962d6..2299988e0b4c 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_all_operations.py +++ b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_all_operations.py @@ -59,7 +59,7 @@ # Receive Published Cloud Events try: - receive_results = client.receive_cloud_events( + receive_results = client.receive( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=10, @@ -88,7 +88,7 @@ if len(release_events) > 0: try: - release_result = client.release_cloud_events( + release_result = client.release( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=release_events, @@ -101,7 +101,7 @@ if len(acknowledge_events) > 0: try: - ack_result = client.acknowledge_cloud_events( + ack_result = client.acknowledge( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=acknowledge_events, @@ -114,7 +114,7 @@ if len(reject_events) > 0: try: - reject_result = client.reject_cloud_events( + reject_result = client.reject( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=reject_events, diff --git a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_binary_mode.py b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_binary_mode.py index 8a6a0188a184..884c9adfbd15 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_binary_mode.py +++ b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_binary_mode.py @@ -45,7 +45,7 @@ client.send(topic_name=TOPIC_NAME, events=cloud_event, binary_mode=True) # Receive a CloudEvent - receive_result = client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=100) + receive_result = client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=100) for receive_details in receive_result.value: cloud_event_received = receive_details.event print("CloudEvent: ", cloud_event_received) diff --git a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_publish_receive_renew.py b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_publish_receive_renew.py index 438f88c7b570..1db143b432f9 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_publish_receive_renew.py +++ b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_publish_receive_renew.py @@ -39,13 +39,13 @@ client.send(topic_name=TOPIC_NAME, events=cloud_event) # Receive CloudEvents and parse out lock tokens - receive_result = client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=10, max_wait_time=10) + receive_result = client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=10, max_wait_time=10) lock_tokens_to_renew = [] for item in receive_result.value: lock_tokens_to_renew.append(item.broker_properties.lock_token) # Renew a lock token - renew_events = client.renew_cloud_event_locks( + renew_events = client.renew_locks( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=lock_tokens_to_renew, diff --git a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_publish_release_receive.py b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_publish_release_receive.py index 39b8c72b45c2..ed357aa1ad52 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_publish_release_receive.py +++ b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_publish_release_receive.py @@ -39,7 +39,7 @@ client.send(topic_name=TOPIC_NAME, events=cloud_event) # Receive CloudEvents and parse out lock tokens - receive_result = client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15) + receive_result = client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15) lock_tokens_to_release = [] for item in receive_result.value: lock_tokens_to_release.append(item.broker_properties.lock_token) @@ -47,7 +47,7 @@ print("Received events:", receive_result.value) # Release a LockToken - release_events = client.release_cloud_events( + release_events = client.release( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, release_delay_in_seconds=60, @@ -56,11 +56,11 @@ print("Released Event:", release_events) # Receive CloudEvents again - receive_result = client.receive_cloud_events(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15) + receive_result = client.receive(topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=1, max_wait_time=15) print("Received events after release:", receive_result.value) # Acknowledge a LockToken that was released - acknowledge_events = client.acknowledge_cloud_events( + acknowledge_events = client.acknowledge( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=lock_tokens_to_release, diff --git a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_receive_operation.py b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_receive_operation.py index 0e091aa883b8..4e7c69bcec7b 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_receive_operation.py +++ b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_receive_operation.py @@ -33,7 +33,7 @@ # Receive CloudEvents try: - receive_result = client.receive_cloud_events( + receive_result = client.receive( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, max_events=10, diff --git a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_reject_operation.py b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_reject_operation.py index 35700a827266..7743fe3de606 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_reject_operation.py +++ b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_reject_operation.py @@ -33,7 +33,7 @@ # Release a LockToken try: lock_tokens = ["token"] - reject_events = client.reject_cloud_events( + reject_events = client.reject( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=lock_tokens, diff --git a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_release_operation.py b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_release_operation.py index e88cf3dc08f9..cb0858e01666 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_release_operation.py +++ b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_release_operation.py @@ -33,7 +33,7 @@ # Release a LockToken try: lock_tokens = ["token"] - release_events = client.release_cloud_events( + release_events = client.release( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, release_delay_in_seconds=3600, diff --git a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_renew_locks_operation.py b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_renew_locks_operation.py index 3fb2e502f03d..52796dc9b1a2 100644 --- a/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_renew_locks_operation.py +++ b/sdk/eventgrid/azure-eventgrid/samples/sync_samples/eventgrid_client_samples/sample_renew_locks_operation.py @@ -33,7 +33,7 @@ # Renew a lockToken try: lock_tokens = ["token"] - release_events = client.renew_cloud_event_locks( + release_events = client.renew_locks( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, lock_tokens=lock_tokens, diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_dual_client.py b/sdk/eventgrid/azure-eventgrid/tests/test_dual_client.py index c3d785f432b5..f3e28d500e09 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_dual_client.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_dual_client.py @@ -81,11 +81,11 @@ def test_create_client_receive(self, level, eventgrid_endpoint, eventgrid_key, e if level=="Basic": with pytest.raises(AttributeError): - client.receive_cloud_events( + client.receive( topic_name=eventgrid_topic_name, subscription_name=eventgrid_event_subscription_name ) else: - client.receive_cloud_events( + client.receive( topic_name=eventgrid_topic_name, subscription_name=eventgrid_event_subscription_name ) diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_client.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_client.py index 19a90030a072..70a49863bb74 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_client.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_client.py @@ -47,13 +47,13 @@ def test_publish_binary_mode_xml(self, eventgrid_endpoint, eventgrid_key, eventg time.sleep(5) - events = client.receive_cloud_events(eventgrid_topic_name, eventgrid_event_subscription_name,max_events=1) + events = client.receive(eventgrid_topic_name, eventgrid_event_subscription_name,max_events=1) tokens = [] for detail in events.value: token = detail.broker_properties.lock_token tokens.append(token) - rejected_result = client.reject_cloud_events(eventgrid_topic_name, eventgrid_event_subscription_name, lock_tokens=tokens) + rejected_result = client.reject(eventgrid_topic_name, eventgrid_event_subscription_name, lock_tokens=tokens) @@ -75,13 +75,13 @@ def test_publish_binary_mode_cloud_event(self, eventgrid_endpoint, eventgrid_key topic_name= eventgrid_topic_name, events=event, binary_mode=True ) - events = client.receive_cloud_events(eventgrid_topic_name, eventgrid_event_subscription_name,max_events=1) + events = client.receive(eventgrid_topic_name, eventgrid_event_subscription_name,max_events=1) tokens = [] for detail in events.value: token = detail.broker_properties.lock_token tokens.append(token) - rejected_result = client.reject_cloud_events(eventgrid_topic_name, eventgrid_event_subscription_name, lock_tokens=tokens) + rejected_result = client.reject(eventgrid_topic_name, eventgrid_event_subscription_name, lock_tokens=tokens) @EventGridPreparer() @@ -145,12 +145,12 @@ def test_publish_binary_mode_combinations(self, eventgrid_endpoint, eventgrid_ke topic_name=eventgrid_topic_name, events=dict_event, binary_mode=True ) - events = client.receive_cloud_events(eventgrid_topic_name, eventgrid_event_subscription_name,max_events=1) + events = client.receive(eventgrid_topic_name, eventgrid_event_subscription_name,max_events=1) tokens = [] for detail in events.value: token = detail.broker_properties.lock_token tokens.append(token) - rejected_result = client.reject_cloud_events(eventgrid_topic_name, eventgrid_event_subscription_name, lock_tokens=tokens) + rejected_result = client.reject(eventgrid_topic_name, eventgrid_event_subscription_name, lock_tokens=tokens) @pytest.mark.live_test_only() @@ -172,10 +172,10 @@ def test_publish_receive_cloud_event(self, eventgrid_endpoint, eventgrid_key, ev time.sleep(5) - events = client.receive_cloud_events(eventgrid_topic_name, eventgrid_event_subscription_name,max_events=1) + events = client.receive(eventgrid_topic_name, eventgrid_event_subscription_name,max_events=1) lock_token = events.value[0].broker_properties.lock_token - ack = client.acknowledge_cloud_events(eventgrid_topic_name, eventgrid_event_subscription_name, lock_tokens=[lock_token]) + ack = client.acknowledge(eventgrid_topic_name, eventgrid_event_subscription_name, lock_tokens=[lock_token]) assert len(ack.succeeded_lock_tokens) == 1 assert len(ack.failed_lock_tokens) == 0 @@ -198,12 +198,12 @@ def test_publish_release_cloud_event(self, eventgrid_endpoint, eventgrid_key, ev time.sleep(5) - events = client.receive_cloud_events(eventgrid_topic_name, eventgrid_event_subscription_name, max_events=1) + events = client.receive(eventgrid_topic_name, eventgrid_event_subscription_name, max_events=1) lock_token = events.value[0].broker_properties.lock_token - ack = client.release_cloud_events(eventgrid_topic_name, eventgrid_event_subscription_name, lock_tokens=[lock_token]) + ack = client.release(eventgrid_topic_name, eventgrid_event_subscription_name, lock_tokens=[lock_token]) assert len(ack.succeeded_lock_tokens) == 1 assert len(ack.failed_lock_tokens) == 0 - events = client.receive_cloud_events(eventgrid_topic_name, eventgrid_event_subscription_name, max_events=1) + events = client.receive(eventgrid_topic_name, eventgrid_event_subscription_name, max_events=1) assert events.value[0].broker_properties.delivery_count > 1 \ No newline at end of file diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_eg_client_exceptions.py b/sdk/eventgrid/azure-eventgrid/tests/test_eg_client_exceptions.py index 2751e0615d23..b33ba86c2c3c 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_eg_client_exceptions.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_eg_client_exceptions.py @@ -57,7 +57,7 @@ def test_receive_cloud_event_not_found(self, eventgrid_endpoint, eventgrid_key, client = self.create_eg_client(eventgrid_endpoint, eventgrid_key) with pytest.raises(ResourceNotFoundError): - client.receive_cloud_events("faketopic", eventgrid_event_subscription_name) + client.receive("faketopic", eventgrid_event_subscription_name) @EventGridPreparer() @recorded_by_proxy @@ -65,7 +65,7 @@ def test_receive_cloud_event_max_events_negative(self, eventgrid_endpoint, event client = self.create_eg_client(eventgrid_endpoint, eventgrid_key) with pytest.raises(HttpResponseError): - client.receive_cloud_events( + client.receive( eventgrid_topic_name, eventgrid_event_subscription_name, max_events=-20 ) @@ -75,7 +75,7 @@ def test_receive_cloud_event_timeout_negative(self, eventgrid_endpoint, eventgri client = self.create_eg_client(eventgrid_endpoint, eventgrid_key) with pytest.raises(HttpResponseError): - client.receive_cloud_events( + client.receive( eventgrid_topic_name, eventgrid_event_subscription_name, max_wait_time=-20 ) @@ -85,7 +85,7 @@ def test_receive_cloud_event_timeout_max_value(self, eventgrid_endpoint, eventgr client = self.create_eg_client(eventgrid_endpoint, eventgrid_key) with pytest.raises(HttpResponseError): - client.receive_cloud_events( + client.receive( eventgrid_topic_name, eventgrid_event_subscription_name, max_wait_time=121 ) @@ -95,7 +95,7 @@ def test_receive_cloud_event_timeout_min_value(self, eventgrid_endpoint, eventgr client = self.create_eg_client(eventgrid_endpoint, eventgrid_key) with pytest.raises(HttpResponseError): - client.receive_cloud_events( + client.receive( eventgrid_topic_name, eventgrid_event_subscription_name, max_wait_time=9 ) @@ -106,7 +106,7 @@ def test_acknowledge_cloud_event_not_found(self, eventgrid_endpoint, eventgrid_k with pytest.raises(ResourceNotFoundError): lock_tokens = ["faketoken"] - client.acknowledge_cloud_events( + client.acknowledge( "faketopic", eventgrid_event_subscription_name, lock_tokens=lock_tokens ) @@ -117,7 +117,7 @@ def test_release_cloud_event_not_found(self, eventgrid_endpoint, eventgrid_key, with pytest.raises(ResourceNotFoundError): lock_tokens = ["faketoken"] - client.release_cloud_events( + client.release( "faketopic", eventgrid_event_subscription_name, lock_tokens=lock_tokens ) @@ -128,7 +128,7 @@ def test_reject_cloud_event_not_found(self, eventgrid_endpoint, eventgrid_key, e lock_tokens = ["faketoken"] with pytest.raises(ResourceNotFoundError): - client.reject_cloud_events( + client.reject( "faketopic", eventgrid_event_subscription_name, lock_tokens=lock_tokens ) @@ -138,7 +138,7 @@ def test_acknowledge_cloud_event_invalid_token(self, eventgrid_endpoint, eventgr client = self.create_eg_client(eventgrid_endpoint, eventgrid_key) lock_tokens = ["faketoken"] - ack = client.acknowledge_cloud_events( + ack = client.acknowledge( eventgrid_topic_name, eventgrid_event_subscription_name, lock_tokens=lock_tokens ) assert type(ack) == AcknowledgeResult @@ -152,7 +152,7 @@ def test_release_cloud_event_invalid_token(self, eventgrid_endpoint, eventgrid_k client = self.create_eg_client(eventgrid_endpoint, eventgrid_key) lock_tokens = ["faketoken"] - release = client.release_cloud_events( + release = client.release( eventgrid_topic_name, eventgrid_event_subscription_name, lock_tokens=lock_tokens ) assert type(release) == ReleaseResult @@ -166,7 +166,7 @@ def test_reject_cloud_event_invalid_token(self, eventgrid_endpoint, eventgrid_ke client = self.create_eg_client(eventgrid_endpoint, eventgrid_key) lock_tokens = ["faketoken"] - reject = client.reject_cloud_events( + reject = client.reject( eventgrid_topic_name, eventgrid_event_subscription_name, lock_tokens=lock_tokens ) assert type(reject) == RejectResult