From 93330c9895092e4cd42859cd3e429ed57510c94d Mon Sep 17 00:00:00 2001 From: Libba Lawrence Date: Thu, 11 Apr 2024 16:20:44 -0700 Subject: [PATCH] [EG] rename release_delay (#35172) * rename * valueError * update version * version --- sdk/eventgrid/azure-eventgrid/CHANGELOG.md | 2 +- .../azure/eventgrid/_operations/_patch.py | 12 ++++++------ .../azure-eventgrid/azure/eventgrid/_version.py | 2 +- .../azure/eventgrid/aio/_operations/_patch.py | 10 +++++----- .../sample_publish_release_receive_async.py | 2 +- .../sample_release_operation_async.py | 2 +- .../sample_publish_release_receive.py | 2 +- .../sample_release_operation.py | 2 +- .../azure-eventgrid/tests/test_dual_client.py | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sdk/eventgrid/azure-eventgrid/CHANGELOG.md b/sdk/eventgrid/azure-eventgrid/CHANGELOG.md index aa6a475e6f12..3a99607a128e 100644 --- a/sdk/eventgrid/azure-eventgrid/CHANGELOG.md +++ b/sdk/eventgrid/azure-eventgrid/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 4.19.0b1 (2024-04-11) +## 4.20.0b1 (2024-04-11) ### Features Added diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_patch.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_patch.py index 158d0010dcde..f1e16a2909ef 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_patch.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_operations/_patch.py @@ -98,7 +98,7 @@ def use_standard_only(func): @wraps(func) def wrapper(self, *args, **kwargs): if self._level == "Basic": # pylint: disable=protected-access - raise AttributeError( + raise ValueError( "The basic client is not supported for this operation." ) return func(self, *args, **kwargs) @@ -501,7 +501,7 @@ def acknowledge_cloud_events( @use_standard_only @distributed_trace @api_version_validation( - params_added_on={"2023-10-01-preview": ["release_delay_in_seconds"]}, + params_added_on={"2023-10-01-preview": ["release_delay"]}, ) def release_cloud_events( self, @@ -509,7 +509,7 @@ def release_cloud_events( subscription_name: str, *, lock_tokens: List[str], - release_delay_in_seconds: Optional[Union[int, _models.ReleaseDelay]] = None, + release_delay: Optional[Union[int, _models.ReleaseDelay]] = None, **kwargs: Any, ) -> _models.ReleaseResult: """Release batch of Cloud Events. The server responds with an HTTP 200 status code if the request @@ -522,9 +522,9 @@ def release_cloud_events( :type subscription_name: str :keyword lock_tokens: Array of lock tokens of Cloud Events. Required. :paramtype lock_tokens: List[str] - :keyword release_delay_in_seconds: Release cloud events with the specified delay in seconds. + :keyword release_delay: Release cloud events with the specified delay in seconds. Known values are: 0, 10, 60, 600, and 3600. Default value is None. - :paramtype release_delay_in_seconds: int or ~azure.eventgrid.models.ReleaseDelay + :paramtype release_delay: int or ~azure.eventgrid.models.ReleaseDelay :return: ReleaseResult. The ReleaseResult is compatible with MutableMapping :rtype: ~azure.eventgrid.models.ReleaseResult :raises ~azure.core.exceptions.HttpResponseError: @@ -534,7 +534,7 @@ def release_cloud_events( topic_name=topic_name, event_subscription_name=subscription_name, release_options=options, - release_delay_in_seconds=release_delay_in_seconds, + release_delay_in_seconds=release_delay, **kwargs, ) diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_version.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_version.py index d008fcf48907..4997406f0693 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_version.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "4.19.0b1" +VERSION = "4.20.0b1" 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 234d1a48d605..20c46b61de31 100644 --- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_patch.py +++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_operations/_patch.py @@ -328,7 +328,7 @@ async def acknowledge_cloud_events( @use_standard_only @distributed_trace_async @api_version_validation( - params_added_on={"2023-10-01-preview": ["release_delay_in_seconds"]}, + params_added_on={"2023-10-01-preview": ["release_delay"]}, ) async def release_cloud_events( self, @@ -336,7 +336,7 @@ async def release_cloud_events( subscription_name: str, *, lock_tokens: List[str], - release_delay_in_seconds: Optional[Union[int, _models.ReleaseDelay]] = None, + release_delay: Optional[Union[int, _models.ReleaseDelay]] = None, **kwargs: Any, ) -> _models.ReleaseResult: """Release batch of Cloud Events. The server responds with an HTTP 200 status code if the request @@ -349,9 +349,9 @@ async def release_cloud_events( :type subscription_name: str :keyword lock_tokens: Array of lock tokens of Cloud Events. Required. :paramtype lock_tokens: List[str] - :keyword release_delay_in_seconds: Release cloud events with the specified delay in seconds. + :keyword release_delay: Release cloud events with the specified delay in seconds. Known values are: 0, 10, 60, 600, and 3600. Default value is None. - :paramtype release_delay_in_seconds: int or ~azure.eventgrid.models.ReleaseDelay + :paramtype release_delay: int or ~azure.eventgrid.models.ReleaseDelay :return: ReleaseResult. The ReleaseResult is compatible with MutableMapping :rtype: ~azure.eventgrid.models.ReleaseResult :raises ~azure.core.exceptions.HttpResponseError: @@ -361,7 +361,7 @@ async def release_cloud_events( topic_name, subscription_name, options, - release_delay_in_seconds=release_delay_in_seconds, + release_delay_in_seconds=release_delay, **kwargs, ) 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..f0946c2bcd57 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 @@ -53,7 +53,7 @@ async def run(): release_events = await client.release_cloud_events( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, - release_delay_in_seconds=60, + release_delay=60, lock_tokens=lock_tokens_to_release, ) print("Released Event:", release_events) 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..d0d4ce112959 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 @@ -40,7 +40,7 @@ async def run(): release_events = await client.release_cloud_events( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, - release_delay_in_seconds=10, + release_delay=10, lock_tokens=tokens, ) print(release_events) 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..0951efb50a7c 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 @@ -50,7 +50,7 @@ release_events = client.release_cloud_events( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, - release_delay_in_seconds=60, + release_delay=60, lock_tokens=lock_tokens_to_release, ) print("Released Event:", release_events) 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..efb00fb374e9 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 @@ -36,7 +36,7 @@ release_events = client.release_cloud_events( topic_name=TOPIC_NAME, subscription_name=EVENT_SUBSCRIPTION_NAME, - release_delay_in_seconds=3600, + release_delay=3600, lock_tokens=lock_tokens, ) print(release_events) diff --git a/sdk/eventgrid/azure-eventgrid/tests/test_dual_client.py b/sdk/eventgrid/azure-eventgrid/tests/test_dual_client.py index c3d785f432b5..f05ab6841345 100644 --- a/sdk/eventgrid/azure-eventgrid/tests/test_dual_client.py +++ b/sdk/eventgrid/azure-eventgrid/tests/test_dual_client.py @@ -80,7 +80,7 @@ def test_create_client_receive(self, level, eventgrid_endpoint, eventgrid_key, e ) if level=="Basic": - with pytest.raises(AttributeError): + with pytest.raises(ValueError): client.receive_cloud_events( topic_name=eventgrid_topic_name, subscription_name=eventgrid_event_subscription_name )