Skip to content

Commit a8076dd

Browse files
author
SDKAuto
committed
CodeGen from PR 30711 in Azure/azure-rest-api-specs
Merge e89015b5129f2ea3fc8a90d61939ecce260433e1 into c4f4021bea5eee306fa202df3c7e19271a9f1f96
1 parent 9079caf commit a8076dd

File tree

76 files changed

+4390
-652
lines changed

Some content is hidden

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

76 files changed

+4390
-652
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "3940cd77b8d74b58d4a8b3a80388ff890052be67",
2+
"commit": "cc22db4b6a6b212856e5bb217db68ff1f81a5767",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
4-
"autorest": "3.9.7",
4+
"autorest": "3.10.2",
55
"use": [
6-
"@autorest/python@6.13.7",
6+
"@autorest/python@6.19.0",
77
"@autorest/[email protected]"
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.13.7 --use=@autorest/[email protected] --version=3.9.7 --version-tolerant=False",
9+
"autorest_command": "autorest specification/redisenterprise/resource-manager/readme.md --generate-sample=True --generate-test=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --use=@autorest/python@6.19.0 --use=@autorest/[email protected] --version=3.10.2 --version-tolerant=False",
1010
"readme": "specification/redisenterprise/resource-manager/readme.md"
1111
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ class RedisEnterpriseManagementClientConfiguration: # pylint: disable=too-many-
2828
:type credential: ~azure.core.credentials.TokenCredential
2929
:param subscription_id: The ID of the target subscription. Required.
3030
:type subscription_id: str
31-
:keyword api_version: Api Version. Default value is "2024-03-01-preview". Note that overriding
31+
:keyword api_version: Api Version. Default value is "2024-09-01-preview". Note that overriding
3232
this default value may result in unsupported behavior.
3333
:paramtype api_version: str
3434
"""
3535

3636
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
37-
api_version: str = kwargs.pop("api_version", "2024-03-01-preview")
37+
api_version: str = kwargs.pop("api_version", "2024-09-01-preview")
3838

3939
if credential is None:
4040
raise ValueError("Parameter 'credential' must not be None.")

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#
2626
# --------------------------------------------------------------------------
2727

28+
2829
# This file is used for handwritten extensions to the generated code. Example:
2930
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
3031
def patch_sdk():

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

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

99
from copy import deepcopy
1010
from typing import Any, TYPE_CHECKING
11+
from typing_extensions import Self
1112

1213
from azure.core.pipeline import policies
1314
from azure.core.rest import HttpRequest, HttpResponse
@@ -18,6 +19,7 @@
1819
from ._configuration import RedisEnterpriseManagementClientConfiguration
1920
from ._serialization import Deserializer, Serializer
2021
from .operations import (
22+
AccessPolicyAssignmentOperations,
2123
DatabasesOperations,
2224
Operations,
2325
OperationsStatusOperations,
@@ -31,7 +33,7 @@
3133
from azure.core.credentials import TokenCredential
3234

3335

34-
class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-version-keyword
36+
class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
3537
"""REST API for managing Redis Enterprise resources in Azure.
3638
3739
:ivar operations: Operations operations
@@ -42,6 +44,9 @@ class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-ver
4244
:vartype redis_enterprise: azure.mgmt.redisenterprise.operations.RedisEnterpriseOperations
4345
:ivar databases: DatabasesOperations operations
4446
:vartype databases: azure.mgmt.redisenterprise.operations.DatabasesOperations
47+
:ivar access_policy_assignment: AccessPolicyAssignmentOperations operations
48+
:vartype access_policy_assignment:
49+
azure.mgmt.redisenterprise.operations.AccessPolicyAssignmentOperations
4550
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
4651
:vartype private_endpoint_connections:
4752
azure.mgmt.redisenterprise.operations.PrivateEndpointConnectionsOperations
@@ -54,7 +59,7 @@ class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-ver
5459
:type subscription_id: str
5560
:param base_url: Service URL. Default value is "https://management.azure.com".
5661
:type base_url: str
57-
:keyword api_version: Api Version. Default value is "2024-03-01-preview". Note that overriding
62+
:keyword api_version: Api Version. Default value is "2024-09-01-preview". Note that overriding
5863
this default value may result in unsupported behavior.
5964
:paramtype api_version: str
6065
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
@@ -103,6 +108,9 @@ def __init__(
103108
self._client, self._config, self._serialize, self._deserialize
104109
)
105110
self.databases = DatabasesOperations(self._client, self._config, self._serialize, self._deserialize)
111+
self.access_policy_assignment = AccessPolicyAssignmentOperations(
112+
self._client, self._config, self._serialize, self._deserialize
113+
)
106114
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
107115
self._client, self._config, self._serialize, self._deserialize
108116
)
@@ -135,7 +143,7 @@ def _send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs:
135143
def close(self) -> None:
136144
self._client.close()
137145

138-
def __enter__(self) -> "RedisEnterpriseManagementClient":
146+
def __enter__(self) -> Self:
139147
self._client.__enter__()
140148
return self
141149

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ def _json_attemp(data):
144144
# context otherwise.
145145
_LOGGER.critical("Wasn't XML not JSON, failing")
146146
raise DeserializationError("XML is invalid") from err
147+
elif content_type.startswith("text/"):
148+
return data_as_str
147149
raise DeserializationError("Cannot deserialize content-type: {}".format(content_type))
148150

149151
@classmethod
@@ -1441,7 +1443,7 @@ def _deserialize(self, target_obj, data):
14411443
elif isinstance(response, type) and issubclass(response, Enum):
14421444
return self.deserialize_enum(data, response)
14431445

1444-
if data is None:
1446+
if data is None or data is CoreNull:
14451447
return data
14461448
try:
14471449
attributes = response._attribute_map # type: ignore

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

Lines changed: 0 additions & 16 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
VERSION = "3.1.0b1"
9+
VERSION = "2.0.0"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ class RedisEnterpriseManagementClientConfiguration: # pylint: disable=too-many-
2828
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
2929
:param subscription_id: The ID of the target subscription. Required.
3030
:type subscription_id: str
31-
:keyword api_version: Api Version. Default value is "2024-03-01-preview". Note that overriding
31+
:keyword api_version: Api Version. Default value is "2024-09-01-preview". Note that overriding
3232
this default value may result in unsupported behavior.
3333
:paramtype api_version: str
3434
"""
3535

3636
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
37-
api_version: str = kwargs.pop("api_version", "2024-03-01-preview")
37+
api_version: str = kwargs.pop("api_version", "2024-09-01-preview")
3838

3939
if credential is None:
4040
raise ValueError("Parameter 'credential' must not be None.")

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#
2626
# --------------------------------------------------------------------------
2727

28+
2829
# This file is used for handwritten extensions to the generated code. Example:
2930
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
3031
def patch_sdk():

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

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

99
from copy import deepcopy
1010
from typing import Any, Awaitable, TYPE_CHECKING
11+
from typing_extensions import Self
1112

1213
from azure.core.pipeline import policies
1314
from azure.core.rest import AsyncHttpResponse, HttpRequest
@@ -18,6 +19,7 @@
1819
from .._serialization import Deserializer, Serializer
1920
from ._configuration import RedisEnterpriseManagementClientConfiguration
2021
from .operations import (
22+
AccessPolicyAssignmentOperations,
2123
DatabasesOperations,
2224
Operations,
2325
OperationsStatusOperations,
@@ -31,7 +33,7 @@
3133
from azure.core.credentials_async import AsyncTokenCredential
3234

3335

34-
class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-version-keyword
36+
class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
3537
"""REST API for managing Redis Enterprise resources in Azure.
3638
3739
:ivar operations: Operations operations
@@ -43,6 +45,9 @@ class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-ver
4345
:vartype redis_enterprise: azure.mgmt.redisenterprise.aio.operations.RedisEnterpriseOperations
4446
:ivar databases: DatabasesOperations operations
4547
:vartype databases: azure.mgmt.redisenterprise.aio.operations.DatabasesOperations
48+
:ivar access_policy_assignment: AccessPolicyAssignmentOperations operations
49+
:vartype access_policy_assignment:
50+
azure.mgmt.redisenterprise.aio.operations.AccessPolicyAssignmentOperations
4651
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
4752
:vartype private_endpoint_connections:
4853
azure.mgmt.redisenterprise.aio.operations.PrivateEndpointConnectionsOperations
@@ -55,7 +60,7 @@ class RedisEnterpriseManagementClient: # pylint: disable=client-accepts-api-ver
5560
:type subscription_id: str
5661
:param base_url: Service URL. Default value is "https://management.azure.com".
5762
:type base_url: str
58-
:keyword api_version: Api Version. Default value is "2024-03-01-preview". Note that overriding
63+
:keyword api_version: Api Version. Default value is "2024-09-01-preview". Note that overriding
5964
this default value may result in unsupported behavior.
6065
:paramtype api_version: str
6166
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
@@ -104,6 +109,9 @@ def __init__(
104109
self._client, self._config, self._serialize, self._deserialize
105110
)
106111
self.databases = DatabasesOperations(self._client, self._config, self._serialize, self._deserialize)
112+
self.access_policy_assignment = AccessPolicyAssignmentOperations(
113+
self._client, self._config, self._serialize, self._deserialize
114+
)
107115
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
108116
self._client, self._config, self._serialize, self._deserialize
109117
)
@@ -138,7 +146,7 @@ def _send_request(
138146
async def close(self) -> None:
139147
await self._client.close()
140148

141-
async def __aenter__(self) -> "RedisEnterpriseManagementClient":
149+
async def __aenter__(self) -> Self:
142150
await self._client.__aenter__()
143151
return self
144152

0 commit comments

Comments
 (0)