[EG] rename release_delay (#35172)

l0lawrence · l0lawrence · commit 93330c989509 · 2024-04-22T14:10:21.000-07:00
* rename

* valueError

* update version

* version
diff --git 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
@@ -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,15 +501,15 @@ 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,
         topic_name: str,
         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
@@ -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
@@ -328,15 +328,15 @@ 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,
         topic_name: str,
         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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
                 )

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ async def run():`
`53`	`53`	`release_events = await client.release_cloud_events(`
`54`	`54`	`topic_name=TOPIC_NAME,`
`55`	`55`	`subscription_name=EVENT_SUBSCRIPTION_NAME,`
`56`		`- release_delay_in_seconds=60,`
	`56`	`+ release_delay=60,`
`57`	`57`	`lock_tokens=lock_tokens_to_release,`
`58`	`58`	`)`
`59`	`59`	`print("Released Event:", release_events)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ async def run():`
`40`	`40`	`release_events = await client.release_cloud_events(`
`41`	`41`	`topic_name=TOPIC_NAME,`
`42`	`42`	`subscription_name=EVENT_SUBSCRIPTION_NAME,`
`43`		`- release_delay_in_seconds=10,`
	`43`	`+ release_delay=10,`
`44`	`44`	`lock_tokens=tokens,`
`45`	`45`	`)`
`46`	`46`	`print(release_events)`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`release_events = client.release_cloud_events(`
`51`	`51`	`topic_name=TOPIC_NAME,`
`52`	`52`	`subscription_name=EVENT_SUBSCRIPTION_NAME,`
`53`		`- release_delay_in_seconds=60,`
	`53`	`+ release_delay=60,`
`54`	`54`	`lock_tokens=lock_tokens_to_release,`
`55`	`55`	`)`
`56`	`56`	`print("Released Event:", release_events)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`release_events = client.release_cloud_events(`
`37`	`37`	`topic_name=TOPIC_NAME,`
`38`	`38`	`subscription_name=EVENT_SUBSCRIPTION_NAME,`
`39`		`- release_delay_in_seconds=3600,`
	`39`	`+ release_delay=3600,`
`40`	`40`	`lock_tokens=lock_tokens,`
`41`	`41`	`)`
`42`	`42`	`print(release_events)`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ def test_create_client_receive(self, level, eventgrid_endpoint, eventgrid_key, e`
`80`	`80`	`)`
`81`	`81`
`82`	`82`	`if level=="Basic":`
`83`		`- with pytest.raises(AttributeError):`
	`83`	`+ with pytest.raises(ValueError):`
`84`	`84`	`client.receive_cloud_events(`
`85`	`85`	`topic_name=eventgrid_topic_name, subscription_name=eventgrid_event_subscription_name`
`86`	`86`	`)`