[EG] dont hardcode api_version on request

sdk/eventgrid/azure-eventgrid/azure/eventgrid/_helpers.py

@@ -166,7 +166,7 @@ def _from_cncf_events(event): # pylint: disable=inconsistent-return-statements
         raise ValueError(msg) from err
 
 
-def _build_request(endpoint, content_type, events, *, channel_name=None):
+def _build_request(endpoint, content_type, events, *, channel_name=None, api_version=constants.DEFAULT_API_VERSION):
     serialize = Serializer()
     header_parameters: Dict[str, Any] = {}
     header_parameters['Content-Type'] = serialize.header("content_type", content_type, 'str')
@@ -175,7 +175,7 @@ def _build_request(endpoint, content_type, events, *, channel_name=None):
         header_parameters['aeg-channel-name'] = channel_name
 
     query_parameters: Dict[str, Any] = {}
-    query_parameters['api-version'] = serialize.query("api_version", "2018-01-01", 'str')
+    query_parameters['api-version'] = serialize.query("api_version", api_version, 'str')
 
     body = serialize.body(events, '[object]')
     if body is None:

sdk/eventgrid/azure-eventgrid/azure/eventgrid/_publisher_client.py

@@ -6,7 +6,7 @@
 # --------------------------------------------------------------------------
 
 from typing import TYPE_CHECKING, cast, Dict, List, Any, Union, Optional
-
+from azure.core.credentials import AzureKeyCredential, AzureSasCredential
 from azure.core.tracing.decorator import distributed_trace
 from azure.core.pipeline.policies import (
     RequestIdPolicy,
@@ -49,8 +49,6 @@
 if TYPE_CHECKING:
     # pylint: disable=unused-import,ungrouped-imports
     from azure.core.credentials import (
-        AzureKeyCredential,
-        AzureSasCredential,
         TokenCredential,
     )
 
@@ -79,6 +77,9 @@ class EventGridPublisherClient(object): # pylint: disable=client-accepts-api-ver
      implements SAS key authentication or SAS token authentication or a TokenCredential.
     :type credential: ~azure.core.credentials.AzureKeyCredential or ~azure.core.credentials.AzureSasCredential or
      ~azure.core.credentials.TokenCredential
+    :keyword api_version: Api Version. Default value is "2018-01-01". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
     :rtype: None
 
     .. admonition:: Example:
@@ -98,12 +99,19 @@ class EventGridPublisherClient(object): # pylint: disable=client-accepts-api-ver
             :caption: Creating the EventGridPublisherClient with an endpoint and AzureSasCredential.
     """
 
-    def __init__(self, endpoint, credential, **kwargs):
-        # type: (str, Union[AzureKeyCredential, AzureSasCredential, TokenCredential], Any) -> None
+    def __init__(
+            self,
+            endpoint: str,
+            credential: Union[AzureKeyCredential, AzureSasCredential, "TokenCredential"],
+            *,
+            api_version: str ="2018-01-01",
+            **kwargs: Any
+        ) -> None:
         self._endpoint = endpoint
         self._client = EventGridPublisherClientImpl(
             policies=EventGridPublisherClient._policies(credential, **kwargs), **kwargs
         )
+        self._api_version = api_version
 
     @staticmethod
     def _policies(credential, **kwargs):
@@ -221,7 +229,9 @@ def send(
             for event in events:
                 _eventgrid_data_typecheck(event)
         response = self._client.send_request(  # pylint: disable=protected-access
-            _build_request(self._endpoint, content_type, events, channel_name=channel_name), **kwargs
+            _build_request(
+                self._endpoint,content_type, events, channel_name=channel_name, api_version=self._api_version),
+                **kwargs
         )
         error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError}
         if response.status_code != 200:

sdk/eventgrid/azure-eventgrid/azure/eventgrid/aio/_publisher_client_async.py

@@ -73,6 +73,9 @@ class EventGridPublisherClient: # pylint: disable=client-accepts-api-version-key
      SAS key authentication or SAS token authentication or an AsyncTokenCredential.
     :type credential: ~azure.core.credentials.AzureKeyCredential or ~azure.core.credentials.AzureSasCredential or
      ~azure.core.credentials_async.AsyncTokenCredential
+    :keyword api_version: Api Version. Default value is "2018-01-01". Note that overriding this
+     default value may result in unsupported behavior.
+    :paramtype api_version: str
     :rtype: None
 
     .. admonition:: Example:
@@ -98,12 +101,15 @@ def __init__(
         credential: Union[
             "AsyncTokenCredential", AzureKeyCredential, AzureSasCredential
         ],
+        *,
+        api_version: str = "2018-01-01",
         **kwargs: Any
     ) -> None:
         self._client = EventGridPublisherClientAsync(
             policies=EventGridPublisherClient._policies(credential, **kwargs), **kwargs
         )
         self._endpoint = endpoint
+        self._api_version = api_version
 
     @staticmethod
     def _policies(
@@ -221,7 +227,9 @@ async def send(self, events: SendType, *, channel_name: Optional[str] = None, **
             for event in events:
                 _eventgrid_data_typecheck(event)
         response = await self._client.send_request(  # pylint: disable=protected-access
-            _build_request(self._endpoint, content_type, events, channel_name=channel_name), **kwargs
+            _build_request(self._endpoint, content_type, events,
+                           channel_name=channel_name, api_version=self._api_version),
+            **kwargs
         )
         error_map = {401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError}
         if response.status_code != 200: