From 49b1a32e5c3d4616cfc8f87b72eb3bc05b8e744a Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Tue, 30 Mar 2021 15:45:43 -0700 Subject: [PATCH 1/3] add adls gen2 support --- .../azure/search/documents/indexes/models/__init__.py | 2 ++ .../azure/search/documents/indexes/models/_models.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py index 9fa71c4e4412..549297074e7b 100644 --- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py +++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/__init__.py @@ -102,6 +102,7 @@ RegexFlags, SearchIndexer, SearchIndexerDataContainer, + SearchIndexerDataSourceType, SearchIndexerError, SearchIndexerLimits, SearchIndexerSkillset, @@ -237,6 +238,7 @@ "SearchIndexer", "SearchIndexerDataContainer", "SearchIndexerDataSourceConnection", + "SearchIndexerDataSourceType", "SearchIndexerError", "SearchIndexerLimits", "SearchIndexerSkillset", diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py index 03ad3c2e2fcf..587bb8b4b153 100644 --- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py +++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py @@ -472,8 +472,8 @@ class SearchIndexerDataSourceConnection(msrest.serialization.Model): :type name: str :param description: The description of the datasource connection. :type description: str - :param type: Required. The type of the datasource connection. Possible values include: "azuresql", - "cosmosdb", "azureblob", "azuretable", "mysql". + :param type: Required. The type of the datasource. Possible values include: "azuresql", + "cosmosdb", "azureblob", "azuretable", "mysql", "adlsgen2". :type type: str or ~azure.search.documents.indexes.models.SearchIndexerDataSourceType :param connection_string: The connection string for the datasource connection. :type connection_string: str From 57b54d68e64235820b630a9bc8314e9ba848d7db Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Tue, 30 Mar 2021 15:48:20 -0700 Subject: [PATCH 2/3] update version --- sdk/search/azure-search-documents/CHANGELOG.md | 5 ++++- .../azure/search/documents/_version.py | 2 +- sdk/search/azure-search-documents/setup.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sdk/search/azure-search-documents/CHANGELOG.md b/sdk/search/azure-search-documents/CHANGELOG.md index 206b690ce9de..bd13e0ad09c9 100644 --- a/sdk/search/azure-search-documents/CHANGELOG.md +++ b/sdk/search/azure-search-documents/CHANGELOG.md @@ -1,7 +1,10 @@ # Release History -## 11.1.1 (Unreleased) +## 11.2.0b1 (Unreleased) +### New features + +- Added new data source type ADLS gen2 #16852 ## 11.1.0 (2021-02-10) diff --git a/sdk/search/azure-search-documents/azure/search/documents/_version.py b/sdk/search/azure-search-documents/azure/search/documents/_version.py index 228c142efc87..29a8101efd8b 100644 --- a/sdk/search/azure-search-documents/azure/search/documents/_version.py +++ b/sdk/search/azure-search-documents/azure/search/documents/_version.py @@ -3,6 +3,6 @@ # Licensed under the MIT License. # ------------------------------------ -VERSION = "11.1.1" # type: str +VERSION = "11.2.0b1" # type: str SDK_MONIKER = "search-documents/{}".format(VERSION) # type: str diff --git a/sdk/search/azure-search-documents/setup.py b/sdk/search/azure-search-documents/setup.py index 88b9071f00f0..b47771854fc5 100644 --- a/sdk/search/azure-search-documents/setup.py +++ b/sdk/search/azure-search-documents/setup.py @@ -56,7 +56,7 @@ author_email='ascl@microsoft.com', url='https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/search/azure-search-documents', classifiers=[ - "Development Status :: 5 - Production/Stable", + "Development Status :: 4 - Beta", 'Programming Language :: Python', 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', From 5be82adbabc233d92a32d8cbdd339e505fddae2a Mon Sep 17 00:00:00 2001 From: Xiang Yan Date: Tue, 30 Mar 2021 15:49:22 -0700 Subject: [PATCH 3/3] update --- .../azure/search/documents/indexes/models/_models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py index 587bb8b4b153..f80dbdc8f6ef 100644 --- a/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py +++ b/sdk/search/azure-search-documents/azure/search/documents/indexes/models/_models.py @@ -472,7 +472,7 @@ class SearchIndexerDataSourceConnection(msrest.serialization.Model): :type name: str :param description: The description of the datasource connection. :type description: str - :param type: Required. The type of the datasource. Possible values include: "azuresql", + :param type: Required. The type of the datasource connection. Possible values include: "azuresql", "cosmosdb", "azureblob", "azuretable", "mysql", "adlsgen2". :type type: str or ~azure.search.documents.indexes.models.SearchIndexerDataSourceType :param connection_string: The connection string for the datasource connection.