Skip to content

Commit

Permalink
CodeGen from PR 26374 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge c8f6b7275e60bfec47758225373d26355924d813 into effb9337eb4810d151e97aa40587a9c43058dc86
  • Loading branch information
SDKAuto committed Oct 26, 2023
1 parent 1882341 commit 0f0874e
Show file tree
Hide file tree
Showing 707 changed files with 34,960 additions and 42,137 deletions.
27 changes: 21 additions & 6 deletions sdk/appservice/azure-mgmt-web/_meta.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
{
"commit": "969fd0c2634fbcc1975d7abe3749330a5145a97c",
"commit": "224eb738d8f7f50f6362d358fc84a714449c5503",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest": "3.9.2",
"autorest": "3.9.7",
"use": [
"@autorest/python@6.4.3",
"@autorest/modelerfour@4.24.3"
"@autorest/python@6.7.1",
"@autorest/modelerfour@4.26.2"
],
"autorest_command": "autorest specification/web/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/[email protected] --use=@autorest/[email protected] --version=3.9.2 --version-tolerant=False",
"readme": "specification/web/resource-manager/readme.md"
"autorest_command": "autorest specification/web/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/[email protected] --use=@autorest/[email protected] --version=3.9.7 --version-tolerant=False",
"readme": "specification/web/resource-manager/readme.md",
"package-2022-03-only": "fatal: invalid object name 'from'. from: WebApps.json",
"package-2021-03-only": "fatal: invalid object name 'from'. from: WebApps.json",
"package-2021-01-15-only": "fatal: invalid object name 'from'. from: WebApps.json",
"package-2021-01-only": "fatal: invalid object name 'from'. from: WebApps.json",
"package-2020-12-only": "fatal: invalid object name 'from'. from: WebApps.json",
"package-2020-09-only": "fatal: invalid object name 'from'. from: AppServiceCertificateOrders.json",
"package-2020-06-only": "fatal: invalid object name 'from'. from: AppServiceCertificateOrders.json",
"package-2019-08-only": "fatal: invalid object name 'from'. from: AppServiceCertificateOrders.json",
"package-2018-11-only": "fatal: invalid object name 'from'. from: AppServiceCertificateOrders.json",
"package-2018-02-only": "fatal: invalid object name 'from'. from: AppServiceCertificateOrders.json",
"package-2016-09-only": "fatal: invalid object name 'from'. from: AppServiceCertificateOrders.json",
"package-2016-08-only": "fatal: invalid object name 'from'. from: AppServiceCertificateOrders.json",
"package-2016-03-only": "2022-12-08 21:38:55 -0800 65106a17de1db38e076ea6f14c0b60305bd27ace Microsoft.Web/stable/2016-03-01/CommonDefinitions.json",
"package-2015-08-only": "fatal: invalid object name 'from'. from: AppServiceCertificateOrders.json",
"package-2015-04-only": "2021-03-07 21:09:45 -0500 19aa203acad715399745b9e2f125889b14934e84 Microsoft.DomainRegistration/stable/2015-04-01/Domains.json"
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------
from ._serialization import Serializer, Deserializer
from io import IOBase
import sys
from typing import Any, IO, Iterable, Optional, Union

Expand Down Expand Up @@ -66,6 +67,8 @@ def check_name_availability(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -109,6 +112,8 @@ def get_publishing_user(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -155,6 +160,8 @@ def get_source_control(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -198,6 +205,8 @@ def get_subscription_deployment_locations(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -245,6 +254,8 @@ def list_billing_meters(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -275,7 +286,9 @@ def list_custom_host_name_sites(
:raises ~azure.core.exceptions.HttpResponseError:
"""
api_version = self._get_api_version('list_custom_host_name_sites')
if api_version == '2022-09-01':
if api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
raise ValueError("API version {} does not have operation 'list_custom_host_name_sites'".format(api_version))
Expand Down Expand Up @@ -335,6 +348,8 @@ def list_geo_regions(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -378,6 +393,8 @@ def list_premier_add_on_offers(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -428,6 +445,8 @@ def list_site_identifiers_assigned_to_host_name(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -471,6 +490,8 @@ def list_skus(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -514,6 +535,8 @@ def list_source_controls(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -567,6 +590,8 @@ def move( # pylint: disable=inconsistent-return-statements
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -616,6 +641,8 @@ def update_publishing_user(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -669,6 +696,8 @@ def update_source_control(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -722,6 +751,8 @@ def validate(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -813,6 +844,8 @@ def validate_move( # pylint: disable=inconsistent-return-statements
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down Expand Up @@ -864,6 +897,8 @@ def verify_hosting_environment_vnet(
from .v2021_01_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2021-01-15':
from .v2021_01_15.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-03-01':
from .v2022_03_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
elif api_version == '2022-09-01':
from .v2022_09_01.operations import WebSiteManagementClientOperationsMixin as OperationClass
else:
Expand Down
36 changes: 25 additions & 11 deletions sdk/appservice/azure-mgmt-web/azure/mgmt/web/_serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
if xml_desc.get("attr", False):
if xml_ns:
ET.register_namespace(xml_prefix, xml_ns)
xml_name = "{}{}".format(xml_ns, xml_name)
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
serialized.set(xml_name, new_attr) # type: ignore
continue
if xml_desc.get("text", False):
Expand Down Expand Up @@ -664,8 +664,9 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
_serialized.update(_new_attr) # type: ignore
_new_attr = _new_attr[k] # type: ignore
_serialized = _serialized[k]
except ValueError:
continue
except ValueError as err:
if isinstance(err, SerializationError):
raise

except (AttributeError, KeyError, TypeError) as err:
msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
Expand Down Expand Up @@ -743,6 +744,8 @@ def query(self, name, data, data_type, **kwargs):
:param data: The data to be serialized.
:param str data_type: The type to be serialized from.
:keyword bool skip_quote: Whether to skip quote the serialized result.
Defaults to False.
:rtype: str
:raises: TypeError if serialization fails.
:raises: ValueError if data is None
Expand All @@ -751,10 +754,8 @@ def query(self, name, data, data_type, **kwargs):
# Treat the list aside, since we don't want to encode the div separator
if data_type.startswith("["):
internal_data_type = data_type[1:-1]
data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data]
if not kwargs.get("skip_quote", False):
data = [quote(str(d), safe="") for d in data]
return str(self.serialize_iter(data, internal_data_type, **kwargs))
do_quote = not kwargs.get('skip_quote', False)
return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs))

# Not a list, regular serialization
output = self.serialize_data(data, data_type, **kwargs)
Expand Down Expand Up @@ -893,6 +894,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
not be None or empty.
:param str div: If set, this str will be used to combine the elements
in the iterable into a combined string. Default is 'None'.
:keyword bool do_quote: Whether to quote the serialized result of each iterable element.
Defaults to False.
:rtype: list, str
"""
if isinstance(data, str):
Expand All @@ -905,9 +908,18 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
for d in data:
try:
serialized.append(self.serialize_data(d, iter_type, **kwargs))
except ValueError:
except ValueError as err:
if isinstance(err, SerializationError):
raise
serialized.append(None)

if kwargs.get('do_quote', False):
serialized = [
'' if s is None else quote(str(s), safe='')
for s
in serialized
]

if div:
serialized = ["" if s is None else str(s) for s in serialized]
serialized = div.join(serialized)
Expand Down Expand Up @@ -952,7 +964,9 @@ def serialize_dict(self, attr, dict_type, **kwargs):
for key, value in attr.items():
try:
serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
except ValueError:
except ValueError as err:
if isinstance(err, SerializationError):
raise
serialized[self.serialize_unicode(key)] = None

if "xml" in serialization_ctxt:
Expand Down Expand Up @@ -1273,7 +1287,7 @@ def _extract_name_from_internal_type(internal_type):
xml_name = internal_type_xml_map.get("name", internal_type.__name__)
xml_ns = internal_type_xml_map.get("ns", None)
if xml_ns:
xml_name = "{}{}".format(xml_ns, xml_name)
xml_name = "{{{}}}{}".format(xml_ns, xml_name)
return xml_name


Expand All @@ -1297,7 +1311,7 @@ def xml_key_extractor(attr, attr_desc, data):
# Integrate namespace if necessary
xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None))
if xml_ns:
xml_name = "{}{}".format(xml_ns, xml_name)
xml_name = "{{{}}}{}".format(xml_ns, xml_name)

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

0 comments on commit 0f0874e

Please sign in to comment.