Skip to content

Commit 6b25618

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

File tree

163 files changed

+2266
-763
lines changed

Some content is hidden

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

163 files changed

+2266
-763
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "3c639105c011765893db51cbb0dda056e34dc994",
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.8",
7-
"@autorest/modelerfour@4.24.3"
6+
"@autorest/python@6.7.1",
7+
"@autorest/modelerfour@4.26.2"
88
],
9-
"autorest_command": "autorest specification/app/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.8 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
9+
"autorest_command": "autorest specification/app/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/app/resource-manager/readme.md"
1111
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ class ContainerAppsAPIClientConfiguration(Configuration): # pylint: disable=too
2929
:type credential: ~azure.core.credentials.TokenCredential
3030
:param subscription_id: The ID of the target subscription. Required.
3131
:type subscription_id: str
32-
:keyword api_version: Api Version. Default value is "2022-11-01-preview". Note that overriding
33-
this default value may result in unsupported behavior.
32+
:keyword api_version: Api Version. Default value is "2023-05-01". Note that overriding this
33+
default value may result in unsupported behavior.
3434
:paramtype api_version: str
3535
"""
3636

3737
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
3838
super(ContainerAppsAPIClientConfiguration, self).__init__(**kwargs)
39-
api_version: str = kwargs.pop("api_version", "2022-11-01-preview")
39+
api_version: str = kwargs.pop("api_version", "2023-05-01")
4040

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

‎sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_container_apps_api_client.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
ConnectedEnvironmentsDaprComponentsOperations,
2424
ConnectedEnvironmentsOperations,
2525
ConnectedEnvironmentsStoragesOperations,
26+
ContainerAppsAPIClientOperationsMixin,
2627
ContainerAppsAuthConfigsOperations,
2728
ContainerAppsDiagnosticsOperations,
2829
ContainerAppsOperations,
@@ -46,7 +47,9 @@
4647
from azure.core.credentials import TokenCredential
4748

4849

49-
class ContainerAppsAPIClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
50+
class ContainerAppsAPIClient(
51+
ContainerAppsAPIClientOperationsMixin
52+
): # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
5053
"""ContainerAppsAPIClient.
5154
5255
:ivar container_apps_auth_configs: ContainerAppsAuthConfigsOperations operations
@@ -73,10 +76,6 @@ class ContainerAppsAPIClient: # pylint: disable=client-accepts-api-version-keyw
7376
azure.mgmt.appcontainers.operations.ConnectedEnvironmentsStoragesOperations
7477
:ivar container_apps: ContainerAppsOperations operations
7578
:vartype container_apps: azure.mgmt.appcontainers.operations.ContainerAppsOperations
76-
:ivar jobs: JobsOperations operations
77-
:vartype jobs: azure.mgmt.appcontainers.operations.JobsOperations
78-
:ivar jobs_executions: JobsExecutionsOperations operations
79-
:vartype jobs_executions: azure.mgmt.appcontainers.operations.JobsExecutionsOperations
8079
:ivar container_apps_revisions: ContainerAppsRevisionsOperations operations
8180
:vartype container_apps_revisions:
8281
azure.mgmt.appcontainers.operations.ContainerAppsRevisionsOperations
@@ -94,6 +93,10 @@ class ContainerAppsAPIClient: # pylint: disable=client-accepts-api-version-keyw
9493
azure.mgmt.appcontainers.operations.ManagedEnvironmentsDiagnosticsOperations
9594
:ivar operations: Operations operations
9695
:vartype operations: azure.mgmt.appcontainers.operations.Operations
96+
:ivar jobs: JobsOperations operations
97+
:vartype jobs: azure.mgmt.appcontainers.operations.JobsOperations
98+
:ivar jobs_executions: JobsExecutionsOperations operations
99+
:vartype jobs_executions: azure.mgmt.appcontainers.operations.JobsExecutionsOperations
97100
:ivar managed_environments: ManagedEnvironmentsOperations operations
98101
:vartype managed_environments:
99102
azure.mgmt.appcontainers.operations.ManagedEnvironmentsOperations
@@ -118,8 +121,8 @@ class ContainerAppsAPIClient: # pylint: disable=client-accepts-api-version-keyw
118121
:type subscription_id: str
119122
:param base_url: Service URL. Default value is "https://management.azure.com".
120123
:type base_url: str
121-
:keyword api_version: Api Version. Default value is "2022-11-01-preview". Note that overriding
122-
this default value may result in unsupported behavior.
124+
:keyword api_version: Api Version. Default value is "2023-05-01". Note that overriding this
125+
default value may result in unsupported behavior.
123126
:paramtype api_version: str
124127
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
125128
Retry-After header is present.
@@ -161,8 +164,6 @@ def __init__(
161164
self._client, self._config, self._serialize, self._deserialize
162165
)
163166
self.container_apps = ContainerAppsOperations(self._client, self._config, self._serialize, self._deserialize)
164-
self.jobs = JobsOperations(self._client, self._config, self._serialize, self._deserialize)
165-
self.jobs_executions = JobsExecutionsOperations(self._client, self._config, self._serialize, self._deserialize)
166167
self.container_apps_revisions = ContainerAppsRevisionsOperations(
167168
self._client, self._config, self._serialize, self._deserialize
168169
)
@@ -179,6 +180,8 @@ def __init__(
179180
self._client, self._config, self._serialize, self._deserialize
180181
)
181182
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
183+
self.jobs = JobsOperations(self._client, self._config, self._serialize, self._deserialize)
184+
self.jobs_executions = JobsExecutionsOperations(self._client, self._config, self._serialize, self._deserialize)
182185
self.managed_environments = ManagedEnvironmentsOperations(
183186
self._client, self._config, self._serialize, self._deserialize
184187
)

‎sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_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/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/_vendor.py

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

8-
from typing import List, cast
8+
from abc import ABC
9+
from typing import TYPE_CHECKING
910

1011
from azure.core.pipeline.transport import HttpRequest
1112

13+
from ._configuration import ContainerAppsAPIClientConfiguration
14+
15+
if TYPE_CHECKING:
16+
# pylint: disable=unused-import,ungrouped-imports
17+
from azure.core import PipelineClient
18+
19+
from ._serialization import Deserializer, Serializer
20+
1221

1322
def _convert_request(request, files=None):
1423
data = request.content if not files else None
@@ -18,13 +27,10 @@ def _convert_request(request, files=None):
1827
return request
1928

2029

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)
30+
class ContainerAppsAPIClientMixinABC(ABC):
31+
"""DO NOT use this class. It is for internal typing use only."""
32+
33+
_client: "PipelineClient"
34+
_config: ContainerAppsAPIClientConfiguration
35+
_serialize: "Serializer"
36+
_deserialize: "Deserializer"

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ class ContainerAppsAPIClientConfiguration(Configuration): # pylint: disable=too
2929
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
3030
:param subscription_id: The ID of the target subscription. Required.
3131
:type subscription_id: str
32-
:keyword api_version: Api Version. Default value is "2022-11-01-preview". Note that overriding
33-
this default value may result in unsupported behavior.
32+
:keyword api_version: Api Version. Default value is "2023-05-01". Note that overriding this
33+
default value may result in unsupported behavior.
3434
:paramtype api_version: str
3535
"""
3636

3737
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
3838
super(ContainerAppsAPIClientConfiguration, self).__init__(**kwargs)
39-
api_version: str = kwargs.pop("api_version", "2022-11-01-preview")
39+
api_version: str = kwargs.pop("api_version", "2023-05-01")
4040

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

‎sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_container_apps_api_client.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
ConnectedEnvironmentsDaprComponentsOperations,
2424
ConnectedEnvironmentsOperations,
2525
ConnectedEnvironmentsStoragesOperations,
26+
ContainerAppsAPIClientOperationsMixin,
2627
ContainerAppsAuthConfigsOperations,
2728
ContainerAppsDiagnosticsOperations,
2829
ContainerAppsOperations,
@@ -46,7 +47,9 @@
4647
from azure.core.credentials_async import AsyncTokenCredential
4748

4849

49-
class ContainerAppsAPIClient: # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
50+
class ContainerAppsAPIClient(
51+
ContainerAppsAPIClientOperationsMixin
52+
): # pylint: disable=client-accepts-api-version-keyword,too-many-instance-attributes
5053
"""ContainerAppsAPIClient.
5154
5255
:ivar container_apps_auth_configs: ContainerAppsAuthConfigsOperations operations
@@ -73,10 +76,6 @@ class ContainerAppsAPIClient: # pylint: disable=client-accepts-api-version-keyw
7376
azure.mgmt.appcontainers.aio.operations.ConnectedEnvironmentsStoragesOperations
7477
:ivar container_apps: ContainerAppsOperations operations
7578
:vartype container_apps: azure.mgmt.appcontainers.aio.operations.ContainerAppsOperations
76-
:ivar jobs: JobsOperations operations
77-
:vartype jobs: azure.mgmt.appcontainers.aio.operations.JobsOperations
78-
:ivar jobs_executions: JobsExecutionsOperations operations
79-
:vartype jobs_executions: azure.mgmt.appcontainers.aio.operations.JobsExecutionsOperations
8079
:ivar container_apps_revisions: ContainerAppsRevisionsOperations operations
8180
:vartype container_apps_revisions:
8281
azure.mgmt.appcontainers.aio.operations.ContainerAppsRevisionsOperations
@@ -94,6 +93,10 @@ class ContainerAppsAPIClient: # pylint: disable=client-accepts-api-version-keyw
9493
azure.mgmt.appcontainers.aio.operations.ManagedEnvironmentsDiagnosticsOperations
9594
:ivar operations: Operations operations
9695
:vartype operations: azure.mgmt.appcontainers.aio.operations.Operations
96+
:ivar jobs: JobsOperations operations
97+
:vartype jobs: azure.mgmt.appcontainers.aio.operations.JobsOperations
98+
:ivar jobs_executions: JobsExecutionsOperations operations
99+
:vartype jobs_executions: azure.mgmt.appcontainers.aio.operations.JobsExecutionsOperations
97100
:ivar managed_environments: ManagedEnvironmentsOperations operations
98101
:vartype managed_environments:
99102
azure.mgmt.appcontainers.aio.operations.ManagedEnvironmentsOperations
@@ -118,8 +121,8 @@ class ContainerAppsAPIClient: # pylint: disable=client-accepts-api-version-keyw
118121
:type subscription_id: str
119122
:param base_url: Service URL. Default value is "https://management.azure.com".
120123
:type base_url: str
121-
:keyword api_version: Api Version. Default value is "2022-11-01-preview". Note that overriding
122-
this default value may result in unsupported behavior.
124+
:keyword api_version: Api Version. Default value is "2023-05-01". Note that overriding this
125+
default value may result in unsupported behavior.
123126
:paramtype api_version: str
124127
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
125128
Retry-After header is present.
@@ -161,8 +164,6 @@ def __init__(
161164
self._client, self._config, self._serialize, self._deserialize
162165
)
163166
self.container_apps = ContainerAppsOperations(self._client, self._config, self._serialize, self._deserialize)
164-
self.jobs = JobsOperations(self._client, self._config, self._serialize, self._deserialize)
165-
self.jobs_executions = JobsExecutionsOperations(self._client, self._config, self._serialize, self._deserialize)
166167
self.container_apps_revisions = ContainerAppsRevisionsOperations(
167168
self._client, self._config, self._serialize, self._deserialize
168169
)
@@ -179,6 +180,8 @@ def __init__(
179180
self._client, self._config, self._serialize, self._deserialize
180181
)
181182
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
183+
self.jobs = JobsOperations(self._client, self._config, self._serialize, self._deserialize)
184+
self.jobs_executions = JobsExecutionsOperations(self._client, self._config, self._serialize, self._deserialize)
182185
self.managed_environments = ManagedEnvironmentsOperations(
183186
self._client, self._config, self._serialize, self._deserialize
184187
)

‎sdk/appcontainers/azure-mgmt-appcontainers/azure/mgmt/appcontainers/aio/_vendor.py

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# --------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# Code generated by Microsoft (R) AutoRest Code Generator.
5+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
6+
# --------------------------------------------------------------------------
7+
8+
from abc import ABC
9+
from typing import TYPE_CHECKING
10+
11+
from azure.core.pipeline.transport import HttpRequest
12+
13+
from ._configuration import ContainerAppsAPIClientConfiguration
14+
15+
if TYPE_CHECKING:
16+
# pylint: disable=unused-import,ungrouped-imports
17+
from azure.core import AsyncPipelineClient
18+
19+
from .._serialization import Deserializer, Serializer
20+
21+
22+
class ContainerAppsAPIClientMixinABC(ABC):
23+
"""DO NOT use this class. It is for internal typing use only."""
24+
25+
_client: "AsyncPipelineClient"
26+
_config: ContainerAppsAPIClientConfiguration
27+
_serialize: "Serializer"
28+
_deserialize: "Deserializer"

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
from ._connected_environments_dapr_components_operations import ConnectedEnvironmentsDaprComponentsOperations
1515
from ._connected_environments_storages_operations import ConnectedEnvironmentsStoragesOperations
1616
from ._container_apps_operations import ContainerAppsOperations
17-
from ._jobs_operations import JobsOperations
18-
from ._jobs_executions_operations import JobsExecutionsOperations
1917
from ._container_apps_revisions_operations import ContainerAppsRevisionsOperations
2018
from ._container_apps_revision_replicas_operations import ContainerAppsRevisionReplicasOperations
2119
from ._container_apps_diagnostics_operations import ContainerAppsDiagnosticsOperations
2220
from ._managed_environment_diagnostics_operations import ManagedEnvironmentDiagnosticsOperations
2321
from ._managed_environments_diagnostics_operations import ManagedEnvironmentsDiagnosticsOperations
2422
from ._operations import Operations
23+
from ._jobs_operations import JobsOperations
24+
from ._jobs_executions_operations import JobsExecutionsOperations
25+
from ._container_apps_api_client_operations import ContainerAppsAPIClientOperationsMixin
2526
from ._managed_environments_operations import ManagedEnvironmentsOperations
2627
from ._certificates_operations import CertificatesOperations
2728
from ._managed_certificates_operations import ManagedCertificatesOperations
@@ -43,14 +44,15 @@
4344
"ConnectedEnvironmentsDaprComponentsOperations",
4445
"ConnectedEnvironmentsStoragesOperations",
4546
"ContainerAppsOperations",
46-
"JobsOperations",
47-
"JobsExecutionsOperations",
4847
"ContainerAppsRevisionsOperations",
4948
"ContainerAppsRevisionReplicasOperations",
5049
"ContainerAppsDiagnosticsOperations",
5150
"ManagedEnvironmentDiagnosticsOperations",
5251
"ManagedEnvironmentsDiagnosticsOperations",
5352
"Operations",
53+
"JobsOperations",
54+
"JobsExecutionsOperations",
55+
"ContainerAppsAPIClientOperationsMixin",
5456
"ManagedEnvironmentsOperations",
5557
"CertificatesOperations",
5658
"ManagedCertificatesOperations",

0 commit comments

Comments
 (0)