Skip to content

Commit df843ae

Browse files
[AutoRelease] t2-redisenterprise-2024-05-06-33255(can only be merged by SDK owner) (#35488)
* code and test * Update assets.json --------- Co-authored-by: azure-sdk <PythonSdkPipelines> Co-authored-by: ChenxiJiang333 <[email protected]>
1 parent 8ad5074 commit df843ae

File tree

54 files changed

+1855
-1802
lines changed

Some content is hidden

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

54 files changed

+1855
-1802
lines changed

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

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

3+
## 3.1.0b1 (2024-05-20)
4+
5+
### Features Added
6+
7+
- Added operation DatabasesOperations.begin_force_link_to_replication_group
8+
- Added operation DatabasesOperations.begin_upgrade_db_redis_version
9+
- Model Database has a new parameter defer_upgrade
10+
- Model Database has a new parameter redis_version
11+
- Model DatabaseUpdate has a new parameter defer_upgrade
12+
- Model DatabaseUpdate has a new parameter redis_version
13+
314
## 3.0.0 (2024-03-04)
415

516
### Features Added
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "aac54838d8d098a005df918d1667ff19423cc51f",
2+
"commit": "3940cd77b8d74b58d4a8b3a80388ff890052be67",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
44
"autorest": "3.9.7",
55
"use": [
6-
"@autorest/python@6.7.1",
7-
"@autorest/modelerfour@4.26.2"
6+
"@autorest/python@6.13.7",
7+
"@autorest/modelerfour@4.27.0"
88
],
9-
"autorest_command": "autorest specification/redisenterprise/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
9+
"autorest_command": "autorest specification/redisenterprise/resource-manager/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.13.7 --use=@autorest/modelerfour@4.27.0 --version=3.9.7 --version-tolerant=False",
1010
"readme": "specification/redisenterprise/resource-manager/readme.md"
1111
}

sdk/redisenterprise/azure-mgmt-redisenterprise/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "python",
44
"TagPrefix": "python/redisenterprise/azure-mgmt-redisenterprise",
5-
"Tag": "python/redisenterprise/azure-mgmt-redisenterprise_672aa19f2d"
5+
"Tag": "python/redisenterprise/azure-mgmt-redisenterprise_a8ec9aca50"
66
}

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
from typing import Any, TYPE_CHECKING
1010

11-
from azure.core.configuration import Configuration
1211
from azure.core.pipeline import policies
1312
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1413

@@ -19,7 +18,7 @@
1918
from azure.core.credentials import TokenCredential
2019

2120

22-
class RedisEnterpriseManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
21+
class RedisEnterpriseManagementClientConfiguration: # pylint: disable=too-many-instance-attributes,name-too-long
2322
"""Configuration for RedisEnterpriseManagementClient.
2423
2524
Note that all parameters used to create this instance are saved as instance
@@ -29,14 +28,13 @@ class RedisEnterpriseManagementClientConfiguration(Configuration): # pylint: di
2928
:type credential: ~azure.core.credentials.TokenCredential
3029
:param subscription_id: The ID of the target subscription. Required.
3130
:type subscription_id: str
32-
:keyword api_version: Api Version. Default value is "2023-11-01". Note that overriding this
33-
default value may result in unsupported behavior.
31+
:keyword api_version: Api Version. Default value is "2024-03-01-preview". Note that overriding
32+
this default value may result in unsupported behavior.
3433
:paramtype api_version: str
3534
"""
3635

3736
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
38-
super(RedisEnterpriseManagementClientConfiguration, self).__init__(**kwargs)
39-
api_version: str = kwargs.pop("api_version", "2023-11-01")
37+
api_version: str = kwargs.pop("api_version", "2024-03-01-preview")
4038

4139
if credential is None:
4240
raise ValueError("Parameter 'credential' must not be None.")
@@ -48,6 +46,7 @@ def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs
4846
self.api_version = api_version
4947
self.credential_scopes = kwargs.pop("credential_scopes", ["https://management.azure.com/.default"])
5048
kwargs.setdefault("sdk_moniker", "mgmt-redisenterprise/{}".format(VERSION))
49+
self.polling_interval = kwargs.get("polling_interval", 30)
5150
self._configure(**kwargs)
5251

5352
def _configure(self, **kwargs: Any) -> None:
@@ -56,9 +55,9 @@ def _configure(self, **kwargs: Any) -> None:
5655
self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
5756
self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
5857
self.http_logging_policy = kwargs.get("http_logging_policy") or ARMHttpLoggingPolicy(**kwargs)
59-
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
6058
self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
6159
self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
60+
self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
6261
self.authentication_policy = kwargs.get("authentication_policy")
6362
if self.credential and not self.authentication_policy:
6463
self.authentication_policy = ARMChallengeAuthenticationPolicy(

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

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
from copy import deepcopy
1010
from typing import Any, TYPE_CHECKING
1111

12+
from azure.core.pipeline import policies
1213
from azure.core.rest import HttpRequest, HttpResponse
1314
from azure.mgmt.core import ARMPipelineClient
15+
from azure.mgmt.core.policies import ARMAutoResourceProviderRegistrationPolicy
1416

1517
from . import models as _models
1618
from ._configuration import RedisEnterpriseManagementClientConfiguration
@@ -52,8 +54,8 @@ class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-ver
5254
:type subscription_id: str
5355
:param base_url: Service URL. Default value is "https://management.azure.com".
5456
:type base_url: str
55-
:keyword api_version: Api Version. Default value is "2023-11-01". Note that overriding this
56-
default value may result in unsupported behavior.
57+
:keyword api_version: Api Version. Default value is "2024-03-01-preview". Note that overriding
58+
this default value may result in unsupported behavior.
5759
:paramtype api_version: str
5860
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
5961
Retry-After header is present.
@@ -69,7 +71,25 @@ def __init__(
6971
self._config = RedisEnterpriseManagementClientConfiguration(
7072
credential=credential, subscription_id=subscription_id, **kwargs
7173
)
72-
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
74+
_policies = kwargs.pop("policies", None)
75+
if _policies is None:
76+
_policies = [
77+
policies.RequestIdPolicy(**kwargs),
78+
self._config.headers_policy,
79+
self._config.user_agent_policy,
80+
self._config.proxy_policy,
81+
policies.ContentDecodePolicy(**kwargs),
82+
ARMAutoResourceProviderRegistrationPolicy(),
83+
self._config.redirect_policy,
84+
self._config.retry_policy,
85+
self._config.authentication_policy,
86+
self._config.custom_hook_policy,
87+
self._config.logging_policy,
88+
policies.DistributedTracingPolicy(**kwargs),
89+
policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
90+
self._config.http_logging_policy,
91+
]
92+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, policies=_policies, **kwargs)
7393

7494
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
7595
self._serialize = Serializer(client_models)
@@ -90,7 +110,7 @@ def __init__(
90110
self._client, self._config, self._serialize, self._deserialize
91111
)
92112

93-
def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
113+
def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
94114
"""Runs the network request through the client's chained policies.
95115
96116
>>> from azure.core.rest import HttpRequest
@@ -110,7 +130,7 @@ def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
110130

111131
request_copy = deepcopy(request)
112132
request_copy.url = self._client.format_url(request_copy.url)
113-
return self._client.send_request(request_copy, **kwargs)
133+
return self._client.send_request(request_copy, stream=stream, **kwargs) # type: ignore
114134

115135
def close(self) -> None:
116136
self._client.close()

0 commit comments

Comments
 (0)