Skip to content

Commit 64a834c

Browse files
author
SDKAuto
committed
CodeGen from PR 18896 in Azure/azure-rest-api-specs
[Hub Generated] Review request for Microsoft.VirtualMachineImages to add version stable/2022-02-14 (Azure#18896) * Adds base for updating Microsoft.VirtualMachineImages from version stable/2021-10-01 to version 2022-02-14 * Updates readme * Updates API version in new specs and examples * adding 2022 changes * fixed proxy resource path * added object to ImageTemplate* * added object to valide and prettier to examples * added identifier * removed format integer 32 for breaking change * added back format integer 64, to be in compliance for lintdiff and breaking change * adding back int32 after getting jeffrey richters approval
1 parent 098c6bc commit 64a834c

20 files changed

+2428
-2615
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"autorest": "3.4.5",
2+
"autorest": "3.7.2",
33
"use": [
4-
"@autorest/python@5.8.4",
5-
"@autorest/[email protected].2"
4+
"@autorest/python@5.13.0",
5+
"@autorest/[email protected].3"
66
],
7-
"commit": "c6fc51d3b5e900961dab94f7655ba63d2813da19",
7+
"commit": "9f3ac7b135ac83007b7f3f68ca8ca9705284cff9",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/imagebuilder/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --track2 --use=@autorest/python@5.8.4 --use=@autorest/[email protected].2 --version=3.4.5",
9+
"autorest_command": "autorest specification/imagebuilder/resource-manager/readme.md --multiapi --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.13.0 --use=@autorest/[email protected].3 --version=3.7.2",
1010
"readme": "specification/imagebuilder/resource-manager/readme.md"
1111
}

sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/__init__.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
__version__ = VERSION
1313
__all__ = ['ImageBuilderClient']
1414

15-
try:
16-
from ._patch import patch_sdk # type: ignore
17-
patch_sdk()
18-
except ImportError:
19-
pass
15+
# `._patch.py` is used for handwritten extensions to the generated code
16+
# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
17+
from ._patch import patch_sdk
18+
patch_sdk()

sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_configuration.py

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,49 +6,52 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
from typing import TYPE_CHECKING
9+
from typing import Any, TYPE_CHECKING
1010

1111
from azure.core.configuration import Configuration
1212
from azure.core.pipeline import policies
13-
from azure.mgmt.core.policies import ARMHttpLoggingPolicy
13+
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1414

1515
from ._version import VERSION
1616

1717
if TYPE_CHECKING:
1818
# pylint: disable=unused-import,ungrouped-imports
19-
from typing import Any
20-
2119
from azure.core.credentials import TokenCredential
2220

2321

24-
class ImageBuilderClientConfiguration(Configuration):
22+
class ImageBuilderClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
2523
"""Configuration for ImageBuilderClient.
2624
2725
Note that all parameters used to create this instance are saved as instance
2826
attributes.
2927
3028
:param credential: Credential needed for the client to connect to Azure.
3129
:type credential: ~azure.core.credentials.TokenCredential
32-
:param subscription_id: Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription Id forms part of the URI for every service call.
30+
:param subscription_id: Subscription credentials which uniquely identify Microsoft Azure
31+
subscription. The subscription Id forms part of the URI for every service call.
3332
:type subscription_id: str
33+
:keyword api_version: Api Version. Default value is "2022-02-14". Note that overriding this
34+
default value may result in unsupported behavior.
35+
:paramtype api_version: str
3436
"""
3537

3638
def __init__(
3739
self,
38-
credential, # type: "TokenCredential"
39-
subscription_id, # type: str
40-
**kwargs # type: Any
41-
):
42-
# type: (...) -> None
40+
credential: "TokenCredential",
41+
subscription_id: str,
42+
**kwargs: Any
43+
) -> None:
44+
super(ImageBuilderClientConfiguration, self).__init__(**kwargs)
45+
api_version = kwargs.pop('api_version', "2022-02-14") # type: str
46+
4347
if credential is None:
4448
raise ValueError("Parameter 'credential' must not be None.")
4549
if subscription_id is None:
4650
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(ImageBuilderClientConfiguration, self).__init__(**kwargs)
4851

4952
self.credential = credential
5053
self.subscription_id = subscription_id
51-
self.api_version = "2021-10-01"
54+
self.api_version = api_version
5255
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5356
kwargs.setdefault('sdk_moniker', 'mgmt-imagebuilder/{}'.format(VERSION))
5457
self._configure(**kwargs)
@@ -68,4 +71,4 @@ def _configure(
6871
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6972
self.authentication_policy = kwargs.get('authentication_policy')
7073
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
74+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_image_builder_client.py

Lines changed: 51 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,79 +6,87 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
from typing import TYPE_CHECKING
9+
from copy import deepcopy
10+
from typing import Any, TYPE_CHECKING
1011

11-
from azure.mgmt.core import ARMPipelineClient
1212
from msrest import Deserializer, Serializer
1313

14-
if TYPE_CHECKING:
15-
# pylint: disable=unused-import,ungrouped-imports
16-
from typing import Any, Optional
17-
18-
from azure.core.credentials import TokenCredential
19-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
14+
from azure.core.rest import HttpRequest, HttpResponse
15+
from azure.mgmt.core import ARMPipelineClient
2016

21-
from ._configuration import ImageBuilderClientConfiguration
22-
from .operations import VirtualMachineImageTemplatesOperations
23-
from .operations import Operations
2417
from . import models
18+
from ._configuration import ImageBuilderClientConfiguration
19+
from .operations import Operations, VirtualMachineImageTemplatesOperations
2520

21+
if TYPE_CHECKING:
22+
# pylint: disable=unused-import,ungrouped-imports
23+
from azure.core.credentials import TokenCredential
2624

27-
class ImageBuilderClient(object):
25+
class ImageBuilderClient:
2826
"""Azure Virtual Machine Image Builder Client.
2927
3028
:ivar virtual_machine_image_templates: VirtualMachineImageTemplatesOperations operations
31-
:vartype virtual_machine_image_templates: azure.mgmt.imagebuilder.operations.VirtualMachineImageTemplatesOperations
29+
:vartype virtual_machine_image_templates:
30+
azure.mgmt.imagebuilder.operations.VirtualMachineImageTemplatesOperations
3231
:ivar operations: Operations operations
3332
:vartype operations: azure.mgmt.imagebuilder.operations.Operations
3433
:param credential: Credential needed for the client to connect to Azure.
3534
:type credential: ~azure.core.credentials.TokenCredential
36-
:param subscription_id: Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription Id forms part of the URI for every service call.
35+
:param subscription_id: Subscription credentials which uniquely identify Microsoft Azure
36+
subscription. The subscription Id forms part of the URI for every service call.
3737
:type subscription_id: str
38-
:param str base_url: Service URL
39-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
38+
:param base_url: Service URL. Default value is "https://management.azure.com".
39+
:type base_url: str
40+
:keyword api_version: Api Version. Default value is "2022-02-14". Note that overriding this
41+
default value may result in unsupported behavior.
42+
:paramtype api_version: str
43+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
44+
Retry-After header is present.
4045
"""
4146

4247
def __init__(
4348
self,
44-
credential, # type: "TokenCredential"
45-
subscription_id, # type: str
46-
base_url=None, # type: Optional[str]
47-
**kwargs # type: Any
48-
):
49-
# type: (...) -> None
50-
if not base_url:
51-
base_url = 'https://management.azure.com'
52-
self._config = ImageBuilderClientConfiguration(credential, subscription_id, **kwargs)
49+
credential: "TokenCredential",
50+
subscription_id: str,
51+
base_url: str = "https://management.azure.com",
52+
**kwargs: Any
53+
) -> None:
54+
self._config = ImageBuilderClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
5355
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
5456

5557
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
5658
self._serialize = Serializer(client_models)
57-
self._serialize.client_side_validation = False
5859
self._deserialize = Deserializer(client_models)
60+
self._serialize.client_side_validation = False
61+
self.virtual_machine_image_templates = VirtualMachineImageTemplatesOperations(self._client, self._config, self._serialize, self._deserialize)
62+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
5963

60-
self.virtual_machine_image_templates = VirtualMachineImageTemplatesOperations(
61-
self._client, self._config, self._serialize, self._deserialize)
62-
self.operations = Operations(
63-
self._client, self._config, self._serialize, self._deserialize)
6464

65-
def _send_request(self, http_request, **kwargs):
66-
# type: (HttpRequest, Any) -> HttpResponse
65+
def _send_request(
66+
self,
67+
request: HttpRequest,
68+
**kwargs: Any
69+
) -> HttpResponse:
6770
"""Runs the network request through the client's chained policies.
6871
69-
:param http_request: The network request you want to make. Required.
70-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
71-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
72+
>>> from azure.core.rest import HttpRequest
73+
>>> request = HttpRequest("GET", "https://www.example.org/")
74+
<HttpRequest [GET], url: 'https://www.example.org/'>
75+
>>> response = client._send_request(request)
76+
<HttpResponse: 200 OK>
77+
78+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
79+
80+
:param request: The network request you want to make. Required.
81+
:type request: ~azure.core.rest.HttpRequest
82+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
7283
:return: The response of your network call. Does not do error handling on your response.
73-
:rtype: ~azure.core.pipeline.transport.HttpResponse
84+
:rtype: ~azure.core.rest.HttpResponse
7485
"""
75-
path_format_arguments = {
76-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
77-
}
78-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
79-
stream = kwargs.pop("stream", True)
80-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
81-
return pipeline_response.http_response
86+
87+
request_copy = deepcopy(request)
88+
request_copy.url = self._client.format_url(request_copy.url)
89+
return self._client.send_request(request_copy, **kwargs)
8290

8391
def close(self):
8492
# type: () -> None

sdk/compute/azure-mgmt-imagebuilder/azure/mgmt/imagebuilder/_metadata.json

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"chosen_version": "2021-10-01",
3-
"total_api_version_list": ["2021-10-01"],
2+
"chosen_version": "2022-02-14",
3+
"total_api_version_list": ["2022-02-14"],
44
"client": {
55
"name": "ImageBuilderClient",
66
"filename": "_image_builder_client",
77
"description": "Azure Virtual Machine Image Builder Client.",
8-
"base_url": "\u0027https://management.azure.com\u0027",
9-
"custom_base_url": null,
8+
"host_value": "\"https://management.azure.com\"",
9+
"parameterized_host_template": null,
1010
"azure_arm": true,
1111
"has_lro_operations": true,
1212
"client_side_validation": false,
13-
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"ImageBuilderClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}, \"azurecore\": {\"azure.core.pipeline.transport\": [\"HttpRequest\", \"HttpResponse\"]}}}",
14-
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"ImageBuilderClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}, \"azurecore\": {\"azure.core.pipeline.transport\": [\"AsyncHttpResponse\", \"HttpRequest\"]}}}"
13+
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"ImageBuilderClientConfiguration\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
14+
"async_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"], \"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"ImageBuilderClientConfiguration\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
1515
},
1616
"global_parameters": {
1717
"sync": {
@@ -54,7 +54,7 @@
5454
"required": false
5555
},
5656
"base_url": {
57-
"signature": "base_url=None, # type: Optional[str]",
57+
"signature": "base_url=\"https://management.azure.com\", # type: str",
5858
"description": "Service URL",
5959
"docstring_type": "str",
6060
"required": false
@@ -74,7 +74,7 @@
7474
"required": false
7575
},
7676
"base_url": {
77-
"signature": "base_url: Optional[str] = None,",
77+
"signature": "base_url: str = \"https://management.azure.com\",",
7878
"description": "Service URL",
7979
"docstring_type": "str",
8080
"required": false
@@ -91,11 +91,10 @@
9191
"config": {
9292
"credential": true,
9393
"credential_scopes": ["https://management.azure.com/.default"],
94-
"credential_default_policy_type": "BearerTokenCredentialPolicy",
95-
"credential_default_policy_type_has_async_version": true,
96-
"credential_key_header_name": null,
97-
"sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
98-
"async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
94+
"credential_call_sync": "ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
95+
"credential_call_async": "AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
96+
"sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMChallengeAuthenticationPolicy\", \"ARMHttpLoggingPolicy\"]}, \"local\": {\"._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}}",
97+
"async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.configuration\": [\"Configuration\"], \"azure.core.pipeline\": [\"policies\"], \"azure.mgmt.core.policies\": [\"ARMHttpLoggingPolicy\", \"AsyncARMChallengeAuthenticationPolicy\"]}, \"local\": {\".._version\": [\"VERSION\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\"]}}, \"typing\": {\"azurecore\": {\"azure.core.credentials_async\": [\"AsyncTokenCredential\"]}}}"
9998
},
10099
"operation_groups": {
101100
"virtual_machine_image_templates": "VirtualMachineImageTemplatesOperations",
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
#
4+
# Copyright (c) Microsoft Corporation. All rights reserved.
5+
#
6+
# The MIT License (MIT)
7+
#
8+
# Permission is hereby granted, free of charge, to any person obtaining a copy
9+
# of this software and associated documentation files (the ""Software""), to
10+
# deal in the Software without restriction, including without limitation the
11+
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
12+
# sell copies of the Software, and to permit persons to whom the Software is
13+
# furnished to do so, subject to the following conditions:
14+
#
15+
# The above copyright notice and this permission notice shall be included in
16+
# all copies or substantial portions of the Software.
17+
#
18+
# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
23+
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
24+
# IN THE SOFTWARE.
25+
#
26+
# --------------------------------------------------------------------------
27+
28+
# This file is used for handwritten extensions to the generated code. Example:
29+
# https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
30+
def patch_sdk():
31+
pass

0 commit comments

Comments
 (0)