Skip to content

Commit c5a8634

Browse files
author
SDKAuto
committed
CodeGen from PR 25219 in Azure/azure-rest-api-specs
Merge 0a6d8fa2d06e786f86d8e138f0f3413fe522ec99 into 2735b620aeb695c106fecd9bf28d719aa0b75b43
1 parent 0f93fad commit c5a8634

File tree

110 files changed

+4235
-891
lines changed

Some content is hidden

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

110 files changed

+4235
-891
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "66174681c09b101de03fd35399080cfbccc93e8f",
2+
"commit": "4d0de992bd7359a53502aff4fddf297e26f86916",
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.0",
7-
"@autorest/modelerfour@4.24.3"
6+
"@autorest/python@6.7.1",
7+
"@autorest/modelerfour@4.26.2"
88
],
9-
"autorest_command": "autorest specification/desktopvirtualization/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 --tag=package-2022-09 --use=@autorest/python@6.4.0 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
9+
"autorest_command": "autorest specification/desktopvirtualization/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/desktopvirtualization/resource-manager/readme.md"
1111
}

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

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

9-
import sys
109
from typing import Any, TYPE_CHECKING
1110

1211
from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
1514

1615
from ._version import VERSION
1716

18-
if sys.version_info >= (3, 8):
19-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
20-
else:
21-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
22-
2317
if TYPE_CHECKING:
2418
# pylint: disable=unused-import,ungrouped-imports
2519
from azure.core.credentials import TokenCredential
@@ -35,14 +29,14 @@ class DesktopVirtualizationMgmtClientConfiguration(Configuration): # pylint: di
3529
:type credential: ~azure.core.credentials.TokenCredential
3630
:param subscription_id: The ID of the target subscription. Required.
3731
:type subscription_id: str
38-
:keyword api_version: Api Version. Default value is "2022-09-09". Note that overriding this
39-
default value may result in unsupported behavior.
32+
:keyword api_version: Api Version. Default value is "2022-10-14-preview". Note that overriding
33+
this default value may result in unsupported behavior.
4034
:paramtype api_version: str
4135
"""
4236

4337
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
4438
super(DesktopVirtualizationMgmtClientConfiguration, self).__init__(**kwargs)
45-
api_version: Literal["2022-09-09"] = kwargs.pop("api_version", "2022-09-09")
39+
api_version: str = kwargs.pop("api_version", "2022-10-14-preview")
4640

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

‎sdk/desktopvirtualization/azure-mgmt-desktopvirtualization/azure/mgmt/desktopvirtualization/_desktop_virtualization_mgmt_client.py

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
MSIXPackagesOperations,
2424
MsixImagesOperations,
2525
Operations,
26+
PrivateEndpointConnectionsOperations,
27+
PrivateLinkResourcesOperations,
2628
ScalingPlanPooledSchedulesOperations,
2729
ScalingPlansOperations,
2830
SessionHostsOperations,
@@ -43,6 +45,12 @@ class DesktopVirtualizationMgmtClient: # pylint: disable=client-accepts-api-ver
4345
:vartype operations: azure.mgmt.desktopvirtualization.operations.Operations
4446
:ivar workspaces: WorkspacesOperations operations
4547
:vartype workspaces: azure.mgmt.desktopvirtualization.operations.WorkspacesOperations
48+
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
49+
:vartype private_endpoint_connections:
50+
azure.mgmt.desktopvirtualization.operations.PrivateEndpointConnectionsOperations
51+
:ivar private_link_resources: PrivateLinkResourcesOperations operations
52+
:vartype private_link_resources:
53+
azure.mgmt.desktopvirtualization.operations.PrivateLinkResourcesOperations
4654
:ivar scaling_plans: ScalingPlansOperations operations
4755
:vartype scaling_plans: azure.mgmt.desktopvirtualization.operations.ScalingPlansOperations
4856
:ivar scaling_plan_pooled_schedules: ScalingPlanPooledSchedulesOperations operations
@@ -73,8 +81,8 @@ class DesktopVirtualizationMgmtClient: # pylint: disable=client-accepts-api-ver
7381
:type subscription_id: str
7482
:param base_url: Service URL. Default value is "https://management.azure.com".
7583
:type base_url: str
76-
:keyword api_version: Api Version. Default value is "2022-09-09". Note that overriding this
77-
default value may result in unsupported behavior.
84+
:keyword api_version: Api Version. Default value is "2022-10-14-preview". Note that overriding
85+
this default value may result in unsupported behavior.
7886
:paramtype api_version: str
7987
"""
8088

@@ -88,14 +96,20 @@ def __init__(
8896
self._config = DesktopVirtualizationMgmtClientConfiguration(
8997
credential=credential, subscription_id=subscription_id, **kwargs
9098
)
91-
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
99+
self._client: ARMPipelineClient = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
92100

93101
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
94102
self._serialize = Serializer(client_models)
95103
self._deserialize = Deserializer(client_models)
96104
self._serialize.client_side_validation = False
97105
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
98106
self.workspaces = WorkspacesOperations(self._client, self._config, self._serialize, self._deserialize)
107+
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
108+
self._client, self._config, self._serialize, self._deserialize
109+
)
110+
self.private_link_resources = PrivateLinkResourcesOperations(
111+
self._client, self._config, self._serialize, self._deserialize
112+
)
99113
self.scaling_plans = ScalingPlansOperations(self._client, self._config, self._serialize, self._deserialize)
100114
self.scaling_plan_pooled_schedules = ScalingPlanPooledSchedulesOperations(
101115
self._client, self._config, self._serialize, self._deserialize

‎sdk/desktopvirtualization/azure-mgmt-desktopvirtualization/azure/mgmt/desktopvirtualization/_serialization.py

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
629629
if xml_desc.get("attr", False):
630630
if xml_ns:
631631
ET.register_namespace(xml_prefix, xml_ns)
632-
xml_name = "{}{}".format(xml_ns, xml_name)
632+
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
633633
serialized.set(xml_name, new_attr) # type: ignore
634634
continue
635635
if xml_desc.get("text", False):
@@ -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:
@@ -1271,7 +1281,7 @@ def _extract_name_from_internal_type(internal_type):
12711281
xml_name = internal_type_xml_map.get("name", internal_type.__name__)
12721282
xml_ns = internal_type_xml_map.get("ns", None)
12731283
if xml_ns:
1274-
xml_name = "{}{}".format(xml_ns, xml_name)
1284+
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
12751285
return xml_name
12761286

12771287

@@ -1295,7 +1305,7 @@ def xml_key_extractor(attr, attr_desc, data):
12951305
# Integrate namespace if necessary
12961306
xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None))
12971307
if xml_ns:
1298-
xml_name = "{}{}".format(xml_ns, xml_name)
1308+
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
12991309

13001310
# If it's an attribute, that's simple
13011311
if xml_desc.get("attr", False):

‎sdk/desktopvirtualization/azure-mgmt-desktopvirtualization/azure/mgmt/desktopvirtualization/_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/desktopvirtualization/azure-mgmt-desktopvirtualization/azure/mgmt/desktopvirtualization/_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 = "1.0.0"
9+
VERSION = "1.0.0b1"

‎sdk/desktopvirtualization/azure-mgmt-desktopvirtualization/azure/mgmt/desktopvirtualization/aio/_configuration.py

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

9-
import sys
109
from typing import Any, TYPE_CHECKING
1110

1211
from azure.core.configuration import Configuration
@@ -15,11 +14,6 @@
1514

1615
from .._version import VERSION
1716

18-
if sys.version_info >= (3, 8):
19-
from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports
20-
else:
21-
from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports
22-
2317
if TYPE_CHECKING:
2418
# pylint: disable=unused-import,ungrouped-imports
2519
from azure.core.credentials_async import AsyncTokenCredential
@@ -35,14 +29,14 @@ class DesktopVirtualizationMgmtClientConfiguration(Configuration): # pylint: di
3529
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
3630
:param subscription_id: The ID of the target subscription. Required.
3731
:type subscription_id: str
38-
:keyword api_version: Api Version. Default value is "2022-09-09". Note that overriding this
39-
default value may result in unsupported behavior.
32+
:keyword api_version: Api Version. Default value is "2022-10-14-preview". Note that overriding
33+
this default value may result in unsupported behavior.
4034
:paramtype api_version: str
4135
"""
4236

4337
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
4438
super(DesktopVirtualizationMgmtClientConfiguration, self).__init__(**kwargs)
45-
api_version: Literal["2022-09-09"] = kwargs.pop("api_version", "2022-09-09")
39+
api_version: str = kwargs.pop("api_version", "2022-10-14-preview")
4640

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

‎sdk/desktopvirtualization/azure-mgmt-desktopvirtualization/azure/mgmt/desktopvirtualization/aio/_desktop_virtualization_mgmt_client.py

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
MSIXPackagesOperations,
2424
MsixImagesOperations,
2525
Operations,
26+
PrivateEndpointConnectionsOperations,
27+
PrivateLinkResourcesOperations,
2628
ScalingPlanPooledSchedulesOperations,
2729
ScalingPlansOperations,
2830
SessionHostsOperations,
@@ -43,6 +45,12 @@ class DesktopVirtualizationMgmtClient: # pylint: disable=client-accepts-api-ver
4345
:vartype operations: azure.mgmt.desktopvirtualization.aio.operations.Operations
4446
:ivar workspaces: WorkspacesOperations operations
4547
:vartype workspaces: azure.mgmt.desktopvirtualization.aio.operations.WorkspacesOperations
48+
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
49+
:vartype private_endpoint_connections:
50+
azure.mgmt.desktopvirtualization.aio.operations.PrivateEndpointConnectionsOperations
51+
:ivar private_link_resources: PrivateLinkResourcesOperations operations
52+
:vartype private_link_resources:
53+
azure.mgmt.desktopvirtualization.aio.operations.PrivateLinkResourcesOperations
4654
:ivar scaling_plans: ScalingPlansOperations operations
4755
:vartype scaling_plans: azure.mgmt.desktopvirtualization.aio.operations.ScalingPlansOperations
4856
:ivar scaling_plan_pooled_schedules: ScalingPlanPooledSchedulesOperations operations
@@ -74,8 +82,8 @@ class DesktopVirtualizationMgmtClient: # pylint: disable=client-accepts-api-ver
7482
:type subscription_id: str
7583
:param base_url: Service URL. Default value is "https://management.azure.com".
7684
:type base_url: str
77-
:keyword api_version: Api Version. Default value is "2022-09-09". Note that overriding this
78-
default value may result in unsupported behavior.
85+
:keyword api_version: Api Version. Default value is "2022-10-14-preview". Note that overriding
86+
this default value may result in unsupported behavior.
7987
:paramtype api_version: str
8088
"""
8189

@@ -89,14 +97,20 @@ def __init__(
8997
self._config = DesktopVirtualizationMgmtClientConfiguration(
9098
credential=credential, subscription_id=subscription_id, **kwargs
9199
)
92-
self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
100+
self._client: AsyncARMPipelineClient = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
93101

94102
client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
95103
self._serialize = Serializer(client_models)
96104
self._deserialize = Deserializer(client_models)
97105
self._serialize.client_side_validation = False
98106
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
99107
self.workspaces = WorkspacesOperations(self._client, self._config, self._serialize, self._deserialize)
108+
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
109+
self._client, self._config, self._serialize, self._deserialize
110+
)
111+
self.private_link_resources = PrivateLinkResourcesOperations(
112+
self._client, self._config, self._serialize, self._deserialize
113+
)
100114
self.scaling_plans = ScalingPlansOperations(self._client, self._config, self._serialize, self._deserialize)
101115
self.scaling_plan_pooled_schedules = ScalingPlanPooledSchedulesOperations(
102116
self._client, self._config, self._serialize, self._deserialize

‎sdk/desktopvirtualization/azure-mgmt-desktopvirtualization/azure/mgmt/desktopvirtualization/aio/operations/__init__.py

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

99
from ._operations import Operations
1010
from ._workspaces_operations import WorkspacesOperations
11+
from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
12+
from ._private_link_resources_operations import PrivateLinkResourcesOperations
1113
from ._scaling_plans_operations import ScalingPlansOperations
1214
from ._scaling_plan_pooled_schedules_operations import ScalingPlanPooledSchedulesOperations
1315
from ._application_groups_operations import ApplicationGroupsOperations
@@ -27,6 +29,8 @@
2729
__all__ = [
2830
"Operations",
2931
"WorkspacesOperations",
32+
"PrivateEndpointConnectionsOperations",
33+
"PrivateLinkResourcesOperations",
3034
"ScalingPlansOperations",
3135
"ScalingPlanPooledSchedulesOperations",
3236
"ApplicationGroupsOperations",

0 commit comments

Comments
 (0)