SearchIndexClient.get_search_client inherits the API version (#36198)

* SearchIndexClient.get_search_client inherits the API version

* update

* add tests

Author: xiangyan99

sdk/search/azure-search-documents/CHANGELOG.md

@@ -4,6 +4,8 @@
 
 ### Features Added
 
+- `SearchIndexClient`.`get_search_client` inherits the API version.
+
 ### Breaking Changes
 
 ### Bugs Fixed

sdk/search/azure-search-documents/azure/search/documents/indexes/_search_index_client.py

@@ -50,15 +50,15 @@ def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, TokenCre
         self._api_version = kwargs.pop("api_version", DEFAULT_VERSION)
         self._endpoint = normalize_endpoint(endpoint)
         self._credential = credential
-        audience = kwargs.pop("audience", None)
+        self._audience = kwargs.pop("audience", None)
         if isinstance(credential, AzureKeyCredential):
             self._aad = False
             self._client = _SearchServiceClient(
                 endpoint=endpoint, sdk_moniker=SDK_MONIKER, api_version=self._api_version, **kwargs
             )
         else:
             self._aad = True
-            authentication_policy = get_authentication_policy(credential, audience=audience)
+            authentication_policy = get_authentication_policy(credential, audience=self._audience)
             self._client = _SearchServiceClient(
                 endpoint=endpoint,
                 authentication_policy=authentication_policy,
@@ -90,7 +90,14 @@ def get_search_client(self, index_name: str, **kwargs: Any) -> SearchClient:
         :rtype: ~azure.search.documents.SearchClient
 
         """
-        return SearchClient(self._endpoint, index_name, self._credential, **kwargs)
+        return SearchClient(
+            self._endpoint,
+            index_name,
+            self._credential,
+            audience=self._audience,
+            api_version=self._api_version,
+            **kwargs
+        )
 
     @distributed_trace
     def list_indexes(self, *, select: Optional[List[str]] = None, **kwargs: Any) -> ItemPaged[SearchIndex]:

sdk/search/azure-search-documents/azure/search/documents/indexes/aio/_search_index_client.py

@@ -51,15 +51,15 @@ def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, AsyncTok
         self._api_version = kwargs.pop("api_version", DEFAULT_VERSION)
         self._endpoint = normalize_endpoint(endpoint)
         self._credential = credential
-        audience = kwargs.pop("audience", None)
+        self._audience = kwargs.pop("audience", None)
         if isinstance(credential, AzureKeyCredential):
             self._aad = False
             self._client = _SearchServiceClient(
                 endpoint=endpoint, sdk_moniker=SDK_MONIKER, api_version=self._api_version, **kwargs
             )
         else:
             self._aad = True
-            authentication_policy = get_authentication_policy(credential, audience=audience, is_async=True)
+            authentication_policy = get_authentication_policy(credential, audience=self._audience, is_async=True)
             self._client = _SearchServiceClient(
                 endpoint=endpoint,
                 authentication_policy=authentication_policy,
@@ -90,7 +90,14 @@ def get_search_client(self, index_name: str, **kwargs: Any) -> SearchClient:
         :return: SearchClient
         :rtype: ~azure.search.documents.aio.SearchClient
         """
-        return SearchClient(self._endpoint, index_name, self._credential, **kwargs)
+        return SearchClient(
+            self._endpoint,
+            index_name,
+            self._credential,
+            audience=self._audience,
+            api_version=self._api_version,
+            **kwargs
+        )
 
     @distributed_trace
     def list_indexes(self, *, select: Optional[List[str]] = None, **kwargs) -> AsyncItemPaged[SearchIndex]:

sdk/search/azure-search-documents/tests/async_tests/test_search_index_client_async.py

@@ -7,6 +7,7 @@
 import pytest
 from unittest import mock
 from azure.core.credentials import AzureKeyCredential
+from azure.search.documents import ApiVersion
 from azure.search.documents.aio import SearchClient
 from azure.search.documents.indexes.aio import SearchIndexClient, SearchIndexerClient
 from devtools_testutils import trim_kwargs_from_test_function
@@ -55,6 +56,13 @@ def test_get_search_client(self):
         search_client = client.get_search_client("index")
         assert isinstance(search_client, SearchClient)
 
+    def test_get_search_client_inherit_api_version(self):
+        credential = AzureKeyCredential(key="old_api_key")
+        client = SearchIndexClient("endpoint", credential, api_version=ApiVersion.V2020_06_30)
+        search_client = client.get_search_client("index")
+        assert isinstance(search_client, SearchClient)
+        assert search_client._api_version == ApiVersion.V2020_06_30
+
     def test_index_endpoint_https(self):
         credential = AzureKeyCredential(key="old_api_key")
         client = SearchIndexClient("endpoint", credential)

sdk/search/azure-search-documents/tests/test_search_index_client.py

@@ -44,6 +44,13 @@ def test_get_search_client(self):
         search_client = client.get_search_client("index")
         assert isinstance(search_client, SearchClient)
 
+    def test_get_search_client_inherit_api_version(self):
+        credential = AzureKeyCredential(key="old_api_key")
+        client = SearchIndexClient("endpoint", credential, api_version=ApiVersion.V2020_06_30)
+        search_client = client.get_search_client("index")
+        assert isinstance(search_client, SearchClient)
+        assert search_client._api_version == ApiVersion.V2020_06_30
+
     @mock.patch(
         "azure.search.documents.indexes._generated.operations._search_service_client_operations.SearchServiceClientOperationsMixin.get_service_statistics"
     )