Skip to content

Commit 643dda4

Browse files
author
SDKAuto
committed
CodeGen from PR 25266 in Azure/azure-rest-api-specs
Merge 06e5fb480af8a6471f84720d0937ba325bebf900 into be047b59e432250f0b6458a8d3862c3aa23c65b5
1 parent f2632f6 commit 643dda4

File tree

301 files changed

+4956
-26386
lines changed

Some content is hidden

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

301 files changed

+4956
-26386
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"commit": "e5d8bf380ef60a6a283ba81fd0ce4bc0e49e6680",
2+
"commit": "aa602378aeb4fdf5a21a6bb4f53602a1035d31d3",
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/cosmos-db/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/cosmos-db/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/cosmos-db/resource-manager/readme.md"
1111
}

sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/_configuration.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ class CosmosDBManagementClientConfiguration(Configuration): # pylint: disable=t
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 "2023-03-15-preview". Note that overriding
33-
this default value may result in unsupported behavior.
32+
:keyword api_version: Api Version. Default value is "2023-09-15". 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(CosmosDBManagementClientConfiguration, self).__init__(**kwargs)
39-
api_version: str = kwargs.pop("api_version", "2023-03-15-preview")
39+
api_version: str = kwargs.pop("api_version", "2023-09-15")
4040

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

sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/_cosmos_db_management_client.py

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,11 @@
2323
CollectionPartitionOperations,
2424
CollectionPartitionRegionOperations,
2525
CollectionRegionOperations,
26-
DataTransferJobsOperations,
2726
DatabaseAccountRegionOperations,
2827
DatabaseAccountsOperations,
2928
DatabaseOperations,
30-
GraphResourcesOperations,
3129
GremlinResourcesOperations,
3230
LocationsOperations,
33-
MongoClustersOperations,
3431
MongoDBResourcesOperations,
3532
NotebookWorkspacesOperations,
3633
Operations,
@@ -96,8 +93,6 @@ class CosmosDBManagementClient: # pylint: disable=client-accepts-api-version-ke
9693
:ivar partition_key_range_id_region: PartitionKeyRangeIdRegionOperations operations
9794
:vartype partition_key_range_id_region:
9895
azure.mgmt.cosmosdb.operations.PartitionKeyRangeIdRegionOperations
99-
:ivar graph_resources: GraphResourcesOperations operations
100-
:vartype graph_resources: azure.mgmt.cosmosdb.operations.GraphResourcesOperations
10196
:ivar sql_resources: SqlResourcesOperations operations
10297
:vartype sql_resources: azure.mgmt.cosmosdb.operations.SqlResourcesOperations
10398
:ivar mongo_db_resources: MongoDBResourcesOperations operations
@@ -110,14 +105,10 @@ class CosmosDBManagementClient: # pylint: disable=client-accepts-api-version-ke
110105
:vartype gremlin_resources: azure.mgmt.cosmosdb.operations.GremlinResourcesOperations
111106
:ivar locations: LocationsOperations operations
112107
:vartype locations: azure.mgmt.cosmosdb.operations.LocationsOperations
113-
:ivar data_transfer_jobs: DataTransferJobsOperations operations
114-
:vartype data_transfer_jobs: azure.mgmt.cosmosdb.operations.DataTransferJobsOperations
115108
:ivar cassandra_clusters: CassandraClustersOperations operations
116109
:vartype cassandra_clusters: azure.mgmt.cosmosdb.operations.CassandraClustersOperations
117110
:ivar cassandra_data_centers: CassandraDataCentersOperations operations
118111
:vartype cassandra_data_centers: azure.mgmt.cosmosdb.operations.CassandraDataCentersOperations
119-
:ivar mongo_clusters: MongoClustersOperations operations
120-
:vartype mongo_clusters: azure.mgmt.cosmosdb.operations.MongoClustersOperations
121112
:ivar notebook_workspaces: NotebookWorkspacesOperations operations
122113
:vartype notebook_workspaces: azure.mgmt.cosmosdb.operations.NotebookWorkspacesOperations
123114
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
@@ -168,8 +159,8 @@ class CosmosDBManagementClient: # pylint: disable=client-accepts-api-version-ke
168159
:type subscription_id: str
169160
:param base_url: Service URL. Default value is "https://management.azure.com".
170161
:type base_url: str
171-
:keyword api_version: Api Version. Default value is "2023-03-15-preview". Note that overriding
172-
this default value may result in unsupported behavior.
162+
:keyword api_version: Api Version. Default value is "2023-09-15". Note that overriding this
163+
default value may result in unsupported behavior.
173164
:paramtype api_version: str
174165
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
175166
Retry-After header is present.
@@ -222,7 +213,6 @@ def __init__(
222213
self.partition_key_range_id_region = PartitionKeyRangeIdRegionOperations(
223214
self._client, self._config, self._serialize, self._deserialize
224215
)
225-
self.graph_resources = GraphResourcesOperations(self._client, self._config, self._serialize, self._deserialize)
226216
self.sql_resources = SqlResourcesOperations(self._client, self._config, self._serialize, self._deserialize)
227217
self.mongo_db_resources = MongoDBResourcesOperations(
228218
self._client, self._config, self._serialize, self._deserialize
@@ -235,16 +225,12 @@ def __init__(
235225
self._client, self._config, self._serialize, self._deserialize
236226
)
237227
self.locations = LocationsOperations(self._client, self._config, self._serialize, self._deserialize)
238-
self.data_transfer_jobs = DataTransferJobsOperations(
239-
self._client, self._config, self._serialize, self._deserialize
240-
)
241228
self.cassandra_clusters = CassandraClustersOperations(
242229
self._client, self._config, self._serialize, self._deserialize
243230
)
244231
self.cassandra_data_centers = CassandraDataCentersOperations(
245232
self._client, self._config, self._serialize, self._deserialize
246233
)
247-
self.mongo_clusters = MongoClustersOperations(self._client, self._config, self._serialize, self._deserialize)
248234
self.notebook_workspaces = NotebookWorkspacesOperations(
249235
self._client, self._config, self._serialize, self._deserialize
250236
)

sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/_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/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/_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/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/_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 = "10.0.0b1"
9+
VERSION = "0.7.0"

sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/aio/_configuration.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ class CosmosDBManagementClientConfiguration(Configuration): # pylint: disable=t
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 "2023-03-15-preview". Note that overriding
33-
this default value may result in unsupported behavior.
32+
:keyword api_version: Api Version. Default value is "2023-09-15". 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(CosmosDBManagementClientConfiguration, self).__init__(**kwargs)
39-
api_version: str = kwargs.pop("api_version", "2023-03-15-preview")
39+
api_version: str = kwargs.pop("api_version", "2023-09-15")
4040

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

sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/aio/_cosmos_db_management_client.py

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,11 @@
2323
CollectionPartitionOperations,
2424
CollectionPartitionRegionOperations,
2525
CollectionRegionOperations,
26-
DataTransferJobsOperations,
2726
DatabaseAccountRegionOperations,
2827
DatabaseAccountsOperations,
2928
DatabaseOperations,
30-
GraphResourcesOperations,
3129
GremlinResourcesOperations,
3230
LocationsOperations,
33-
MongoClustersOperations,
3431
MongoDBResourcesOperations,
3532
NotebookWorkspacesOperations,
3633
Operations,
@@ -97,8 +94,6 @@ class CosmosDBManagementClient: # pylint: disable=client-accepts-api-version-ke
9794
:ivar partition_key_range_id_region: PartitionKeyRangeIdRegionOperations operations
9895
:vartype partition_key_range_id_region:
9996
azure.mgmt.cosmosdb.aio.operations.PartitionKeyRangeIdRegionOperations
100-
:ivar graph_resources: GraphResourcesOperations operations
101-
:vartype graph_resources: azure.mgmt.cosmosdb.aio.operations.GraphResourcesOperations
10297
:ivar sql_resources: SqlResourcesOperations operations
10398
:vartype sql_resources: azure.mgmt.cosmosdb.aio.operations.SqlResourcesOperations
10499
:ivar mongo_db_resources: MongoDBResourcesOperations operations
@@ -111,15 +106,11 @@ class CosmosDBManagementClient: # pylint: disable=client-accepts-api-version-ke
111106
:vartype gremlin_resources: azure.mgmt.cosmosdb.aio.operations.GremlinResourcesOperations
112107
:ivar locations: LocationsOperations operations
113108
:vartype locations: azure.mgmt.cosmosdb.aio.operations.LocationsOperations
114-
:ivar data_transfer_jobs: DataTransferJobsOperations operations
115-
:vartype data_transfer_jobs: azure.mgmt.cosmosdb.aio.operations.DataTransferJobsOperations
116109
:ivar cassandra_clusters: CassandraClustersOperations operations
117110
:vartype cassandra_clusters: azure.mgmt.cosmosdb.aio.operations.CassandraClustersOperations
118111
:ivar cassandra_data_centers: CassandraDataCentersOperations operations
119112
:vartype cassandra_data_centers:
120113
azure.mgmt.cosmosdb.aio.operations.CassandraDataCentersOperations
121-
:ivar mongo_clusters: MongoClustersOperations operations
122-
:vartype mongo_clusters: azure.mgmt.cosmosdb.aio.operations.MongoClustersOperations
123114
:ivar notebook_workspaces: NotebookWorkspacesOperations operations
124115
:vartype notebook_workspaces: azure.mgmt.cosmosdb.aio.operations.NotebookWorkspacesOperations
125116
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
@@ -171,8 +162,8 @@ class CosmosDBManagementClient: # pylint: disable=client-accepts-api-version-ke
171162
:type subscription_id: str
172163
:param base_url: Service URL. Default value is "https://management.azure.com".
173164
:type base_url: str
174-
:keyword api_version: Api Version. Default value is "2023-03-15-preview". Note that overriding
175-
this default value may result in unsupported behavior.
165+
:keyword api_version: Api Version. Default value is "2023-09-15". Note that overriding this
166+
default value may result in unsupported behavior.
176167
:paramtype api_version: str
177168
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
178169
Retry-After header is present.
@@ -225,7 +216,6 @@ def __init__(
225216
self.partition_key_range_id_region = PartitionKeyRangeIdRegionOperations(
226217
self._client, self._config, self._serialize, self._deserialize
227218
)
228-
self.graph_resources = GraphResourcesOperations(self._client, self._config, self._serialize, self._deserialize)
229219
self.sql_resources = SqlResourcesOperations(self._client, self._config, self._serialize, self._deserialize)
230220
self.mongo_db_resources = MongoDBResourcesOperations(
231221
self._client, self._config, self._serialize, self._deserialize
@@ -238,16 +228,12 @@ def __init__(
238228
self._client, self._config, self._serialize, self._deserialize
239229
)
240230
self.locations = LocationsOperations(self._client, self._config, self._serialize, self._deserialize)
241-
self.data_transfer_jobs = DataTransferJobsOperations(
242-
self._client, self._config, self._serialize, self._deserialize
243-
)
244231
self.cassandra_clusters = CassandraClustersOperations(
245232
self._client, self._config, self._serialize, self._deserialize
246233
)
247234
self.cassandra_data_centers = CassandraDataCentersOperations(
248235
self._client, self._config, self._serialize, self._deserialize
249236
)
250-
self.mongo_clusters = MongoClustersOperations(self._client, self._config, self._serialize, self._deserialize)
251237
self.notebook_workspaces = NotebookWorkspacesOperations(
252238
self._client, self._config, self._serialize, self._deserialize
253239
)

sdk/cosmos/azure-mgmt-cosmosdb/azure/mgmt/cosmosdb/aio/operations/__init__.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,14 @@
1919
from ._collection_partition_operations import CollectionPartitionOperations
2020
from ._partition_key_range_id_operations import PartitionKeyRangeIdOperations
2121
from ._partition_key_range_id_region_operations import PartitionKeyRangeIdRegionOperations
22-
from ._graph_resources_operations import GraphResourcesOperations
2322
from ._sql_resources_operations import SqlResourcesOperations
2423
from ._mongo_db_resources_operations import MongoDBResourcesOperations
2524
from ._table_resources_operations import TableResourcesOperations
2625
from ._cassandra_resources_operations import CassandraResourcesOperations
2726
from ._gremlin_resources_operations import GremlinResourcesOperations
2827
from ._locations_operations import LocationsOperations
29-
from ._data_transfer_jobs_operations import DataTransferJobsOperations
3028
from ._cassandra_clusters_operations import CassandraClustersOperations
3129
from ._cassandra_data_centers_operations import CassandraDataCentersOperations
32-
from ._mongo_clusters_operations import MongoClustersOperations
3330
from ._notebook_workspaces_operations import NotebookWorkspacesOperations
3431
from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
3532
from ._private_link_resources_operations import PrivateLinkResourcesOperations
@@ -65,17 +62,14 @@
6562
"CollectionPartitionOperations",
6663
"PartitionKeyRangeIdOperations",
6764
"PartitionKeyRangeIdRegionOperations",
68-
"GraphResourcesOperations",
6965
"SqlResourcesOperations",
7066
"MongoDBResourcesOperations",
7167
"TableResourcesOperations",
7268
"CassandraResourcesOperations",
7369
"GremlinResourcesOperations",
7470
"LocationsOperations",
75-
"DataTransferJobsOperations",
7671
"CassandraClustersOperations",
7772
"CassandraDataCentersOperations",
78-
"MongoClustersOperations",
7973
"NotebookWorkspacesOperations",
8074
"PrivateEndpointConnectionsOperations",
8175
"PrivateLinkResourcesOperations",

0 commit comments

Comments
 (0)