Skip to content

Commit 9db8a2e

Browse files
azclibotmsyyc
azclibot
and
msyyc
authored
code and test (Azure#23803)
Co-authored-by: PythonSdkPipelines <PythonSdkPipelines> Co-authored-by: Yuchao Yan <[email protected]>
1 parent bc31f16 commit 9db8a2e

30 files changed

+3262
-3102
lines changed

‎sdk/redisenterprise/azure-mgmt-redisenterprise/CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Release History
22

3+
## 2.0.0 (2022-04-04)
4+
5+
**Features**
6+
7+
- Added operation DatabasesOperations.begin_force_unlink
8+
- Model Database has a new parameter geo_replication
9+
- Model DatabaseUpdate has a new parameter geo_replication
10+
11+
**Breaking changes**
12+
13+
- Model ImportClusterParameters has a new required parameter sas_uris
14+
- Model ImportClusterParameters no longer has parameter sas_uri
15+
316
## 1.0.0 (2021-02-22)
417

518
**Features**

‎sdk/redisenterprise/azure-mgmt-redisenterprise/_meta.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"autorest": "3.7.2",
3+
"use": [
4+
"@autorest/[email protected]",
5+
"@autorest/[email protected]"
6+
],
7+
"commit": "a1a224b54f05debfa94fd19477ed820c64f0f9fc",
8+
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9+
"autorest_command": "autorest specification/redisenterprise/resource-manager/readme.md --multiapi --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --python3-only --use=@autorest/[email protected] --use=@autorest/[email protected] --version=3.7.2",
10+
"readme": "specification/redisenterprise/resource-manager/readme.md"
11+
}

‎sdk/redisenterprise/azure-mgmt-redisenterprise/azure/mgmt/redisenterprise/__init__.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
__version__ = VERSION
1313
__all__ = ['RedisEnterpriseManagementClient']
1414

15-
try:
16-
from ._patch import patch_sdk # type: ignore
17-
patch_sdk()
18-
except ImportError:
19-
pass
15+
# `._patch.py` is used for handwritten extensions to the generated code
16+
# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
17+
from ._patch import patch_sdk
18+
patch_sdk()

‎sdk/redisenterprise/azure-mgmt-redisenterprise/azure/mgmt/redisenterprise/_configuration.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
from typing import TYPE_CHECKING
9+
from typing import Any, TYPE_CHECKING
1010

1111
from azure.core.configuration import Configuration
1212
from azure.core.pipeline import policies
13-
from azure.mgmt.core.policies import ARMHttpLoggingPolicy
13+
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1414

1515
from ._version import VERSION
1616

1717
if TYPE_CHECKING:
1818
# pylint: disable=unused-import,ungrouped-imports
19-
from typing import Any
20-
2119
from azure.core.credentials import TokenCredential
2220

2321

@@ -35,20 +33,19 @@ class RedisEnterpriseManagementClientConfiguration(Configuration):
3533

3634
def __init__(
3735
self,
38-
credential, # type: "TokenCredential"
39-
subscription_id, # type: str
40-
**kwargs # type: Any
41-
):
42-
# type: (...) -> None
36+
credential: "TokenCredential",
37+
subscription_id: str,
38+
**kwargs: Any
39+
) -> None:
40+
super(RedisEnterpriseManagementClientConfiguration, self).__init__(**kwargs)
4341
if credential is None:
4442
raise ValueError("Parameter 'credential' must not be None.")
4543
if subscription_id is None:
4644
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(RedisEnterpriseManagementClientConfiguration, self).__init__(**kwargs)
4845

4946
self.credential = credential
5047
self.subscription_id = subscription_id
51-
self.api_version = "2021-03-01"
48+
self.api_version = "2022-01-01"
5249
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5350
kwargs.setdefault('sdk_moniker', 'mgmt-redisenterprise/{}'.format(VERSION))
5451
self._configure(**kwargs)
@@ -68,4 +65,4 @@ def _configure(
6865
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6966
self.authentication_policy = kwargs.get('authentication_policy')
7067
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
68+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

‎sdk/redisenterprise/azure-mgmt-redisenterprise/azure/mgmt/redisenterprise/_metadata.json

Lines changed: 57 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
{
2-
"chosen_version": "2021-03-01",
3-
"total_api_version_list": ["2021-03-01"],
2+
"chosen_version": "2022-01-01",
3+
"total_api_version_list": ["2022-01-01"],
44
"client": {
55
"name": "RedisEnterpriseManagementClient",
66
"filename": "_redis_enterprise_management_client",
77
"description": "REST API for managing Redis Enterprise resources in Azure.",
8-
"base_url": "\u0027https://management.azure.com\u0027",
9-
"custom_base_url": null,
8+
"host_value": "\"https://management.azure.com\"",
9+
"parameterized_host_template": null,
1010
"azure_arm": true,
1111
"has_lro_operations": true,
12-
"client_side_validation": true
12+
"client_side_validation": false,
13+
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"RedisEnterpriseManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
14+
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"RedisEnterpriseManagementClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
1315
},
1416
"global_parameters": {
1517
"sync": {
@@ -28,28 +30,71 @@
2830
},
2931
"async": {
3032
"credential": {
31-
"signature": "credential, # type: \"AsyncTokenCredential\"",
33+
"signature": "credential: \"AsyncTokenCredential\",",
3234
"description": "Credential needed for the client to connect to Azure.",
3335
"docstring_type": "~azure.core.credentials_async.AsyncTokenCredential",
3436
"required": true
3537
},
3638
"subscription_id": {
37-
"signature": "subscription_id, # type: str",
39+
"signature": "subscription_id: str,",
3840
"description": "The ID of the target subscription.",
3941
"docstring_type": "str",
4042
"required": true
4143
}
4244
},
4345
"constant": {
4446
},
45-
"call": "credential, subscription_id"
47+
"call": "credential, subscription_id",
48+
"service_client_specific": {
49+
"sync": {
50+
"api_version": {
51+
"signature": "api_version=None, # type: Optional[str]",
52+
"description": "API version to use if no profile is provided, or if missing in profile.",
53+
"docstring_type": "str",
54+
"required": false
55+
},
56+
"base_url": {
57+
"signature": "base_url=\"https://management.azure.com\", # type: str",
58+
"description": "Service URL",
59+
"docstring_type": "str",
60+
"required": false
61+
},
62+
"profile": {
63+
"signature": "profile=KnownProfiles.default, # type: KnownProfiles",
64+
"description": "A profile definition, from KnownProfiles to dict.",
65+
"docstring_type": "azure.profiles.KnownProfiles",
66+
"required": false
67+
}
68+
},
69+
"async": {
70+
"api_version": {
71+
"signature": "api_version: Optional[str] = None,",
72+
"description": "API version to use if no profile is provided, or if missing in profile.",
73+
"docstring_type": "str",
74+
"required": false
75+
},
76+
"base_url": {
77+
"signature": "base_url: str = \"https://management.azure.com\",",
78+
"description": "Service URL",
79+
"docstring_type": "str",
80+
"required": false
81+
},
82+
"profile": {
83+
"signature": "profile: KnownProfiles = KnownProfiles.default,",
84+
"description": "A profile definition, from KnownProfiles to dict.",
85+
"docstring_type": "azure.profiles.KnownProfiles",
86+
"required": false
87+
}
88+
}
89+
}
4690
},
4791
"config": {
4892
"credential": true,
4993
"credential_scopes": ["https://management.azure.com/.default"],
50-
"credential_default_policy_type": "BearerTokenCredentialPolicy",
51-
"credential_default_policy_type_has_async_version": true,
52-
"credential_key_header_name": null
94+
"credential_call_sync": "ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
95+
"credential_call_async": "AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
96+
"sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
97+
"async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
5398
},
5499
"operation_groups": {
55100
"operations": "Operations",
@@ -58,9 +103,5 @@
58103
"databases": "DatabasesOperations",
59104
"private_endpoint_connections": "PrivateEndpointConnectionsOperations",
60105
"private_link_resources": "PrivateLinkResourcesOperations"
61-
},
62-
"operation_mixins": {
63-
},
64-
"sync_imports": "None",
65-
"async_imports": "None"
106+
}
66107
}

‎sdk/redisenterprise/azure-mgmt-redisenterprise/azure/mgmt/redisenterprise/_patch.py

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
#
4+
# Copyright (c) Microsoft Corporation. All rights reserved.
5+
#
6+
# The MIT License (MIT)
7+
#
8+
# Permission is hereby granted, free of charge, to any person obtaining a copy
9+
# of this software and associated documentation files (the ""Software""), to
10+
# deal in the Software without restriction, including without limitation the
11+
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
12+
# sell copies of the Software, and to permit persons to whom the Software is
13+
# furnished to do so, subject to the following conditions:
14+
#
15+
# The above copyright notice and this permission notice shall be included in
16+
# all copies or substantial portions of the Software.
17+
#
18+
# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
23+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
24+
# IN THE SOFTWARE.
25+
#
26+
# --------------------------------------------------------------------------
27+
28+
# This file is used for handwritten extensions to the generated code. Example:
29+
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
30+
def patch_sdk():
31+
pass

‎sdk/redisenterprise/azure-mgmt-redisenterprise/azure/mgmt/redisenterprise/_redis_enterprise_management_client.py

Lines changed: 55 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,22 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
from typing import TYPE_CHECKING
9+
from copy import deepcopy
10+
from typing import Any, Optional, TYPE_CHECKING
1011

12+
from azure.core.rest import HttpRequest, HttpResponse
1113
from azure.mgmt.core import ARMPipelineClient
1214
from msrest import Deserializer, Serializer
1315

16+
from . import models
17+
from ._configuration import RedisEnterpriseManagementClientConfiguration
18+
from .operations import DatabasesOperations, Operations, OperationsStatusOperations, PrivateEndpointConnectionsOperations, PrivateLinkResourcesOperations, RedisEnterpriseOperations
19+
1420
if TYPE_CHECKING:
1521
# pylint: disable=unused-import,ungrouped-imports
16-
from typing import Any, Optional
17-
1822
from azure.core.credentials import TokenCredential
1923

20-
from ._configuration import RedisEnterpriseManagementClientConfiguration
21-
from .operations import Operations
22-
from .operations import OperationsStatusOperations
23-
from .operations import RedisEnterpriseOperations
24-
from .operations import DatabasesOperations
25-
from .operations import PrivateEndpointConnectionsOperations
26-
from .operations import PrivateLinkResourcesOperations
27-
from . import models
28-
29-
30-
class RedisEnterpriseManagementClient(object):
24+
class RedisEnterpriseManagementClient:
3125
"""REST API for managing Redis Enterprise resources in Azure.
3226
3327
:ivar operations: Operations operations
@@ -39,46 +33,68 @@ class RedisEnterpriseManagementClient(object):
3933
:ivar databases: DatabasesOperations operations
4034
:vartype databases: azure.mgmt.redisenterprise.operations.DatabasesOperations
4135
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
42-
:vartype private_endpoint_connections: azure.mgmt.redisenterprise.operations.PrivateEndpointConnectionsOperations
36+
:vartype private_endpoint_connections:
37+
azure.mgmt.redisenterprise.operations.PrivateEndpointConnectionsOperations
4338
:ivar private_link_resources: PrivateLinkResourcesOperations operations
44-
:vartype private_link_resources: azure.mgmt.redisenterprise.operations.PrivateLinkResourcesOperations
39+
:vartype private_link_resources:
40+
azure.mgmt.redisenterprise.operations.PrivateLinkResourcesOperations
4541
:param credential: Credential needed for the client to connect to Azure.
4642
:type credential: ~azure.core.credentials.TokenCredential
4743
:param subscription_id: The ID of the target subscription.
4844
:type subscription_id: str
49-
:param str base_url: Service URL
50-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
45+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
46+
:type base_url: str
47+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
48+
Retry-After header is present.
5149
"""
5250

5351
def __init__(
5452
self,
55-
credential, # type: "TokenCredential"
56-
subscription_id, # type: str
57-
base_url=None, # type: Optional[str]
58-
**kwargs # type: Any
59-
):
60-
# type: (...) -> None
61-
if not base_url:
62-
base_url = 'https://management.azure.com'
63-
self._config = RedisEnterpriseManagementClientConfiguration(credential, subscription_id, **kwargs)
53+
credential: "TokenCredential",
54+
subscription_id: str,
55+
base_url: str = "https://management.azure.com",
56+
**kwargs: Any
57+
) -> None:
58+
self._config = RedisEnterpriseManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
6459
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
6560

6661
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
6762
self._serialize = Serializer(client_models)
6863
self._deserialize = Deserializer(client_models)
64+
self._serialize.client_side_validation = False
65+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
66+
self.operations_status = OperationsStatusOperations(self._client, self._config, self._serialize, self._deserialize)
67+
self.redis_enterprise = RedisEnterpriseOperations(self._client, self._config, self._serialize, self._deserialize)
68+
self.databases = DatabasesOperations(self._client, self._config, self._serialize, self._deserialize)
69+
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(self._client, self._config, self._serialize, self._deserialize)
70+
self.private_link_resources = PrivateLinkResourcesOperations(self._client, self._config, self._serialize, self._deserialize)
71+
72+
73+
def _send_request(
74+
self,
75+
request, # type: HttpRequest
76+
**kwargs: Any
77+
) -> HttpResponse:
78+
"""Runs the network request through the client's chained policies.
79+
80+
>>> from azure.core.rest import HttpRequest
81+
>>> request = HttpRequest("GET", "https://www.example.org/")
82+
<HttpRequest [GET], url: 'https://www.example.org/'>
83+
>>> response = client._send_request(request)
84+
<HttpResponse: 200 OK>
85+
86+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
87+
88+
:param request: The network request you want to make. Required.
89+
:type request: ~azure.core.rest.HttpRequest
90+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
91+
:return: The response of your network call. Does not do error handling on your response.
92+
:rtype: ~azure.core.rest.HttpResponse
93+
"""
6994

70-
self.operations = Operations(
71-
self._client, self._config, self._serialize, self._deserialize)
72-
self.operations_status = OperationsStatusOperations(
73-
self._client, self._config, self._serialize, self._deserialize)
74-
self.redis_enterprise = RedisEnterpriseOperations(
75-
self._client, self._config, self._serialize, self._deserialize)
76-
self.databases = DatabasesOperations(
77-
self._client, self._config, self._serialize, self._deserialize)
78-
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
79-
self._client, self._config, self._serialize, self._deserialize)
80-
self.private_link_resources = PrivateLinkResourcesOperations(
81-
self._client, self._config, self._serialize, self._deserialize)
95+
request_copy = deepcopy(request)
96+
request_copy.url = self._client.format_url(request_copy.url)
97+
return self._client.send_request(request_copy, **kwargs)
8298

8399
def close(self):
84100
# type: () -> None

0 commit comments

Comments
 (0)