Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions sdk/kusto/azure-mgmt-kusto/_meta.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"commit": "de93ae3897babd397a59d3c9dcb894855d0db1c3",
"commit": "c10f15f4719268557a7c12605a6842e729c7011f",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest": "3.9.2",
"autorest": "3.9.7",
"use": [
"@autorest/python@6.6.0",
"@autorest/modelerfour@4.24.3"
"@autorest/python@6.7.1",
"@autorest/modelerfour@4.26.2"
],
"autorest_command": "autorest specification/azure-kusto/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",
"autorest_command": "autorest specification/azure-kusto/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",
"readme": "specification/azure-kusto/resource-manager/readme.md"
}
4 changes: 2 additions & 2 deletions sdk/kusto/azure-mgmt-kusto/azure/mgmt/kusto/_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ class KustoManagementClientConfiguration(Configuration): # pylint: disable=too-
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: The ID of the target subscription. Required.
:type subscription_id: str
:keyword api_version: Api Version. Default value is "2023-05-02". Note that overriding this
:keyword api_version: Api Version. Default value is "2023-08-15". Note that overriding this
default value may result in unsupported behavior.
:paramtype api_version: str
"""

def __init__(self, credential: "TokenCredential", subscription_id: str, **kwargs: Any) -> None:
super(KustoManagementClientConfiguration, self).__init__(**kwargs)
api_version: str = kwargs.pop("api_version", "2023-05-02")
api_version: str = kwargs.pop("api_version", "2023-08-15")

if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
OperationsResultsOperations,
PrivateEndpointConnectionsOperations,
PrivateLinkResourcesOperations,
SandboxCustomImagesOperations,
ScriptsOperations,
SkusOperations,
)
Expand Down Expand Up @@ -65,6 +66,8 @@ class KustoManagementClient: # pylint: disable=client-accepts-api-version-keywo
azure.mgmt.kusto.operations.DatabasePrincipalAssignmentsOperations
:ivar scripts: ScriptsOperations operations
:vartype scripts: azure.mgmt.kusto.operations.ScriptsOperations
:ivar sandbox_custom_images: SandboxCustomImagesOperations operations
:vartype sandbox_custom_images: azure.mgmt.kusto.operations.SandboxCustomImagesOperations
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
:vartype private_endpoint_connections:
azure.mgmt.kusto.operations.PrivateEndpointConnectionsOperations
Expand All @@ -85,7 +88,7 @@ class KustoManagementClient: # pylint: disable=client-accepts-api-version-keywo
:type subscription_id: str
:param base_url: Service URL. Default value is "https://management.azure.com".
:type base_url: str
:keyword api_version: Api Version. Default value is "2023-05-02". Note that overriding this
:keyword api_version: Api Version. Default value is "2023-08-15". Note that overriding this
default value may result in unsupported behavior.
:paramtype api_version: str
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
Expand Down Expand Up @@ -125,6 +128,9 @@ def __init__(
self._client, self._config, self._serialize, self._deserialize
)
self.scripts = ScriptsOperations(self._client, self._config, self._serialize, self._deserialize)
self.sandbox_custom_images = SandboxCustomImagesOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
self._client, self._config, self._serialize, self._deserialize
)
Expand Down
26 changes: 18 additions & 8 deletions sdk/kusto/azure-mgmt-kusto/azure/mgmt/kusto/_serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -662,8 +662,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 @@ -741,6 +742,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 @@ -749,10 +752,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 @@ -891,6 +892,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 @@ -903,9 +906,14 @@ 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 @@ -950,7 +958,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
14 changes: 0 additions & 14 deletions sdk/kusto/azure-mgmt-kusto/azure/mgmt/kusto/_vendor.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

from typing import List, cast

from azure.core.pipeline.transport import HttpRequest


Expand All @@ -16,15 +14,3 @@ def _convert_request(request, files=None):
if files:
request.set_formdata_body(files)
return request


def _format_url_section(template, **kwargs):
components = template.split("/")
while components:
try:
return template.format(**kwargs)
except KeyError as key:
# Need the cast, as for some reasons "split" is typed as list[str | Any]
formatted_components = cast(List[str], template.split("/"))
components = [c for c in formatted_components if "{}".format(key.args[0]) not in c]
template = "/".join(components)
2 changes: 1 addition & 1 deletion sdk/kusto/azure-mgmt-kusto/azure/mgmt/kusto/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------

VERSION = "3.2.0"
VERSION = "2.0.0b1"
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ class KustoManagementClientConfiguration(Configuration): # pylint: disable=too-
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
:param subscription_id: The ID of the target subscription. Required.
:type subscription_id: str
:keyword api_version: Api Version. Default value is "2023-05-02". Note that overriding this
:keyword api_version: Api Version. Default value is "2023-08-15". Note that overriding this
default value may result in unsupported behavior.
:paramtype api_version: str
"""

def __init__(self, credential: "AsyncTokenCredential", subscription_id: str, **kwargs: Any) -> None:
super(KustoManagementClientConfiguration, self).__init__(**kwargs)
api_version: str = kwargs.pop("api_version", "2023-05-02")
api_version: str = kwargs.pop("api_version", "2023-08-15")

if credential is None:
raise ValueError("Parameter 'credential' must not be None.")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
OperationsResultsOperations,
PrivateEndpointConnectionsOperations,
PrivateLinkResourcesOperations,
SandboxCustomImagesOperations,
ScriptsOperations,
SkusOperations,
)
Expand Down Expand Up @@ -65,6 +66,8 @@ class KustoManagementClient: # pylint: disable=client-accepts-api-version-keywo
azure.mgmt.kusto.aio.operations.DatabasePrincipalAssignmentsOperations
:ivar scripts: ScriptsOperations operations
:vartype scripts: azure.mgmt.kusto.aio.operations.ScriptsOperations
:ivar sandbox_custom_images: SandboxCustomImagesOperations operations
:vartype sandbox_custom_images: azure.mgmt.kusto.aio.operations.SandboxCustomImagesOperations
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
:vartype private_endpoint_connections:
azure.mgmt.kusto.aio.operations.PrivateEndpointConnectionsOperations
Expand All @@ -85,7 +88,7 @@ class KustoManagementClient: # pylint: disable=client-accepts-api-version-keywo
:type subscription_id: str
:param base_url: Service URL. Default value is "https://management.azure.com".
:type base_url: str
:keyword api_version: Api Version. Default value is "2023-05-02". Note that overriding this
:keyword api_version: Api Version. Default value is "2023-08-15". Note that overriding this
default value may result in unsupported behavior.
:paramtype api_version: str
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
Expand Down Expand Up @@ -125,6 +128,9 @@ def __init__(
self._client, self._config, self._serialize, self._deserialize
)
self.scripts = ScriptsOperations(self._client, self._config, self._serialize, self._deserialize)
self.sandbox_custom_images = SandboxCustomImagesOperations(
self._client, self._config, self._serialize, self._deserialize
)
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
self._client, self._config, self._serialize, self._deserialize
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from ._database_operations import DatabaseOperations
from ._database_principal_assignments_operations import DatabasePrincipalAssignmentsOperations
from ._scripts_operations import ScriptsOperations
from ._sandbox_custom_images_operations import SandboxCustomImagesOperations
from ._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations
from ._private_link_resources_operations import PrivateLinkResourcesOperations
from ._data_connections_operations import DataConnectionsOperations
Expand All @@ -36,6 +37,7 @@
"DatabaseOperations",
"DatabasePrincipalAssignmentsOperations",
"ScriptsOperations",
"SandboxCustomImagesOperations",
"PrivateEndpointConnectionsOperations",
"PrivateLinkResourcesOperations",
"DataConnectionsOperations",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -606,9 +606,7 @@ def get_long_running_output(pipeline_response):
return deserialized

if polling is True:
polling_method: AsyncPollingMethod = cast(
AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
)
polling_method: AsyncPollingMethod = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs))
elif polling is False:
polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
else:
Expand Down Expand Up @@ -670,6 +668,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements

response_headers = {}
if response.status_code == 202:
response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
response_headers["Azure-AsyncOperation"] = self._deserialize(
"str", response.headers.get("Azure-AsyncOperation")
)
Expand Down Expand Up @@ -733,9 +732,7 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-
return cls(pipeline_response, None, {})

if polling is True:
polling_method: AsyncPollingMethod = cast(
AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
)
polling_method: AsyncPollingMethod = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs))
elif polling is False:
polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
else:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -497,9 +497,7 @@ def get_long_running_output(pipeline_response):
return deserialized

if polling is True:
polling_method: AsyncPollingMethod = cast(
AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
)
polling_method: AsyncPollingMethod = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs))
elif polling is False:
polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
else:
Expand Down Expand Up @@ -561,6 +559,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements

response_headers = {}
if response.status_code == 202:
response_headers["Location"] = self._deserialize("str", response.headers.get("Location"))
response_headers["Azure-AsyncOperation"] = self._deserialize(
"str", response.headers.get("Azure-AsyncOperation")
)
Expand Down Expand Up @@ -623,9 +622,7 @@ def get_long_running_output(pipeline_response): # pylint: disable=inconsistent-
return cls(pipeline_response, None, {})

if polling is True:
polling_method: AsyncPollingMethod = cast(
AsyncPollingMethod, AsyncARMPolling(lro_delay, lro_options={"final-state-via": "location"}, **kwargs)
)
polling_method: AsyncPollingMethod = cast(AsyncPollingMethod, AsyncARMPolling(lro_delay, **kwargs))
elif polling is False:
polling_method = cast(AsyncPollingMethod, AsyncNoPolling())
else:
Expand Down
Loading