From 9f3e51e2330d4c1049a670a39a2957aba4ac1639 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 7 Nov 2023 14:04:18 +0000 Subject: [PATCH] CodeGen from PR 26371 in Azure/azure-rest-api-specs Merge 10dcdc69bad243a84a524f248512e456d501bb05 into dc52fde497fba9bf5c142ba17ec39be243460e80 --- .../azure-mgmt-imagebuilder/_meta.json | 10 +- .../azure/mgmt/imagebuilder/_configuration.py | 10 +- .../imagebuilder/_image_builder_client.py | 2 +- .../azure/mgmt/imagebuilder/_serialization.py | 32 ++- .../azure/mgmt/imagebuilder/_vendor.py | 14 -- .../azure/mgmt/imagebuilder/_version.py | 2 +- .../mgmt/imagebuilder/aio/_configuration.py | 10 +- .../imagebuilder/aio/_image_builder_client.py | 2 +- .../aio/operations/_operations.py | 12 +- .../aio/operations/_triggers_operations.py | 46 ++-- ...tual_machine_image_templates_operations.py | 102 +++----- .../mgmt/imagebuilder/models/__init__.py | 14 +- .../models/_image_builder_client_enums.py | 7 + .../mgmt/imagebuilder/models/_models_py3.py | 222 ++++++++++++++---- .../imagebuilder/operations/_operations.py | 14 +- .../operations/_triggers_operations.py | 64 ++--- ...tual_machine_image_templates_operations.py | 144 +++++------- .../generated_samples/cancel_image_build.py | 5 +- .../create_image_template_linux.py | 2 +- .../create_image_template_windows.py | 2 +- .../create_source_image_trigger.py | 2 +- .../delete_image_template.py | 5 +- .../generated_samples/delete_trigger.py | 5 +- .../generated_samples/get_image_template.py | 2 +- .../generated_samples/get_run_output.py | 2 +- .../generated_samples/get_trigger.py | 2 +- .../generated_samples/list_image_templates.py | 2 +- .../list_image_templates_by_rg.py | 2 +- .../generated_samples/list_run_outputs.py | 2 +- .../generated_samples/list_triggers.py | 2 +- .../generated_samples/operations_list.py | 2 +- .../generated_samples/run_image_template.py | 5 +- .../update_image_template_tags.py | 2 +- ...ate_image_template_to_remove_identities.py | 2 +- 34 files changed, 392 insertions(+), 361 deletions(-) diff --git a/sdk/compute/azure-mgmt-imagebuilder/_meta.json b/sdk/compute/azure-mgmt-imagebuilder/_meta.json index 1c1ccd3da896..8dd8867a4fe9 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/_meta.json +++ b/sdk/compute/azure-mgmt-imagebuilder/_meta.json @@ -1,11 +1,11 @@ { - "commit": "ee157d6bbf6e4c4fdc8a47b380e00ddd56a0e852", + "commit": "a231973a4fd49f699621dd74cb1b47d9d6fdcd13", "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/imagebuilder/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.3 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False", + "autorest_command": "autorest specification/imagebuilder/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/imagebuilder/resource-manager/readme.md" } \ No newline at end of file diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_configuration.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_configuration.py index 6539582cf59b..fb4f2be43508 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_configuration.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_configuration.py @@ -6,7 +6,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, TYPE_CHECKING from azure.core.configuration import Configuration @@ -15,11 +14,6 @@ from ._version import VERSION -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials import TokenCredential @@ -36,14 +30,14 @@ class ImageBuilderClientConfiguration(Configuration): # pylint: disable=too-man :param subscription_id: Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription Id forms part of the URI for every service call. Required. :type subscription_id: str - :keyword api_version: Api Version. Default value is "2022-07-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-07-01". 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(ImageBuilderClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", "2022-07-01") + api_version: str = kwargs.pop("api_version", "2023-07-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_image_builder_client.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_image_builder_client.py index 7353c7ac86ed..326d966fac77 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_image_builder_client.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_image_builder_client.py @@ -39,7 +39,7 @@ class ImageBuilderClient: # pylint: disable=client-accepts-api-version-keyword :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 "2022-07-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-07-01". 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 diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_serialization.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_serialization.py index f17c068e833e..4bae2292227b 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_serialization.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_serialization.py @@ -629,7 +629,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): @@ -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)) @@ -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 @@ -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) @@ -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): @@ -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) @@ -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: @@ -1271,7 +1281,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 @@ -1295,7 +1305,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): diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_vendor.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_vendor.py index bd0df84f5319..0dafe0e287ff 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_vendor.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_vendor.py @@ -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 @@ -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) diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_version.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_version.py index dbf4c577231c..e5754a47ce68 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_version.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_version.py @@ -6,4 +6,4 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -VERSION = "1.2.0" +VERSION = "1.0.0b1" diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/_configuration.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/_configuration.py index fab916734ad0..887fc5f3ba17 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/_configuration.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/_configuration.py @@ -6,7 +6,6 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, TYPE_CHECKING from azure.core.configuration import Configuration @@ -15,11 +14,6 @@ from .._version import VERSION -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports - if TYPE_CHECKING: # pylint: disable=unused-import,ungrouped-imports from azure.core.credentials_async import AsyncTokenCredential @@ -36,14 +30,14 @@ class ImageBuilderClientConfiguration(Configuration): # pylint: disable=too-man :param subscription_id: Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription Id forms part of the URI for every service call. Required. :type subscription_id: str - :keyword api_version: Api Version. Default value is "2022-07-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-07-01". 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(ImageBuilderClientConfiguration, self).__init__(**kwargs) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", "2022-07-01") + api_version: str = kwargs.pop("api_version", "2023-07-01") if credential is None: raise ValueError("Parameter 'credential' must not be None.") diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/_image_builder_client.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/_image_builder_client.py index f4f1ea286c7e..26dd05e0e3cb 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/_image_builder_client.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/_image_builder_client.py @@ -39,7 +39,7 @@ class ImageBuilderClient: # pylint: disable=client-accepts-api-version-keyword :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 "2022-07-01". Note that overriding this + :keyword api_version: Api Version. Default value is "2023-07-01". 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 diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/operations/_operations.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/operations/_operations.py index 749409600d74..cdf0cec3611e 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/operations/_operations.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/operations/_operations.py @@ -6,7 +6,6 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, AsyncIterable, Callable, Dict, Optional, TypeVar import urllib.parse @@ -30,10 +29,6 @@ from ..._vendor import _convert_request from ...operations._operations import build_list_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -69,9 +64,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { @@ -130,7 +123,8 @@ async def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/operations/_triggers_operations.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/operations/_triggers_operations.py index 3b7106607ecf..ff75c1b0ef32 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/operations/_triggers_operations.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/operations/_triggers_operations.py @@ -6,7 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload import urllib.parse @@ -38,10 +38,6 @@ build_list_by_image_template_request, ) -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,9 +79,7 @@ def list_by_image_template( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TriggerCollection] = kwargs.pop("cls", None) error_map = { @@ -147,7 +141,8 @@ async def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -185,9 +180,7 @@ async def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Trigger] = kwargs.pop("cls", None) request = build_get_request( @@ -212,7 +205,8 @@ async def get( if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) deserialized = self._deserialize("Trigger", pipeline_response) @@ -244,16 +238,14 @@ async def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Trigger] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "Trigger") @@ -283,7 +275,8 @@ async def _create_or_update_initial( if response.status_code not in [200, 201]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if response.status_code == 200: deserialized = self._deserialize("Trigger", pipeline_response) @@ -415,9 +408,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Trigger] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -480,9 +471,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -505,9 +494,10 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements response = pipeline_response.http_response - if response.status_code not in [200, 202, 204]: + if response.status_code not in [202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} if response.status_code == 202: @@ -547,9 +537,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/operations/_virtual_machine_image_templates_operations.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/operations/_virtual_machine_image_templates_operations.py index 7e6bd63ba73f..aa68a161a2ee 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/operations/_virtual_machine_image_templates_operations.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/aio/operations/_virtual_machine_image_templates_operations.py @@ -6,7 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, AsyncIterable, Callable, Dict, IO, Optional, TypeVar, Union, cast, overload import urllib.parse @@ -44,10 +44,6 @@ build_update_request, ) -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]] @@ -83,9 +79,7 @@ def list(self, **kwargs: Any) -> AsyncIterable["_models.ImageTemplate"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ImageTemplateListResult] = kwargs.pop("cls", None) error_map = { @@ -145,7 +139,8 @@ async def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -167,9 +162,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Asy _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ImageTemplateListResult] = kwargs.pop("cls", None) error_map = { @@ -230,7 +223,8 @@ async def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -258,16 +252,14 @@ async def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.ImageTemplate] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "ImageTemplate") @@ -296,7 +288,8 @@ async def _create_or_update_initial( if response.status_code not in [200, 201]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if response.status_code == 200: deserialized = self._deserialize("ImageTemplate", pipeline_response) @@ -419,9 +412,7 @@ async def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.ImageTemplate] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -487,16 +478,14 @@ async def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[Optional[_models.ImageTemplate]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "ImageTemplateUpdateParameters") @@ -525,7 +514,8 @@ async def _update_initial( if response.status_code not in [200, 202]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) deserialized = None if response.status_code == 200: @@ -646,9 +636,7 @@ async def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.ImageTemplate] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) @@ -720,9 +708,7 @@ async def get(self, resource_group_name: str, image_template_name: str, **kwargs _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ImageTemplate] = kwargs.pop("cls", None) request = build_get_request( @@ -746,7 +732,8 @@ async def get(self, resource_group_name: str, image_template_name: str, **kwargs if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) deserialized = self._deserialize("ImageTemplate", pipeline_response) @@ -773,9 +760,7 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -797,9 +782,10 @@ async def _delete_initial( # pylint: disable=inconsistent-return-statements response = pipeline_response.http_response - if response.status_code not in [200, 202, 204]: + if response.status_code not in [202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} if response.status_code == 202: @@ -837,9 +823,7 @@ async def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -895,9 +879,7 @@ async def _run_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) request = build_run_request( @@ -921,7 +903,8 @@ async def _run_initial( # pylint: disable=inconsistent-return-statements if response.status_code not in [200, 202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) @@ -955,9 +938,7 @@ async def begin_run( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1014,9 +995,7 @@ async def _cancel_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) request = build_cancel_request( @@ -1040,7 +1019,8 @@ async def _cancel_initial( # pylint: disable=inconsistent-return-statements if response.status_code not in [200, 202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) @@ -1074,9 +1054,7 @@ async def begin_cancel( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, AsyncPollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1137,9 +1115,7 @@ def list_run_outputs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.RunOutputCollection] = kwargs.pop("cls", None) error_map = { @@ -1201,7 +1177,8 @@ async def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -1239,9 +1216,7 @@ async def get_run_output( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.RunOutput] = kwargs.pop("cls", None) request = build_get_run_output_request( @@ -1266,7 +1241,8 @@ async def get_run_output( if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) deserialized = self._deserialize("RunOutput", pipeline_response) diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/__init__.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/__init__.py index 2070754d3e03..91a5d14ce7bf 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/__init__.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/__init__.py @@ -6,10 +6,12 @@ # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -from ._models_py3 import CloudErrorBody from ._models_py3 import DistributeVersioner from ._models_py3 import DistributeVersionerLatest from ._models_py3 import DistributeVersionerSource +from ._models_py3 import ErrorAdditionalInfo +from ._models_py3 import ErrorDetail +from ._models_py3 import ErrorResponse from ._models_py3 import ImageTemplate from ._models_py3 import ImageTemplateCustomizer from ._models_py3 import ImageTemplateDistributor @@ -24,6 +26,7 @@ from ._models_py3 import ImageTemplatePlatformImageSource from ._models_py3 import ImageTemplatePowerShellCustomizer from ._models_py3 import ImageTemplatePowerShellValidator +from ._models_py3 import ImageTemplatePropertiesErrorHandling from ._models_py3 import ImageTemplatePropertiesOptimize from ._models_py3 import ImageTemplatePropertiesOptimizeVmBoot from ._models_py3 import ImageTemplatePropertiesValidate @@ -34,6 +37,7 @@ from ._models_py3 import ImageTemplateShellValidator from ._models_py3 import ImageTemplateSource from ._models_py3 import ImageTemplateUpdateParameters +from ._models_py3 import ImageTemplateUpdateParametersProperties from ._models_py3 import ImageTemplateVhdDistributor from ._models_py3 import ImageTemplateVmProfile from ._models_py3 import ImageTemplateWindowsUpdateCustomizer @@ -58,6 +62,7 @@ from ._models_py3 import VirtualNetworkConfig from ._image_builder_client_enums import CreatedByType +from ._image_builder_client_enums import OnBuildError from ._image_builder_client_enums import ProvisioningErrorCode from ._image_builder_client_enums import ProvisioningState from ._image_builder_client_enums import ResourceIdentityType @@ -70,10 +75,12 @@ from ._patch import patch_sdk as _patch_sdk __all__ = [ - "CloudErrorBody", "DistributeVersioner", "DistributeVersionerLatest", "DistributeVersionerSource", + "ErrorAdditionalInfo", + "ErrorDetail", + "ErrorResponse", "ImageTemplate", "ImageTemplateCustomizer", "ImageTemplateDistributor", @@ -88,6 +95,7 @@ "ImageTemplatePlatformImageSource", "ImageTemplatePowerShellCustomizer", "ImageTemplatePowerShellValidator", + "ImageTemplatePropertiesErrorHandling", "ImageTemplatePropertiesOptimize", "ImageTemplatePropertiesOptimizeVmBoot", "ImageTemplatePropertiesValidate", @@ -98,6 +106,7 @@ "ImageTemplateShellValidator", "ImageTemplateSource", "ImageTemplateUpdateParameters", + "ImageTemplateUpdateParametersProperties", "ImageTemplateVhdDistributor", "ImageTemplateVmProfile", "ImageTemplateWindowsUpdateCustomizer", @@ -121,6 +130,7 @@ "UserAssignedIdentity", "VirtualNetworkConfig", "CreatedByType", + "OnBuildError", "ProvisioningErrorCode", "ProvisioningState", "ResourceIdentityType", diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/_image_builder_client_enums.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/_image_builder_client_enums.py index 0c89cf62150f..1bec38f5d9fc 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/_image_builder_client_enums.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/_image_builder_client_enums.py @@ -19,6 +19,13 @@ class CreatedByType(str, Enum, metaclass=CaseInsensitiveEnumMeta): KEY = "Key" +class OnBuildError(str, Enum, metaclass=CaseInsensitiveEnumMeta): + """Error handling behavior upon build failure.""" + + CLEANUP = "cleanup" + ABORT = "abort" + + class ProvisioningErrorCode(str, Enum, metaclass=CaseInsensitiveEnumMeta): """Error code of the provisioning failure.""" diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/_models_py3.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/_models_py3.py index ef0cee1ece8f..70e9545d34d2 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/_models_py3.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/models/_models_py3.py @@ -24,58 +24,6 @@ JSON = MutableMapping[str, Any] # pylint: disable=unsubscriptable-object -class CloudErrorBody(_serialization.Model): - """An error response from the Azure VM Image Builder service. - - :ivar code: An identifier for the error. Codes are invariant and are intended to be consumed - programmatically. - :vartype code: str - :ivar message: A message describing the error, intended to be suitable for display in a user - interface. - :vartype message: str - :ivar target: The target of the particular error. For example, the name of the property in - error. - :vartype target: str - :ivar details: A list of additional details about the error. - :vartype details: list[~azure.mgmt.imagebuilder.models.CloudErrorBody] - """ - - _attribute_map = { - "code": {"key": "code", "type": "str"}, - "message": {"key": "message", "type": "str"}, - "target": {"key": "target", "type": "str"}, - "details": {"key": "details", "type": "[CloudErrorBody]"}, - } - - def __init__( - self, - *, - code: Optional[str] = None, - message: Optional[str] = None, - target: Optional[str] = None, - details: Optional[List["_models.CloudErrorBody"]] = None, - **kwargs: Any - ) -> None: - """ - :keyword code: An identifier for the error. Codes are invariant and are intended to be consumed - programmatically. - :paramtype code: str - :keyword message: A message describing the error, intended to be suitable for display in a user - interface. - :paramtype message: str - :keyword target: The target of the particular error. For example, the name of the property in - error. - :paramtype target: str - :keyword details: A list of additional details about the error. - :paramtype details: list[~azure.mgmt.imagebuilder.models.CloudErrorBody] - """ - super().__init__(**kwargs) - self.code = code - self.message = message - self.target = target - self.details = details - - class DistributeVersioner(_serialization.Model): """Describes how to generate new x.y.z version number for distribution. @@ -160,6 +108,98 @@ def __init__(self, **kwargs: Any) -> None: self.scheme: str = "Source" +class ErrorAdditionalInfo(_serialization.Model): + """The resource management error additional info. + + Variables are only populated by the server, and will be ignored when sending a request. + + :ivar type: The additional info type. + :vartype type: str + :ivar info: The additional info. + :vartype info: JSON + """ + + _validation = { + "type": {"readonly": True}, + "info": {"readonly": True}, + } + + _attribute_map = { + "type": {"key": "type", "type": "str"}, + "info": {"key": "info", "type": "object"}, + } + + def __init__(self, **kwargs: Any) -> None: + """ """ + super().__init__(**kwargs) + self.type = None + self.info = None + + +class ErrorDetail(_serialization.Model): + """The error detail. + + Variables are only populated by the server, and will be ignored when sending a request. + + :ivar code: The error code. + :vartype code: str + :ivar message: The error message. + :vartype message: str + :ivar target: The error target. + :vartype target: str + :ivar details: The error details. + :vartype details: list[~azure.mgmt.imagebuilder.models.ErrorDetail] + :ivar additional_info: The error additional info. + :vartype additional_info: list[~azure.mgmt.imagebuilder.models.ErrorAdditionalInfo] + """ + + _validation = { + "code": {"readonly": True}, + "message": {"readonly": True}, + "target": {"readonly": True}, + "details": {"readonly": True}, + "additional_info": {"readonly": True}, + } + + _attribute_map = { + "code": {"key": "code", "type": "str"}, + "message": {"key": "message", "type": "str"}, + "target": {"key": "target", "type": "str"}, + "details": {"key": "details", "type": "[ErrorDetail]"}, + "additional_info": {"key": "additionalInfo", "type": "[ErrorAdditionalInfo]"}, + } + + def __init__(self, **kwargs: Any) -> None: + """ """ + super().__init__(**kwargs) + self.code = None + self.message = None + self.target = None + self.details = None + self.additional_info = None + + +class ErrorResponse(_serialization.Model): + """Common error response for all Azure Resource Manager APIs to return error details for failed + operations. (This also follows the OData error response format.). + + :ivar error: The error object. + :vartype error: ~azure.mgmt.imagebuilder.models.ErrorDetail + """ + + _attribute_map = { + "error": {"key": "error", "type": "ErrorDetail"}, + } + + def __init__(self, *, error: Optional["_models.ErrorDetail"] = None, **kwargs: Any) -> None: + """ + :keyword error: The error object. + :paramtype error: ~azure.mgmt.imagebuilder.models.ErrorDetail + """ + super().__init__(**kwargs) + self.error = error + + class Resource(_serialization.Model): """Common fields that are returned in the response for all Azure Resource Manager resources. @@ -291,6 +331,8 @@ class ImageTemplate(TrackedResource): # pylint: disable=too-many-instance-attri :vartype validate: ~azure.mgmt.imagebuilder.models.ImageTemplatePropertiesValidate :ivar distribute: The distribution targets where the image output needs to go to. :vartype distribute: list[~azure.mgmt.imagebuilder.models.ImageTemplateDistributor] + :ivar error_handling: Error handling options upon a build failure. + :vartype error_handling: ~azure.mgmt.imagebuilder.models.ImageTemplatePropertiesErrorHandling :ivar provisioning_state: Provisioning state of the resource. Known values are: "Creating", "Updating", "Succeeded", "Failed", "Deleting", and "Canceled". :vartype provisioning_state: str or ~azure.mgmt.imagebuilder.models.ProvisioningState @@ -347,6 +389,7 @@ class ImageTemplate(TrackedResource): # pylint: disable=too-many-instance-attri "optimize": {"key": "properties.optimize", "type": "ImageTemplatePropertiesOptimize"}, "validate": {"key": "properties.validate", "type": "ImageTemplatePropertiesValidate"}, "distribute": {"key": "properties.distribute", "type": "[ImageTemplateDistributor]"}, + "error_handling": {"key": "properties.errorHandling", "type": "ImageTemplatePropertiesErrorHandling"}, "provisioning_state": {"key": "properties.provisioningState", "type": "str"}, "provisioning_error": {"key": "properties.provisioningError", "type": "ProvisioningError"}, "last_run_status": {"key": "properties.lastRunStatus", "type": "ImageTemplateLastRunStatus"}, @@ -367,6 +410,7 @@ def __init__( optimize: Optional["_models.ImageTemplatePropertiesOptimize"] = None, validate: Optional["_models.ImageTemplatePropertiesValidate"] = None, distribute: Optional[List["_models.ImageTemplateDistributor"]] = None, + error_handling: Optional["_models.ImageTemplatePropertiesErrorHandling"] = None, build_timeout_in_minutes: int = 0, vm_profile: Optional["_models.ImageTemplateVmProfile"] = None, staging_resource_group: Optional[str] = None, @@ -391,6 +435,8 @@ def __init__( :paramtype validate: ~azure.mgmt.imagebuilder.models.ImageTemplatePropertiesValidate :keyword distribute: The distribution targets where the image output needs to go to. :paramtype distribute: list[~azure.mgmt.imagebuilder.models.ImageTemplateDistributor] + :keyword error_handling: Error handling options upon a build failure. + :paramtype error_handling: ~azure.mgmt.imagebuilder.models.ImageTemplatePropertiesErrorHandling :keyword build_timeout_in_minutes: Maximum duration to wait while building the image template (includes all customizations, optimization, validations, and distributions). Omit or specify 0 to use the default (4 hours). @@ -414,6 +460,7 @@ def __init__( self.optimize = optimize self.validate = validate self.distribute = distribute + self.error_handling = error_handling self.provisioning_state = None self.provisioning_error = None self.last_run_status = None @@ -1193,6 +1240,50 @@ def __init__( self.valid_exit_codes = valid_exit_codes +class ImageTemplatePropertiesErrorHandling(_serialization.Model): + """Error handling options upon a build failure. + + :ivar on_customizer_error: If there is a customizer error and this field is set to 'cleanup', + the build VM and associated network resources will be cleaned up. This is the default behavior. + If there is a customizer error and this field is set to 'abort', the build VM will be + preserved. Known values are: "cleanup" and "abort". + :vartype on_customizer_error: str or ~azure.mgmt.imagebuilder.models.OnBuildError + :ivar on_validation_error: If there is a validation error and this field is set to 'cleanup', + the build VM and associated network resources will be cleaned up. This is the default behavior. + If there is a validation error and this field is set to 'abort', the build VM will be + preserved. Known values are: "cleanup" and "abort". + :vartype on_validation_error: str or ~azure.mgmt.imagebuilder.models.OnBuildError + """ + + _attribute_map = { + "on_customizer_error": {"key": "onCustomizerError", "type": "str"}, + "on_validation_error": {"key": "onValidationError", "type": "str"}, + } + + def __init__( + self, + *, + on_customizer_error: Optional[Union[str, "_models.OnBuildError"]] = None, + on_validation_error: Optional[Union[str, "_models.OnBuildError"]] = None, + **kwargs: Any + ) -> None: + """ + :keyword on_customizer_error: If there is a customizer error and this field is set to + 'cleanup', the build VM and associated network resources will be cleaned up. This is the + default behavior. If there is a customizer error and this field is set to 'abort', the build VM + will be preserved. Known values are: "cleanup" and "abort". + :paramtype on_customizer_error: str or ~azure.mgmt.imagebuilder.models.OnBuildError + :keyword on_validation_error: If there is a validation error and this field is set to + 'cleanup', the build VM and associated network resources will be cleaned up. This is the + default behavior. If there is a validation error and this field is set to 'abort', the build VM + will be preserved. Known values are: "cleanup" and "abort". + :paramtype on_validation_error: str or ~azure.mgmt.imagebuilder.models.OnBuildError + """ + super().__init__(**kwargs) + self.on_customizer_error = on_customizer_error + self.on_validation_error = on_validation_error + + class ImageTemplatePropertiesOptimize(_serialization.Model): """Specifies optimization to be performed on image. @@ -1623,11 +1714,14 @@ class ImageTemplateUpdateParameters(_serialization.Model): :vartype identity: ~azure.mgmt.imagebuilder.models.ImageTemplateIdentity :ivar tags: The user-specified tags associated with the image template. :vartype tags: dict[str, str] + :ivar properties: Parameters for updating an image template. + :vartype properties: ~azure.mgmt.imagebuilder.models.ImageTemplateUpdateParametersProperties """ _attribute_map = { "identity": {"key": "identity", "type": "ImageTemplateIdentity"}, "tags": {"key": "tags", "type": "{str}"}, + "properties": {"key": "properties", "type": "ImageTemplateUpdateParametersProperties"}, } def __init__( @@ -1635,6 +1729,7 @@ def __init__( *, identity: Optional["_models.ImageTemplateIdentity"] = None, tags: Optional[Dict[str, str]] = None, + properties: Optional["_models.ImageTemplateUpdateParametersProperties"] = None, **kwargs: Any ) -> None: """ @@ -1642,10 +1737,33 @@ def __init__( :paramtype identity: ~azure.mgmt.imagebuilder.models.ImageTemplateIdentity :keyword tags: The user-specified tags associated with the image template. :paramtype tags: dict[str, str] + :keyword properties: Parameters for updating an image template. + :paramtype properties: ~azure.mgmt.imagebuilder.models.ImageTemplateUpdateParametersProperties """ super().__init__(**kwargs) self.identity = identity self.tags = tags + self.properties = properties + + +class ImageTemplateUpdateParametersProperties(_serialization.Model): + """Parameters for updating an image template. + + :ivar distribute: The distribution targets where the image output needs to go to. + :vartype distribute: list[~azure.mgmt.imagebuilder.models.ImageTemplateDistributor] + """ + + _attribute_map = { + "distribute": {"key": "distribute", "type": "[ImageTemplateDistributor]"}, + } + + def __init__(self, *, distribute: Optional[List["_models.ImageTemplateDistributor"]] = None, **kwargs: Any) -> None: + """ + :keyword distribute: The distribution targets where the image output needs to go to. + :paramtype distribute: list[~azure.mgmt.imagebuilder.models.ImageTemplateDistributor] + """ + super().__init__(**kwargs) + self.distribute = distribute class ImageTemplateVhdDistributor(ImageTemplateDistributor): diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/_operations.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/_operations.py index 7096ee121ad5..0153877e7d10 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/_operations.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/_operations.py @@ -6,7 +6,6 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys from typing import Any, Callable, Dict, Iterable, Optional, TypeVar import urllib.parse @@ -30,10 +29,6 @@ from .._serialization import Serializer from .._vendor import _convert_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -45,7 +40,7 @@ def build_list_request(**kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -91,9 +86,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.Operation"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.OperationListResult] = kwargs.pop("cls", None) error_map = { @@ -152,7 +145,8 @@ def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/_triggers_operations.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/_triggers_operations.py index e680a082376e..786496bfd161 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/_triggers_operations.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/_triggers_operations.py @@ -6,7 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload import urllib.parse @@ -30,12 +30,8 @@ from .. import models as _models from .._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _convert_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -49,7 +45,7 @@ def build_list_by_image_template_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -65,7 +61,7 @@ def build_list_by_image_template_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -82,7 +78,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -99,7 +95,7 @@ def build_get_request( "triggerName": _SERIALIZER.url("trigger_name", trigger_name, "str", pattern=r"^[A-Za-z0-9-_.]{1,64}$"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -116,7 +112,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -134,7 +130,7 @@ def build_create_or_update_request( "triggerName": _SERIALIZER.url("trigger_name", trigger_name, "str", pattern=r"^[A-Za-z0-9-_.]{1,64}$"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -153,7 +149,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -170,7 +166,7 @@ def build_delete_request( "triggerName": _SERIALIZER.url("trigger_name", trigger_name, "str", pattern=r"^[A-Za-z0-9-_.]{1,64}$"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -218,9 +214,7 @@ def list_by_image_template( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.TriggerCollection] = kwargs.pop("cls", None) error_map = { @@ -282,7 +276,8 @@ def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -320,9 +315,7 @@ def get( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.Trigger] = kwargs.pop("cls", None) request = build_get_request( @@ -347,7 +340,8 @@ def get( if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) deserialized = self._deserialize("Trigger", pipeline_response) @@ -379,16 +373,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Trigger] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "Trigger") @@ -418,7 +410,8 @@ def _create_or_update_initial( if response.status_code not in [200, 201]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if response.status_code == 200: deserialized = self._deserialize("Trigger", pipeline_response) @@ -547,9 +540,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.Trigger] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -611,9 +602,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -636,9 +625,10 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements response = pipeline_response.http_response - if response.status_code not in [200, 202, 204]: + if response.status_code not in [202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} if response.status_code == 202: @@ -678,9 +668,7 @@ def begin_delete( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) diff --git a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/_virtual_machine_image_templates_operations.py b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/_virtual_machine_image_templates_operations.py index 8b0e7e113061..1a321b289834 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/_virtual_machine_image_templates_operations.py +++ b/sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/operations/_virtual_machine_image_templates_operations.py @@ -6,7 +6,7 @@ # Code generated by Microsoft (R) AutoRest Code Generator. # Changes may cause incorrect behavior and will be lost if the code is regenerated. # -------------------------------------------------------------------------- -import sys +from io import IOBase from typing import Any, Callable, Dict, IO, Iterable, Optional, TypeVar, Union, cast, overload import urllib.parse @@ -30,12 +30,8 @@ from .. import models as _models from .._serialization import Serializer -from .._vendor import _convert_request, _format_url_section +from .._vendor import _convert_request -if sys.version_info >= (3, 8): - from typing import Literal # pylint: disable=no-name-in-module, ungrouped-imports -else: - from typing_extensions import Literal # type: ignore # pylint: disable=ungrouped-imports T = TypeVar("T") ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]] @@ -47,7 +43,7 @@ def build_list_request(subscription_id: str, **kwargs: Any) -> HttpRequest: _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -58,7 +54,7 @@ def build_list_request(subscription_id: str, **kwargs: Any) -> HttpRequest: "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -73,7 +69,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -86,7 +82,7 @@ def build_list_by_resource_group_request(resource_group_name: str, subscription_ "subscriptionId": _SERIALIZER.url("subscription_id", subscription_id, "str"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -103,7 +99,7 @@ def build_create_or_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -120,7 +116,7 @@ def build_create_or_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -139,7 +135,7 @@ def build_update_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) accept = _headers.pop("Accept", "application/json") @@ -156,7 +152,7 @@ def build_update_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -175,7 +171,7 @@ def build_get_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -191,7 +187,7 @@ def build_get_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -208,7 +204,7 @@ def build_delete_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -224,7 +220,7 @@ def build_delete_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -241,7 +237,7 @@ def build_run_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -257,7 +253,7 @@ def build_run_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -274,7 +270,7 @@ def build_cancel_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -290,7 +286,7 @@ def build_cancel_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -307,7 +303,7 @@ def build_list_run_outputs_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -323,7 +319,7 @@ def build_list_run_outputs_request( ), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -340,7 +336,7 @@ def build_get_run_output_request( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop("api_version", _params.pop("api-version", "2022-07-01")) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", "2023-07-01")) accept = _headers.pop("Accept", "application/json") # Construct URL @@ -357,7 +353,7 @@ def build_get_run_output_request( "runOutputName": _SERIALIZER.url("run_output_name", run_output_name, "str", pattern=r"^[A-Za-z0-9-_.]{1,64}$"), } - _url: str = _format_url_section(_url, **path_format_arguments) # type: ignore + _url: str = _url.format(**path_format_arguments) # type: ignore # Construct parameters _params["api-version"] = _SERIALIZER.query("api_version", api_version, "str") @@ -399,9 +395,7 @@ def list(self, **kwargs: Any) -> Iterable["_models.ImageTemplate"]: _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ImageTemplateListResult] = kwargs.pop("cls", None) error_map = { @@ -461,7 +455,8 @@ def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -483,9 +478,7 @@ def list_by_resource_group(self, resource_group_name: str, **kwargs: Any) -> Ite _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ImageTemplateListResult] = kwargs.pop("cls", None) error_map = { @@ -546,7 +539,8 @@ def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -574,16 +568,14 @@ def _create_or_update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.ImageTemplate] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "ImageTemplate") @@ -612,7 +604,8 @@ def _create_or_update_initial( if response.status_code not in [200, 201]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if response.status_code == 200: deserialized = self._deserialize("ImageTemplate", pipeline_response) @@ -735,9 +728,7 @@ def begin_create_or_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.ImageTemplate] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -802,16 +793,14 @@ def _update_initial( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[Optional[_models.ImageTemplate]] = kwargs.pop("cls", None) content_type = content_type or "application/json" _json = None _content = None - if isinstance(parameters, (IO, bytes)): + if isinstance(parameters, (IOBase, bytes)): _content = parameters else: _json = self._serialize.body(parameters, "ImageTemplateUpdateParameters") @@ -840,7 +829,8 @@ def _update_initial( if response.status_code not in [200, 202]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) deserialized = None if response.status_code == 200: @@ -961,9 +951,7 @@ def begin_update( _headers = case_insensitive_dict(kwargs.pop("headers", {}) or {}) _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) content_type: Optional[str] = kwargs.pop("content_type", _headers.pop("Content-Type", None)) cls: ClsType[_models.ImageTemplate] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) @@ -1034,9 +1022,7 @@ def get(self, resource_group_name: str, image_template_name: str, **kwargs: Any) _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.ImageTemplate] = kwargs.pop("cls", None) request = build_get_request( @@ -1060,7 +1046,8 @@ def get(self, resource_group_name: str, image_template_name: str, **kwargs: Any) if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) deserialized = self._deserialize("ImageTemplate", pipeline_response) @@ -1087,9 +1074,7 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) request = build_delete_request( @@ -1111,9 +1096,10 @@ def _delete_initial( # pylint: disable=inconsistent-return-statements response = pipeline_response.http_response - if response.status_code not in [200, 202, 204]: + if response.status_code not in [202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) response_headers = {} if response.status_code == 202: @@ -1149,9 +1135,7 @@ def begin_delete(self, resource_group_name: str, image_template_name: str, **kwa _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1207,9 +1191,7 @@ def _run_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) request = build_run_request( @@ -1233,7 +1215,8 @@ def _run_initial( # pylint: disable=inconsistent-return-statements if response.status_code not in [200, 202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) @@ -1265,9 +1248,7 @@ def begin_run(self, resource_group_name: str, image_template_name: str, **kwargs _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1323,9 +1304,7 @@ def _cancel_initial( # pylint: disable=inconsistent-return-statements _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) request = build_cancel_request( @@ -1349,7 +1328,8 @@ def _cancel_initial( # pylint: disable=inconsistent-return-statements if response.status_code not in [200, 202, 204]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) if cls: return cls(pipeline_response, None, {}) @@ -1381,9 +1361,7 @@ def begin_cancel(self, resource_group_name: str, image_template_name: str, **kwa _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[None] = kwargs.pop("cls", None) polling: Union[bool, PollingMethod] = kwargs.pop("polling", True) lro_delay = kwargs.pop("polling_interval", self._config.polling_interval) @@ -1443,9 +1421,7 @@ def list_run_outputs( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.RunOutputCollection] = kwargs.pop("cls", None) error_map = { @@ -1507,7 +1483,8 @@ def get_next(next_link=None): if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) return pipeline_response @@ -1545,9 +1522,7 @@ def get_run_output( _headers = kwargs.pop("headers", {}) or {} _params = case_insensitive_dict(kwargs.pop("params", {}) or {}) - api_version: Literal["2022-07-01"] = kwargs.pop( - "api_version", _params.pop("api-version", self._config.api_version) - ) + api_version: str = kwargs.pop("api_version", _params.pop("api-version", self._config.api_version)) cls: ClsType[_models.RunOutput] = kwargs.pop("cls", None) request = build_get_run_output_request( @@ -1572,7 +1547,8 @@ def get_run_output( if response.status_code not in [200]: map_error(status_code=response.status_code, response=response, error_map=error_map) - raise HttpResponseError(response=response, error_format=ARMErrorFormat) + error = self._deserialize.failsafe_deserialize(_models.ErrorResponse, pipeline_response) + raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat) deserialized = self._deserialize("RunOutput", pipeline_response) diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/cancel_image_build.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/cancel_image_build.py index 6be54a6a2ebf..31e3b3b234b7 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/cancel_image_build.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/cancel_image_build.py @@ -29,13 +29,12 @@ def main(): subscription_id="{subscription-id}", ) - response = client.virtual_machine_image_templates.begin_cancel( + client.virtual_machine_image_templates.begin_cancel( resource_group_name="myResourceGroup", image_template_name="myImageTemplate", ).result() - print(response) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/CancelImageBuild.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/CancelImageBuild.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/create_image_template_linux.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/create_image_template_linux.py index c844c7bd77ec..56fd30daf7b3 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/create_image_template_linux.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/create_image_template_linux.py @@ -75,6 +75,6 @@ def main(): print(response) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/CreateImageTemplateLinux.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/CreateImageTemplateLinux.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/create_image_template_windows.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/create_image_template_windows.py index d87c7838171c..3cd9b10eddc4 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/create_image_template_windows.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/create_image_template_windows.py @@ -123,6 +123,6 @@ def main(): print(response) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/CreateImageTemplateWindows.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/CreateImageTemplateWindows.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/create_source_image_trigger.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/create_source_image_trigger.py index ef97aa0ed3ca..e0d09192c7bc 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/create_source_image_trigger.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/create_source_image_trigger.py @@ -38,6 +38,6 @@ def main(): print(response) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/CreateSourceImageTrigger.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/CreateSourceImageTrigger.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/delete_image_template.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/delete_image_template.py index a8fae97a2eb9..990cb9b3e5fa 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/delete_image_template.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/delete_image_template.py @@ -29,13 +29,12 @@ def main(): subscription_id="{subscription-id}", ) - response = client.virtual_machine_image_templates.begin_delete( + client.virtual_machine_image_templates.begin_delete( resource_group_name="myResourceGroup", image_template_name="myImageTemplate", ).result() - print(response) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/DeleteImageTemplate.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/DeleteImageTemplate.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/delete_trigger.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/delete_trigger.py index 34a9742ba2ff..15cdbb8ae7f8 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/delete_trigger.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/delete_trigger.py @@ -29,14 +29,13 @@ def main(): subscription_id="{subscription-id}", ) - response = client.triggers.begin_delete( + client.triggers.begin_delete( resource_group_name="myResourceGroup", image_template_name="myImageTemplate", trigger_name="trigger1", ).result() - print(response) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/DeleteTrigger.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/DeleteTrigger.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/get_image_template.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/get_image_template.py index 01954259066f..0df696d863f3 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/get_image_template.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/get_image_template.py @@ -36,6 +36,6 @@ def main(): print(response) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/GetImageTemplate.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/GetImageTemplate.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/get_run_output.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/get_run_output.py index 3745da669d77..3eba57726f21 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/get_run_output.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/get_run_output.py @@ -37,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/GetRunOutput.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/GetRunOutput.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/get_trigger.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/get_trigger.py index 5bb8644cd4f2..35f8e526b6ae 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/get_trigger.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/get_trigger.py @@ -37,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/GetTrigger.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/GetTrigger.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_image_templates.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_image_templates.py index 8c6508fa7399..4d6da10a124f 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_image_templates.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_image_templates.py @@ -34,6 +34,6 @@ def main(): print(item) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/ListImageTemplates.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/ListImageTemplates.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_image_templates_by_rg.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_image_templates_by_rg.py index e468d9b80135..fcc9417c8c26 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_image_templates_by_rg.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_image_templates_by_rg.py @@ -36,6 +36,6 @@ def main(): print(item) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/ListImageTemplatesByRg.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/ListImageTemplatesByRg.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_run_outputs.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_run_outputs.py index 6839ad98ae84..d3ff33f2e178 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_run_outputs.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_run_outputs.py @@ -37,6 +37,6 @@ def main(): print(item) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/ListRunOutputs.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/ListRunOutputs.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_triggers.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_triggers.py index 0b622eae0adb..b7a009ac12ff 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_triggers.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/list_triggers.py @@ -37,6 +37,6 @@ def main(): print(item) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/ListTriggers.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/ListTriggers.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/operations_list.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/operations_list.py index 745efbb9be17..a6b28d32932f 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/operations_list.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/operations_list.py @@ -34,6 +34,6 @@ def main(): print(item) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/OperationsList.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/OperationsList.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/run_image_template.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/run_image_template.py index 16a027067370..6188b7403471 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/run_image_template.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/run_image_template.py @@ -29,13 +29,12 @@ def main(): subscription_id="{subscription-id}", ) - response = client.virtual_machine_image_templates.begin_run( + client.virtual_machine_image_templates.begin_run( resource_group_name="myResourceGroup", image_template_name="myImageTemplate", ).result() - print(response) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/RunImageTemplate.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/RunImageTemplate.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/update_image_template_tags.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/update_image_template_tags.py index 3fdabca9b069..06df94fa8b20 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/update_image_template_tags.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/update_image_template_tags.py @@ -37,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/UpdateImageTemplateTags.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/UpdateImageTemplateTags.json if __name__ == "__main__": main() diff --git a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/update_image_template_to_remove_identities.py b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/update_image_template_to_remove_identities.py index c1f0156b1442..88f110ac6897 100644 --- a/sdk/compute/azure-mgmt-imagebuilder/generated_samples/update_image_template_to_remove_identities.py +++ b/sdk/compute/azure-mgmt-imagebuilder/generated_samples/update_image_template_to_remove_identities.py @@ -37,6 +37,6 @@ def main(): print(response) -# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2022-07-01/examples/UpdateImageTemplateToRemoveIdentities.json +# x-ms-original-file: specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2023-07-01/examples/UpdateImageTemplateToRemoveIdentities.json if __name__ == "__main__": main()