Skip to content

Commit 3ed9aac

Browse files
[AutoRelease] t2-maintenance-2023-10-20-10018(can only be merged by SDK owner) (Azure#32596)
* code and test * Update CHANGELOG.md --------- Co-authored-by: azure-sdk <PythonSdkPipelines> Co-authored-by: ChenxiJiang333 <[email protected]>
1 parent 592bd93 commit 3ed9aac

File tree

63 files changed

+618
-162
lines changed

Some content is hidden

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

63 files changed

+618
-162
lines changed

sdk/maintenance/azure-mgmt-maintenance/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Release History
22

3+
## 2.2.0b1 (2023-10-22)
4+
5+
### Features Added
6+
7+
- Added operation ApplyUpdatesOperations.create_or_update_or_cancel
8+
39
## 2.1.0 (2023-08-18)
410

511
### Features Added

sdk/maintenance/azure-mgmt-maintenance/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,3 @@ Code samples for this package can be found at:
5959
If you encounter any bugs or have suggestions, please file an issue in the
6060
[Issues](https://github.com/Azure/azure-sdk-for-python/issues)
6161
section of the project.
62-
63-
64-
![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-python%2Fazure-mgmt-maintenance%2FREADME.png)
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "3731ac6150dcb22856183e9f1ca49eb912459f83",
2+
"commit": "e6d90862a97c4f04f0c26a8869602bbfd8b10280",
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.6.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/maintenance/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.6.0 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
9+
"autorest_command": "autorest specification/maintenance/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.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
1010
"readme": "specification/maintenance/resource-manager/readme.md"
1111
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ class MaintenanceManagementClientConfiguration(Configuration): # pylint: disabl
3030
:param subscription_id: Subscription credentials that uniquely identify a Microsoft Azure
3131
subscription. The subscription ID forms part of the URI for every service call. Required.
3232
:type subscription_id: str
33-
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
34-
default value may result in unsupported behavior.
33+
:keyword api_version: Api Version. Default value is "2023-09-01-preview". Note that overriding
34+
this default value may result in unsupported behavior.
3535
:paramtype api_version: str
3636
"""
3737

3838
def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
3939
super(MaintenanceManagementClientConfiguration, self).__init__(**kwargs)
40-
api_version: str = kwargs.pop("api_version", "2023-04-01")
40+
api_version: str = kwargs.pop("api_version", "2023-09-01-preview")
4141

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

sdk/maintenance/azure-mgmt-maintenance/azure/mgmt/maintenance/_maintenance_management_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ class MaintenanceManagementClient: # pylint: disable=client-accepts-api-version
7878
:type subscription_id: str
7979
:param base_url: Service URL. Default value is "https://management.azure.com".
8080
:type base_url: str
81-
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
82-
default value may result in unsupported behavior.
81+
:keyword api_version: Api Version. Default value is "2023-09-01-preview". Note that overriding
82+
this default value may result in unsupported behavior.
8383
:paramtype api_version: str
8484
"""
8585

sdk/maintenance/azure-mgmt-maintenance/azure/mgmt/maintenance/_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/maintenance/azure-mgmt-maintenance/azure/mgmt/maintenance/_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/maintenance/azure-mgmt-maintenance/azure/mgmt/maintenance/_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 = "2.1.0"
9+
VERSION = "2.2.0b1"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ class MaintenanceManagementClientConfiguration(Configuration): # pylint: disabl
3030
:param subscription_id: Subscription credentials that uniquely identify a Microsoft Azure
3131
subscription. The subscription ID forms part of the URI for every service call. Required.
3232
:type subscription_id: str
33-
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
34-
default value may result in unsupported behavior.
33+
:keyword api_version: Api Version. Default value is "2023-09-01-preview". Note that overriding
34+
this default value may result in unsupported behavior.
3535
:paramtype api_version: str
3636
"""
3737

3838
def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
3939
super(MaintenanceManagementClientConfiguration, self).__init__(**kwargs)
40-
api_version: str = kwargs.pop("api_version", "2023-04-01")
40+
api_version: str = kwargs.pop("api_version", "2023-09-01-preview")
4141

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

sdk/maintenance/azure-mgmt-maintenance/azure/mgmt/maintenance/aio/_maintenance_management_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ class MaintenanceManagementClient: # pylint: disable=client-accepts-api-version
7878
:type subscription_id: str
7979
:param base_url: Service URL. Default value is "https://management.azure.com".
8080
:type base_url: str
81-
:keyword api_version: Api Version. Default value is "2023-04-01". Note that overriding this
82-
default value may result in unsupported behavior.
81+
:keyword api_version: Api Version. Default value is "2023-09-01-preview". Note that overriding
82+
this default value may result in unsupported behavior.
8383
:paramtype api_version: str
8484
"""
8585

0 commit comments

Comments
 (0)