Skip to content

Commit e36e23c

Browse files
00Kai0SDKAuto
andauthored
T1 botservice 2021 01 26 (Azure#16338)
* CodeGen from PR 12564 in Azure/azure-rest-api-specs fix R4010 (Azure#12564) * test,version,CHANGELOG * fix test * fix changelog Co-authored-by: SDKAuto <[email protected]>
1 parent 2b85308 commit e36e23c

File tree

130 files changed

+5748
-7069
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+5748
-7069
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Release History
22

3+
## 0.3.0 (2021-01-26)
4+
5+
**Features**
6+
7+
- Model SlackChannelProperties has a new parameter signing_secret
8+
- Model BotProperties has a new parameter cmek_key_vault_url
9+
- Model BotProperties has a new parameter is_cmek_enabled
10+
- Added operation group DirectLineOperations
11+
12+
**Breaking changes**
13+
14+
- Removed operation group EnterpriseChannelsOperations
15+
16+
## 0.2.0 (2019-05-22)
17+
18+
- Add some new features
19+
320
## 0.1.0 (2018-08-07)
421

522
- Initial Release

sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/__init__.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
# regenerated.
1010
# --------------------------------------------------------------------------
1111

12-
from .azure_bot_service import AzureBotService
13-
from .version import VERSION
12+
from ._configuration import AzureBotServiceConfiguration
13+
from ._azure_bot_service import AzureBotService
14+
__all__ = ['AzureBotService', 'AzureBotServiceConfiguration']
1415

15-
__all__ = ['AzureBotService']
16+
from .version import VERSION
1617

1718
__version__ = VERSION
1819

sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/azure_bot_service.py renamed to sdk/botservice/azure-mgmt-botservice/azure/mgmt/botservice/_azure_bot_service.py

Lines changed: 12 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -11,46 +11,14 @@
1111

1212
from msrest.service_client import SDKClient
1313
from msrest import Serializer, Deserializer
14-
from msrestazure import AzureConfiguration
15-
from .version import VERSION
16-
from .operations.bots_operations import BotsOperations
17-
from .operations.channels_operations import ChannelsOperations
18-
from .operations.operations import Operations
19-
from .operations.bot_connection_operations import BotConnectionOperations
20-
from .operations.enterprise_channels_operations import EnterpriseChannelsOperations
21-
from . import models
22-
23-
24-
class AzureBotServiceConfiguration(AzureConfiguration):
25-
"""Configuration for AzureBotService
26-
Note that all parameters used to create this instance are saved as instance
27-
attributes.
28-
29-
:param credentials: Credentials needed for the client to connect to Azure.
30-
:type credentials: :mod:`A msrestazure Credentials
31-
object<msrestazure.azure_active_directory>`
32-
:param subscription_id: Azure Subscription ID.
33-
:type subscription_id: str
34-
:param str base_url: Service URL
35-
"""
36-
37-
def __init__(
38-
self, credentials, subscription_id, base_url=None):
39-
40-
if credentials is None:
41-
raise ValueError("Parameter 'credentials' must not be None.")
42-
if subscription_id is None:
43-
raise ValueError("Parameter 'subscription_id' must not be None.")
44-
if not base_url:
45-
base_url = 'https://management.azure.com'
4614

47-
super(AzureBotServiceConfiguration, self).__init__(base_url)
48-
49-
self.add_user_agent('azure-mgmt-botservice/{}'.format(VERSION))
50-
self.add_user_agent('Azure-SDK-For-Python')
51-
52-
self.credentials = credentials
53-
self.subscription_id = subscription_id
15+
from ._configuration import AzureBotServiceConfiguration
16+
from .operations import BotsOperations
17+
from .operations import ChannelsOperations
18+
from .operations import DirectLineOperations
19+
from .operations import Operations
20+
from .operations import BotConnectionOperations
21+
from . import models
5422

5523

5624
class AzureBotService(SDKClient):
@@ -63,12 +31,12 @@ class AzureBotService(SDKClient):
6331
:vartype bots: azure.mgmt.botservice.operations.BotsOperations
6432
:ivar channels: Channels operations
6533
:vartype channels: azure.mgmt.botservice.operations.ChannelsOperations
34+
:ivar direct_line: DirectLine operations
35+
:vartype direct_line: azure.mgmt.botservice.operations.DirectLineOperations
6636
:ivar operations: Operations operations
6737
:vartype operations: azure.mgmt.botservice.operations.Operations
6838
:ivar bot_connection: BotConnection operations
6939
:vartype bot_connection: azure.mgmt.botservice.operations.BotConnectionOperations
70-
:ivar enterprise_channels: EnterpriseChannels operations
71-
:vartype enterprise_channels: azure.mgmt.botservice.operations.EnterpriseChannelsOperations
7240
7341
:param credentials: Credentials needed for the client to connect to Azure.
7442
:type credentials: :mod:`A msrestazure Credentials
@@ -85,17 +53,17 @@ def __init__(
8553
super(AzureBotService, self).__init__(self.config.credentials, self.config)
8654

8755
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
88-
self.api_version = '2018-07-12'
56+
self.api_version = '2020-06-02'
8957
self._serialize = Serializer(client_models)
9058
self._deserialize = Deserializer(client_models)
9159

9260
self.bots = BotsOperations(
9361
self._client, self.config, self._serialize, self._deserialize)
9462
self.channels = ChannelsOperations(
9563
self._client, self.config, self._serialize, self._deserialize)
64+
self.direct_line = DirectLineOperations(
65+
self._client, self.config, self._serialize, self._deserialize)
9666
self.operations = Operations(
9767
self._client, self.config, self._serialize, self._deserialize)
9868
self.bot_connection = BotConnectionOperations(
9969
self._client, self.config, self._serialize, self._deserialize)
100-
self.enterprise_channels = EnterpriseChannelsOperations(
101-
self._client, self.config, self._serialize, self._deserialize)
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
from msrestazure import AzureConfiguration
12+
13+
from .version import VERSION
14+
15+
16+
class AzureBotServiceConfiguration(AzureConfiguration):
17+
"""Configuration for AzureBotService
18+
Note that all parameters used to create this instance are saved as instance
19+
attributes.
20+
21+
:param credentials: Credentials needed for the client to connect to Azure.
22+
:type credentials: :mod:`A msrestazure Credentials
23+
object<msrestazure.azure_active_directory>`
24+
:param subscription_id: Azure Subscription ID.
25+
:type subscription_id: str
26+
:param str base_url: Service URL
27+
"""
28+
29+
def __init__(
30+
self, credentials, subscription_id, base_url=None):
31+
32+
if credentials is None:
33+
raise ValueError("Parameter 'credentials' must not be None.")
34+
if subscription_id is None:
35+
raise ValueError("Parameter 'subscription_id' must not be None.")
36+
if not base_url:
37+
base_url = 'https://management.azure.com'
38+
39+
super(AzureBotServiceConfiguration, self).__init__(base_url)
40+
41+
# Starting Autorest.Python 4.0.64, make connection pool activated by default
42+
self.keep_alive = True
43+
44+
self.add_user_agent('azure-mgmt-botservice/{}'.format(VERSION))
45+
self.add_user_agent('Azure-SDK-For-Python')
46+
47+
self.credentials = credentials
48+
self.subscription_id = subscription_id

0 commit comments

Comments
 (0)