Skip to content

Commit f1113ad

Browse files
author
SDKAuto
committed
CodeGen from PR 18281 in Azure/azure-rest-api-specs
Merge 94563316849fd453d1fb4bd0853fee3986b9a5fd into 2c68b6f0c9566d97d9d590a31b0d46997622eef7
1 parent dbad6c1 commit f1113ad

31 files changed

+4394
-1718
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/modelerfour@4.19.2"
4+
"@autorest/python@5.12.0",
5+
"@autorest/modelerfour@4.19.3"
66
],
7-
"commit": "2d2fdb419b42ad00df574946ea195fd1cd5ae226",
7+
"commit": "43491cd56219952ce2d10a00fc0e591d6d5188e5",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/deviceupdate/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/modelerfour@4.19.2 --version=3.4.5",
9+
"autorest_command": "autorest specification/deviceupdate/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --python3-only --track2 --use=@autorest/python@5.12.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2",
1010
"readme": "specification/deviceupdate/resource-manager/readme.md"
1111
}

sdk/deviceupdate/azure-mgmt-deviceupdate/azure/mgmt/deviceupdate/__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__ = ['DeviceUpdate']
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/deviceupdate/azure-mgmt-deviceupdate/azure/mgmt/deviceupdate/_configuration.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
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

@@ -35,16 +33,15 @@ class DeviceUpdateConfiguration(Configuration):
3533

3634
def __init__(
3735
self,
38-
credential, # type: "TokenCredential"
39-
subscription_id, # type: str
40-
**kwargs # type: Any
41-
):
42-
# type: (...) -> None
36+
credential: "TokenCredential",
37+
subscription_id: str,
38+
**kwargs: Any
39+
) -> None:
40+
super(DeviceUpdateConfiguration, self).__init__(**kwargs)
4341
if credential is None:
4442
raise ValueError("Parameter 'credential' must not be None.")
4543
if subscription_id is None:
4644
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(DeviceUpdateConfiguration, self).__init__(**kwargs)
4845

4946
self.credential = credential
5047
self.subscription_id = subscription_id
@@ -68,4 +65,4 @@ def _configure(
6865
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6966
self.authentication_policy = kwargs.get('authentication_policy')
7067
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
68+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

sdk/deviceupdate/azure-mgmt-deviceupdate/azure/mgmt/deviceupdate/_device_update.py

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,20 @@
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, Optional, TYPE_CHECKING
1011

12+
from azure.core.rest import HttpRequest, HttpResponse
1113
from azure.mgmt.core import ARMPipelineClient
1214
from msrest import Deserializer, Serializer
1315

16+
from . import models
17+
from ._configuration import DeviceUpdateConfiguration
18+
from .operations import AccountsOperations, DeviceUpdateOperationsMixin, InstancesOperations, Operations, PrivateEndpointConnectionProxiesOperations, PrivateEndpointConnectionsOperations, PrivateLinkResourcesOperations
19+
1420
if TYPE_CHECKING:
1521
# pylint: disable=unused-import,ungrouped-imports
16-
from typing import Any, Optional
17-
1822
from azure.core.credentials import TokenCredential
19-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
20-
21-
from ._configuration import DeviceUpdateConfiguration
22-
from .operations import DeviceUpdateOperationsMixin
23-
from .operations import AccountsOperations
24-
from .operations import InstancesOperations
25-
from .operations import PrivateEndpointConnectionsOperations
26-
from .operations import PrivateLinkResourcesOperations
27-
from .operations import Operations
28-
from . import models
29-
3023

3124
class DeviceUpdate(DeviceUpdateOperationsMixin):
3225
"""Microsoft Device Update resource provider.
@@ -36,65 +29,73 @@ class DeviceUpdate(DeviceUpdateOperationsMixin):
3629
:ivar instances: InstancesOperations operations
3730
:vartype instances: device_update.operations.InstancesOperations
3831
:ivar private_endpoint_connections: PrivateEndpointConnectionsOperations operations
39-
:vartype private_endpoint_connections: device_update.operations.PrivateEndpointConnectionsOperations
32+
:vartype private_endpoint_connections:
33+
device_update.operations.PrivateEndpointConnectionsOperations
4034
:ivar private_link_resources: PrivateLinkResourcesOperations operations
4135
:vartype private_link_resources: device_update.operations.PrivateLinkResourcesOperations
36+
:ivar private_endpoint_connection_proxies: PrivateEndpointConnectionProxiesOperations
37+
operations
38+
:vartype private_endpoint_connection_proxies:
39+
device_update.operations.PrivateEndpointConnectionProxiesOperations
4240
:ivar operations: Operations operations
4341
:vartype operations: device_update.operations.Operations
4442
:param credential: Credential needed for the client to connect to Azure.
4543
:type credential: ~azure.core.credentials.TokenCredential
4644
:param subscription_id: The Azure subscription ID.
4745
:type subscription_id: str
48-
:param str base_url: Service URL
49-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
46+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
47+
:type base_url: str
48+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
49+
Retry-After header is present.
5050
"""
5151

5252
def __init__(
5353
self,
54-
credential, # type: "TokenCredential"
55-
subscription_id, # type: str
56-
base_url=None, # type: Optional[str]
57-
**kwargs # type: Any
58-
):
59-
# type: (...) -> None
60-
if not base_url:
61-
base_url = 'https://management.azure.com'
62-
self._config = DeviceUpdateConfiguration(credential, subscription_id, **kwargs)
54+
credential: "TokenCredential",
55+
subscription_id: str,
56+
base_url: str = "https://management.azure.com",
57+
**kwargs: Any
58+
) -> None:
59+
self._config = DeviceUpdateConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
6360
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
6461

6562
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
6663
self._serialize = Serializer(client_models)
67-
self._serialize.client_side_validation = False
6864
self._deserialize = Deserializer(client_models)
65+
self._serialize.client_side_validation = False
66+
self.accounts = AccountsOperations(self._client, self._config, self._serialize, self._deserialize)
67+
self.instances = InstancesOperations(self._client, self._config, self._serialize, self._deserialize)
68+
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(self._client, self._config, self._serialize, self._deserialize)
69+
self.private_link_resources = PrivateLinkResourcesOperations(self._client, self._config, self._serialize, self._deserialize)
70+
self.private_endpoint_connection_proxies = PrivateEndpointConnectionProxiesOperations(self._client, self._config, self._serialize, self._deserialize)
71+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
6972

70-
self.accounts = AccountsOperations(
71-
self._client, self._config, self._serialize, self._deserialize)
72-
self.instances = InstancesOperations(
73-
self._client, self._config, self._serialize, self._deserialize)
74-
self.private_endpoint_connections = PrivateEndpointConnectionsOperations(
75-
self._client, self._config, self._serialize, self._deserialize)
76-
self.private_link_resources = PrivateLinkResourcesOperations(
77-
self._client, self._config, self._serialize, self._deserialize)
78-
self.operations = Operations(
79-
self._client, self._config, self._serialize, self._deserialize)
80-
81-
def _send_request(self, http_request, **kwargs):
82-
# type: (HttpRequest, Any) -> HttpResponse
73+
74+
def _send_request(
75+
self,
76+
request, # type: HttpRequest
77+
**kwargs: Any
78+
) -> HttpResponse:
8379
"""Runs the network request through the client's chained policies.
8480
85-
:param http_request: The network request you want to make. Required.
86-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
87-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
81+
>>> from azure.core.rest import HttpRequest
82+
>>> request = HttpRequest("GET", "https://www.example.org/")
83+
<HttpRequest [GET], url: 'https://www.example.org/'>
84+
>>> response = client._send_request(request)
85+
<HttpResponse: 200 OK>
86+
87+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
88+
89+
:param request: The network request you want to make. Required.
90+
:type request: ~azure.core.rest.HttpRequest
91+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
8892
:return: The response of your network call. Does not do error handling on your response.
89-
:rtype: ~azure.core.pipeline.transport.HttpResponse
93+
:rtype: ~azure.core.rest.HttpResponse
9094
"""
91-
path_format_arguments = {
92-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
93-
}
94-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
95-
stream = kwargs.pop("stream", True)
96-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
97-
return pipeline_response.http_response
95+
96+
request_copy = deepcopy(request)
97+
request_copy.url = self._client.format_url(request_copy.url)
98+
return self._client.send_request(request_copy, **kwargs)
9899

99100
def close(self):
100101
# type: () -> None

sdk/deviceupdate/azure-mgmt-deviceupdate/azure/mgmt/deviceupdate/_metadata.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"name": "DeviceUpdate",
66
"filename": "_device_update",
77
"description": "Microsoft Device Update resource provider.",
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\": [\"DeviceUpdateConfiguration\"], \"._operations_mixin\": [\"DeviceUpdateOperationsMixin\"]}}, \"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\": [\"DeviceUpdateConfiguration\"], \"._operations_mixin\": [\"DeviceUpdateOperationsMixin\"]}}, \"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\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"DeviceUpdateConfiguration\"], \"._operations_mixin\": [\"DeviceUpdateOperationsMixin\"]}}, \"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\"], \"msrest\": [\"Deserializer\", \"Serializer\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"DeviceUpdateConfiguration\"], \"._operations_mixin\": [\"DeviceUpdateOperationsMixin\"]}}, \"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,26 +91,26 @@
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
"accounts": "AccountsOperations",
102101
"instances": "InstancesOperations",
103102
"private_endpoint_connections": "PrivateEndpointConnectionsOperations",
104103
"private_link_resources": "PrivateLinkResourcesOperations",
104+
"private_endpoint_connection_proxies": "PrivateEndpointConnectionProxiesOperations",
105105
"operations": "Operations"
106106
},
107107
"operation_mixins": {
108-
"sync_imports": "{\"regular\": {\"azurecore\": {\"azure.core.exceptions\": [\"ClientAuthenticationError\", \"HttpResponseError\", \"ResourceExistsError\", \"ResourceNotFoundError\", \"map_error\"], \"azure.mgmt.core.exceptions\": [\"ARMErrorFormat\"], \"azure.core.pipeline\": [\"PipelineResponse\"], \"azure.core.pipeline.transport\": [\"HttpRequest\", \"HttpResponse\"]}, \"stdlib\": {\"warnings\": [null]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Callable\", \"Dict\", \"Generic\", \"Optional\", \"TypeVar\"]}}}",
109-
"async_imports": "{\"regular\": {\"azurecore\": {\"azure.core.exceptions\": [\"ClientAuthenticationError\", \"HttpResponseError\", \"ResourceExistsError\", \"ResourceNotFoundError\", \"map_error\"], \"azure.mgmt.core.exceptions\": [\"ARMErrorFormat\"], \"azure.core.pipeline\": [\"PipelineResponse\"], \"azure.core.pipeline.transport\": [\"AsyncHttpResponse\", \"HttpRequest\"]}, \"stdlib\": {\"warnings\": [null]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Callable\", \"Dict\", \"Generic\", \"Optional\", \"TypeVar\"]}}}",
108+
"sync_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
109+
"async_imports": "{\"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}",
110110
"operations": {
111111
"check_name_availability" : {
112112
"sync": {
113-
"signature": "def check_name_availability(\n self,\n request, # type: \"_models.CheckNameAvailabilityRequest\"\n **kwargs # type: Any\n):\n",
113+
"signature": "def check_name_availability(\n self,\n request, # type: \"_models.CheckNameAvailabilityRequest\"\n **kwargs # type: Any\n):\n # type: (...) -\u003e \"_models.CheckNameAvailabilityResponse\"\n",
114114
"doc": "\"\"\"Checks ADU resource name availability.\n\n:param request: Check Name Availability Request.\n:type request: ~device_update.models.CheckNameAvailabilityRequest\n:keyword callable cls: A custom type or function that will be passed the direct response\n:return: CheckNameAvailabilityResponse, or the result of cls(response)\n:rtype: ~device_update.models.CheckNameAvailabilityResponse\n:raises: ~azure.core.exceptions.HttpResponseError\n\"\"\""
115115
},
116116
"async": {

0 commit comments

Comments
 (0)