Skip to content

Commit b64ccac

Browse files
committed
update
1 parent 123f2d6 commit b64ccac

File tree

7 files changed

+17
-21
lines changed

7 files changed

+17
-21
lines changed

sdk/search/azure-search-documents/azure/search/documents/_api_versions.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
"2019-05-06-Preview",
88
]
99

10-
def check_api_version(api_version):
10+
def validate_api_version(api_version):
1111
# type: (str) -> None
12+
"""Raise error if api_version is invalid """
13+
if not api_version:
14+
return
1215
if api_version not in _SUPPORTED_API_VERSIONS:
1316
versions = '\n'.join(_SUPPORTED_API_VERSIONS)
1417
raise ValueError("Unsupported API version '{}'. Please select from:\n{}".format(api_version, versions))
@@ -17,6 +20,5 @@ def check_api_version(api_version):
1720
def get_api_version(kwargs, default):
1821
# type: (Dict[str, Any]) -> str
1922
api_version = kwargs.pop('api_version', None)
20-
if api_version:
21-
check_api_version(api_version)
23+
validate_api_version(api_version)
2224
return api_version or default

sdk/search/azure-search-documents/azure/search/documents/_internal/_search_client.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import six
99

1010
from azure.core.tracing.decorator import distributed_trace
11-
from .._api_versions import check_api_version
11+
from .._api_versions import validate_api_version
1212
from ._generated import SearchIndexClient
1313
from ._generated.models import IndexBatch, IndexingResult
1414
from ._index_documents_batch import IndexDocumentsBatch
@@ -78,8 +78,7 @@ def __init__(self, endpoint, index_name, credential, **kwargs):
7878
# type: (str, str, AzureKeyCredential, **Any) -> None
7979

8080
api_version = kwargs.pop('api_version', None)
81-
if api_version:
82-
check_api_version(api_version)
81+
validate_api_version(api_version)
8382
self._endpoint = endpoint # type: str
8483
self._index_name = index_name # type: str
8584
self._credential = credential # type: AzureKeyCredential

sdk/search/azure-search-documents/azure/search/documents/_internal/aio/_search_client_async.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from .._generated.models import IndexBatch, IndexingResult
1212
from .._index_documents_batch import IndexDocumentsBatch
1313
from .._queries import AutocompleteQuery, SearchQuery, SuggestQuery
14-
from ..._api_versions import check_api_version
14+
from ..._api_versions import validate_api_version
1515
from ..._headers_mixin import HeadersMixin
1616
from ..._version import SDK_MONIKER
1717

@@ -48,8 +48,7 @@ def __init__(self, endpoint, index_name, credential, **kwargs):
4848
# type: (str, str, AzureKeyCredential, **Any) -> None
4949

5050
api_version = kwargs.pop('api_version', None)
51-
if api_version:
52-
check_api_version(api_version)
51+
validate_api_version(api_version)
5352
self._endpoint = endpoint # type: str
5453
self._index_name = index_name # type: str
5554
self._credential = credential # type: AzureKeyCredential

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from azure.core.tracing.decorator import distributed_trace
1010
from azure.core.paging import ItemPaged
1111

12-
from ..._api_versions import check_api_version
12+
from ..._api_versions import validate_api_version
1313
from ._generated import SearchServiceClient as _SearchServiceClient
1414
from ._utils import (
1515
unpack_search_index,
@@ -46,8 +46,7 @@ def __init__(self, endpoint, credential, **kwargs):
4646
# type: (str, AzureKeyCredential, **Any) -> None
4747

4848
api_version = kwargs.pop('api_version', None)
49-
if api_version:
50-
check_api_version(api_version)
49+
validate_api_version(api_version)
5150
self._endpoint = normalize_endpoint(endpoint) # type: str
5251
self._credential = credential # type: AzureKeyCredential
5352
self._client = _SearchServiceClient(

sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/_search_indexer_client.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
pack_search_indexer_data_source,
1717
unpack_search_indexer_data_source,
1818
)
19-
from ..._api_versions import check_api_version
19+
from ..._api_versions import validate_api_version
2020
from ..._headers_mixin import HeadersMixin
2121
from ..._version import SDK_MONIKER
2222

@@ -44,8 +44,7 @@ def __init__(self, endpoint, credential, **kwargs):
4444
# type: (str, AzureKeyCredential, **Any) -> None
4545

4646
api_version = kwargs.pop('api_version', None)
47-
if api_version:
48-
check_api_version(api_version)
47+
validate_api_version(api_version)
4948
self._endpoint = normalize_endpoint(endpoint) # type: str
5049
self._credential = credential # type: AzureKeyCredential
5150
self._client = _SearchServiceClient(

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
get_access_conditions,
2020
normalize_endpoint,
2121
)
22-
from ...._api_versions import check_api_version
22+
from ...._api_versions import validate_api_version
2323
from ...._headers_mixin import HeadersMixin
2424
from ...._version import SDK_MONIKER
2525

@@ -48,8 +48,7 @@ def __init__(self, endpoint, credential, **kwargs):
4848
# type: (str, AzureKeyCredential, **Any) -> None
4949

5050
api_version = kwargs.pop('api_version', None)
51-
if api_version:
52-
check_api_version(api_version)
51+
validate_api_version(api_version)
5352
self._endpoint = normalize_endpoint(endpoint) # type: str
5453
self._credential = credential # type: AzureKeyCredential
5554
self._client = _SearchServiceClient(

sdk/search/azure-search-documents/azure/search/documents/indexes/_internal/aio/_search_indexer_client.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
pack_search_indexer_data_source,
1717
unpack_search_indexer_data_source,
1818
)
19-
from ...._api_versions import check_api_version
19+
from ...._api_versions import validate_api_version
2020
from ...._headers_mixin import HeadersMixin
2121
from ...._version import SDK_MONIKER
2222

@@ -44,8 +44,7 @@ def __init__(self, endpoint, credential, **kwargs):
4444
# type: (str, AzureKeyCredential, **Any) -> None
4545

4646
api_version = kwargs.pop('api_version', None)
47-
if api_version:
48-
check_api_version(api_version)
47+
validate_api_version(api_version)
4948
self._endpoint = normalize_endpoint(endpoint) # type: str
5049
self._credential = credential # type: AzureKeyCredential
5150
self._client = _SearchServiceClient(

0 commit comments

Comments
 (0)