Skip to content

Commit af8d037

Browse files
author
SDKAuto
committed
CodeGen from PR 25215 in Azure/azure-rest-api-specs
Merge 9f2ed77f9e51ae760bdb4f974cd46795bb621db2 into 95c0363e4cae8756c6a33b58add67776db427bbc
1 parent 85ed60d commit af8d037

File tree

74 files changed

+4257
-369
lines changed

Some content is hidden

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

74 files changed

+4257
-369
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "c183bb012de8e9e1d0d2e67a0994748df4747d2c",
2+
"commit": "d0a8b1c13b21cebacd0fbcdbd753ddfe13442d70",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
4-
"autorest": "3.9.2",
4+
"autorest": "3.9.7",
55
"use": [
6-
"@autorest/python@6.4.12",
7-
"@autorest/modelerfour@4.24.3"
6+
"@autorest/python@6.7.1",
7+
"@autorest/modelerfour@4.26.2"
88
],
9-
"autorest_command": "autorest specification/redis/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.4.12 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
9+
"autorest_command": "autorest specification/redis/resource-manager/readme.md --generate-sample=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.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
1010
"readme": "specification/redis/resource-manager/readme.md"
1111
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,16 @@ class RedisManagementClientConfiguration(Configuration): # pylint: disable=too-
2727
2828
:param credential: Credential needed for the client to connect to Azure. Required.
2929
:type credential: ~azure.core.credentials.TokenCredential
30-
:param subscription_id: Gets subscription credentials which uniquely identify the Microsoft
31-
Azure subscription. The subscription ID forms part of the URI for every service call. Required.
30+
:param subscription_id: The ID of the target subscription. Required.
3231
:type subscription_id: str
33-
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
32+
:keyword api_version: Api Version. Default value is "2023-08-01". Note that overriding this
3433
default value may result in unsupported behavior.
3534
:paramtype api_version: str
3635
"""
3736

3837
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
3938
super(RedisManagementClientConfiguration, self).__init__(**kwargs)
40-
api_version: str = kwargs.pop("api_version", "2023-04-01")
39+
api_version: str = kwargs.pop("api_version", "2023-08-01")
4140

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

sdk/redis/azure-mgmt-redis/azure/mgmt/redis/_redis_management_client.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
from ._configuration import RedisManagementClientConfiguration
1717
from ._serialization import Deserializer, Serializer
1818
from .operations import (
19+
AccessPolicyAssignmentOperations,
20+
AccessPolicyOperations,
1921
AsyncOperationStatusOperations,
2022
FirewallRulesOperations,
2123
LinkedServerOperations,
@@ -51,14 +53,17 @@ class RedisManagementClient: # pylint: disable=client-accepts-api-version-keywo
5153
:vartype private_link_resources: azure.mgmt.redis.operations.PrivateLinkResourcesOperations
5254
:ivar async_operation_status: AsyncOperationStatusOperations operations
5355
:vartype async_operation_status: azure.mgmt.redis.operations.AsyncOperationStatusOperations
56+
:ivar access_policy: AccessPolicyOperations operations
57+
:vartype access_policy: azure.mgmt.redis.operations.AccessPolicyOperations
58+
:ivar access_policy_assignment: AccessPolicyAssignmentOperations operations
59+
:vartype access_policy_assignment: azure.mgmt.redis.operations.AccessPolicyAssignmentOperations
5460
:param credential: Credential needed for the client to connect to Azure. Required.
5561
:type credential: ~azure.core.credentials.TokenCredential
56-
:param subscription_id: Gets subscription credentials which uniquely identify the Microsoft
57-
Azure subscription. The subscription ID forms part of the URI for every service call. Required.
62+
:param subscription_id: The ID of the target subscription. Required.
5863
:type subscription_id: str
5964
:param base_url: Service URL. Default value is "https://management.azure.com".
6065
:type base_url: str
61-
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
66+
:keyword api_version: Api Version. Default value is "2023-08-01". Note that overriding this
6267
default value may result in unsupported behavior.
6368
:paramtype api_version: str
6469
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
@@ -95,6 +100,10 @@ def __init__(
95100
self.async_operation_status = AsyncOperationStatusOperations(
96101
self._client, self._config, self._serialize, self._deserialize
97102
)
103+
self.access_policy = AccessPolicyOperations(self._client, self._config, self._serialize, self._deserialize)
104+
self.access_policy_assignment = AccessPolicyAssignmentOperations(
105+
self._client, self._config, self._serialize, self._deserialize
106+
)
98107

99108
def _send_request(self, request: HttpRequest, **kwargs: Any) -> HttpResponse:
100109
"""Runs the network request through the client's chained policies.

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

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -662,8 +662,9 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
662662
_serialized.update(_new_attr) # type: ignore
663663
_new_attr = _new_attr[k] # type: ignore
664664
_serialized = _serialized[k]
665-
except ValueError:
666-
continue
665+
except ValueError as err:
666+
if isinstance(err, SerializationError):
667+
raise
667668

668669
except (AttributeError, KeyError, TypeError) as err:
669670
msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
@@ -741,6 +742,8 @@ def query(self, name, data, data_type, **kwargs):
741742
742743
:param data: The data to be serialized.
743744
:param str data_type: The type to be serialized from.
745+
:keyword bool skip_quote: Whether to skip quote the serialized result.
746+
Defaults to False.
744747
:rtype: str
745748
:raises: TypeError if serialization fails.
746749
:raises: ValueError if data is None
@@ -749,10 +752,8 @@ def query(self, name, data, data_type, **kwargs):
749752
# Treat the list aside, since we don't want to encode the div separator
750753
if data_type.startswith("["):
751754
internal_data_type = data_type[1:-1]
752-
data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data]
753-
if not kwargs.get("skip_quote", False):
754-
data = [quote(str(d), safe="") for d in data]
755-
return str(self.serialize_iter(data, internal_data_type, **kwargs))
755+
do_quote = not kwargs.get("skip_quote", False)
756+
return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs))
756757

757758
# Not a list, regular serialization
758759
output = self.serialize_data(data, data_type, **kwargs)
@@ -891,6 +892,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
891892
not be None or empty.
892893
:param str div: If set, this str will be used to combine the elements
893894
in the iterable into a combined string. Default is 'None'.
895+
:keyword bool do_quote: Whether to quote the serialized result of each iterable element.
896+
Defaults to False.
894897
:rtype: list, str
895898
"""
896899
if isinstance(data, str):
@@ -903,9 +906,14 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
903906
for d in data:
904907
try:
905908
serialized.append(self.serialize_data(d, iter_type, **kwargs))
906-
except ValueError:
909+
except ValueError as err:
910+
if isinstance(err, SerializationError):
911+
raise
907912
serialized.append(None)
908913

914+
if kwargs.get("do_quote", False):
915+
serialized = ["" if s is None else quote(str(s), safe="") for s in serialized]
916+
909917
if div:
910918
serialized = ["" if s is None else str(s) for s in serialized]
911919
serialized = div.join(serialized)
@@ -950,7 +958,9 @@ def serialize_dict(self, attr, dict_type, **kwargs):
950958
for key, value in attr.items():
951959
try:
952960
serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
953-
except ValueError:
961+
except ValueError as err:
962+
if isinstance(err, SerializationError):
963+
raise
954964
serialized[self.serialize_unicode(key)] = None
955965

956966
if "xml" in serialization_ctxt:

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

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

8-
from typing import List, cast
9-
108
from azure.core.pipeline.transport import HttpRequest
119

1210

@@ -16,15 +14,3 @@ def _convert_request(request, files=None):
1614
if files:
1715
request.set_formdata_body(files)
1816
return request
19-
20-
21-
def _format_url_section(template, **kwargs):
22-
components = template.split("/")
23-
while components:
24-
try:
25-
return template.format(**kwargs)
26-
except KeyError as key:
27-
# Need the cast, as for some reasons "split" is typed as list[str | Any]
28-
formatted_components = cast(List[str], template.split("/"))
29-
components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
30-
template = "/".join(components)

sdk/redis/azure-mgmt-redis/azure/mgmt/redis/_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 = "14.2.0"
9+
VERSION = "12.0.0b1"

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,16 @@ class RedisManagementClientConfiguration(Configuration): # pylint: disable=too-
2727
2828
:param credential: Credential needed for the client to connect to Azure. Required.
2929
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
30-
:param subscription_id: Gets subscription credentials which uniquely identify the Microsoft
31-
Azure subscription. The subscription ID forms part of the URI for every service call. Required.
30+
:param subscription_id: The ID of the target subscription. Required.
3231
:type subscription_id: str
33-
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
32+
:keyword api_version: Api Version. Default value is "2023-08-01". Note that overriding this
3433
default value may result in unsupported behavior.
3534
:paramtype api_version: str
3635
"""
3736

3837
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
3938
super(RedisManagementClientConfiguration, self).__init__(**kwargs)
40-
api_version: str = kwargs.pop("api_version", "2023-04-01")
39+
api_version: str = kwargs.pop("api_version", "2023-08-01")
4140

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

sdk/redis/azure-mgmt-redis/azure/mgmt/redis/aio/_redis_management_client.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
from .._serialization import Deserializer, Serializer
1717
from ._configuration import RedisManagementClientConfiguration
1818
from .operations import (
19+
AccessPolicyAssignmentOperations,
20+
AccessPolicyOperations,
1921
AsyncOperationStatusOperations,
2022
FirewallRulesOperations,
2123
LinkedServerOperations,
@@ -51,14 +53,18 @@ class RedisManagementClient: # pylint: disable=client-accepts-api-version-keywo
5153
:vartype private_link_resources: azure.mgmt.redis.aio.operations.PrivateLinkResourcesOperations
5254
:ivar async_operation_status: AsyncOperationStatusOperations operations
5355
:vartype async_operation_status: azure.mgmt.redis.aio.operations.AsyncOperationStatusOperations
56+
:ivar access_policy: AccessPolicyOperations operations
57+
:vartype access_policy: azure.mgmt.redis.aio.operations.AccessPolicyOperations
58+
:ivar access_policy_assignment: AccessPolicyAssignmentOperations operations
59+
:vartype access_policy_assignment:
60+
azure.mgmt.redis.aio.operations.AccessPolicyAssignmentOperations
5461
:param credential: Credential needed for the client to connect to Azure. Required.
5562
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
56-
:param subscription_id: Gets subscription credentials which uniquely identify the Microsoft
57-
Azure subscription. The subscription ID forms part of the URI for every service call. Required.
63+
:param subscription_id: The ID of the target subscription. Required.
5864
:type subscription_id: str
5965
:param base_url: Service URL. Default value is "https://management.azure.com".
6066
:type base_url: str
61-
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
67+
:keyword api_version: Api Version. Default value is "2023-08-01". Note that overriding this
6268
default value may result in unsupported behavior.
6369
:paramtype api_version: str
6470
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
@@ -95,6 +101,10 @@ def __init__(
95101
self.async_operation_status = AsyncOperationStatusOperations(
96102
self._client, self._config, self._serialize, self._deserialize
97103
)
104+
self.access_policy = AccessPolicyOperations(self._client, self._config, self._serialize, self._deserialize)
105+
self.access_policy_assignment = AccessPolicyAssignmentOperations(
106+
self._client, self._config, self._serialize, self._deserialize
107+
)
98108

99109
def _send_request(self, request: HttpRequest, **kwargs: Any) -> Awaitable[AsyncHttpResponse]:
100110
"""Runs the network request through the client's chained policies.

sdk/redis/azure-mgmt-redis/azure/mgmt/redis/aio/operations/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
1515
from ._private_link_resources_operations import PrivateLinkResourcesOperations
1616
from ._async_operation_status_operations import AsyncOperationStatusOperations
17+
from ._access_policy_operations import AccessPolicyOperations
18+
from ._access_policy_assignment_operations import AccessPolicyAssignmentOperations
1719

1820
from ._patch import __all__ as _patch_all
1921
from ._patch import * # pylint: disable=unused-wildcard-import
@@ -28,6 +30,8 @@
2830
"PrivateEndpointConnectionsOperations",
2931
"PrivateLinkResourcesOperations",
3032
"AsyncOperationStatusOperations",
33+
"AccessPolicyOperations",
34+
"AccessPolicyAssignmentOperations",
3135
]
3236
__all__.extend([p for p in _patch_all if p not in __all__])
3337
_patch_sdk()

0 commit comments

Comments
 (0)