Skip to content

Commit e38c6d8

Browse files
author
SDKAuto
committed
CodeGen from PR 17195 in Azure/azure-rest-api-specs
Merge 5fb11ef93261fd1cbe6d8769d1b11b2abfec990d into 0fe46ea
1 parent 6427bf8 commit e38c6d8

26 files changed

+1384
-742
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.2",
2+
"autorest": "3.7.2",
33
"use": [
4-
"@autorest/python@5.8.1",
5-
"@autorest/[email protected].2"
4+
"@autorest/python@5.12.0",
5+
"@autorest/[email protected].3"
66
],
7-
"commit": "8816b8568ee46dae94967bfadb97e19301604667",
7+
"commit": "447954f2b20fd16fcbd7958fdc6a478995477c6c",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/resourcehealth/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.1 --use=@autorest/[email protected].2 --version=3.4.2",
9+
"autorest_command": "autorest specification/resourcehealth/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.12.0 --use=@autorest/[email protected].3 --version=3.7.2",
1010
"readme": "specification/resourcehealth/resource-manager/readme.md"
1111
}

sdk/resourcehealth/azure-mgmt-resourcehealth/azure/mgmt/resourcehealth/_configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from azure.core.configuration import Configuration
1414
from azure.core.pipeline import policies
15-
from azure.mgmt.core.policies import ARMHttpLoggingPolicy
15+
from azure.mgmt.core.policies import ARMChallengeAuthenticationPolicy, ARMHttpLoggingPolicy
1616

1717
from ._version import VERSION
1818

@@ -68,4 +68,4 @@ def _configure(
6868
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6969
self.authentication_policy = kwargs.get('authentication_policy')
7070
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
71+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

sdk/resourcehealth/azure-mgmt-resourcehealth/azure/mgmt/resourcehealth/_microsoft_resource_health.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
from typing import Any, Optional
2424

2525
from azure.core.credentials import TokenCredential
26-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
2726

2827
class _SDKClient(object):
2928
def __init__(self, *args, **kwargs):
@@ -69,12 +68,10 @@ def __init__(
6968
credential, # type: "TokenCredential"
7069
subscription_id, # type: str
7170
api_version=None, # type: Optional[str]
72-
base_url=None, # type: Optional[str]
71+
base_url="https://management.azure.com", # type: str
7372
profile=KnownProfiles.default, # type: KnownProfiles
7473
**kwargs # type: Any
7574
):
76-
if not base_url:
77-
base_url = 'https://management.azure.com'
7875
self._config = MicrosoftResourceHealthConfiguration(credential, subscription_id, **kwargs)
7976
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
8077
super(MicrosoftResourceHealth, self).__init__(

sdk/resourcehealth/azure-mgmt-resourcehealth/azure/mgmt/resourcehealth/aio/_configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
from azure.core.configuration import Configuration
1414
from azure.core.pipeline import policies
15-
from azure.mgmt.core.policies import ARMHttpLoggingPolicy
15+
from azure.mgmt.core.policies import ARMHttpLoggingPolicy, AsyncARMChallengeAuthenticationPolicy
1616

1717
from .._version import VERSION
1818

@@ -64,4 +64,4 @@ def _configure(
6464
self.redirect_policy = kwargs.get('redirect_policy') or policies.AsyncRedirectPolicy(**kwargs)
6565
self.authentication_policy = kwargs.get('authentication_policy')
6666
if self.credential and not self.authentication_policy:
67-
self.authentication_policy = policies.AsyncBearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
67+
self.authentication_policy = AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

sdk/resourcehealth/azure-mgmt-resourcehealth/azure/mgmt/resourcehealth/aio/_microsoft_resource_health.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
from typing import Any, Optional, TYPE_CHECKING
1313

14-
from azure.core.pipeline.transport import AsyncHttpResponse, HttpRequest
1514
from azure.mgmt.core import AsyncARMPipelineClient
1615
from azure.profiles import KnownProfiles, ProfileDefinition
1716
from azure.profiles.multiapiclient import MultiApiClientMixin
@@ -21,6 +20,7 @@
2120

2221
if TYPE_CHECKING:
2322
# pylint: disable=unused-import,ungrouped-imports
23+
from azure.core.credentials import TokenCredential
2424
from azure.core.credentials_async import AsyncTokenCredential
2525

2626
class _SDKClient(object):
@@ -67,12 +67,10 @@ def __init__(
6767
credential: "AsyncTokenCredential",
6868
subscription_id: str,
6969
api_version: Optional[str] = None,
70-
base_url: Optional[str] = None,
70+
base_url: str = "https://management.azure.com",
7171
profile: KnownProfiles = KnownProfiles.default,
7272
**kwargs # type: Any
7373
) -> None:
74-
if not base_url:
75-
base_url = 'https://management.azure.com'
7674
self._config = MicrosoftResourceHealthConfiguration(credential, subscription_id, **kwargs)
7775
self._client = AsyncARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
7876
super(MicrosoftResourceHealth, self).__init__(

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
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

@@ -40,11 +40,11 @@ def __init__(
4040
**kwargs # type: Any
4141
):
4242
# type: (...) -> None
43+
super(MicrosoftResourceHealthConfiguration, self).__init__(**kwargs)
4344
if credential is None:
4445
raise ValueError("Parameter 'credential' must not be None.")
4546
if subscription_id is None:
4647
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(MicrosoftResourceHealthConfiguration, self).__init__(**kwargs)
4848

4949
self.credential = credential
5050
self.subscription_id = subscription_id
@@ -68,4 +68,4 @@ def _configure(
6868
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6969
self.authentication_policy = kwargs.get('authentication_policy')
7070
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
71+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

sdk/resourcehealth/azure-mgmt-resourcehealth/azure/mgmt/resourcehealth/v2015_01_01/_metadata.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"name": "MicrosoftResourceHealth",
66
"filename": "_microsoft_resource_health",
77
"description": "The Resource Health 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": false,
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\": [\"MicrosoftResourceHealthConfiguration\"]}}, \"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\": [\"MicrosoftResourceHealthConfiguration\"]}}, \"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\": [\"MicrosoftResourceHealthConfiguration\"]}}, \"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\": [\"MicrosoftResourceHealthConfiguration\"]}}, \"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
"availability_statuses": "AvailabilityStatusesOperations",

sdk/resourcehealth/azure-mgmt-resourcehealth/azure/mgmt/resourcehealth/v2015_01_01/_microsoft_resource_health.py

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

9+
from copy import deepcopy
910
from typing import TYPE_CHECKING
1011

1112
from azure.mgmt.core import ARMPipelineClient
1213
from msrest import Deserializer, Serializer
1314

15+
from . import models
16+
from ._configuration import MicrosoftResourceHealthConfiguration
17+
from .operations import AvailabilityStatusesOperations, ChildAvailabilityStatusesOperations, ChildResourcesOperations, Operations
18+
1419
if TYPE_CHECKING:
1520
# pylint: disable=unused-import,ungrouped-imports
1621
from typing import Any, Optional
1722

1823
from azure.core.credentials import TokenCredential
19-
from azure.core.pipeline.transport import HttpRequest, HttpResponse
20-
21-
from ._configuration import MicrosoftResourceHealthConfiguration
22-
from .operations import AvailabilityStatusesOperations
23-
from .operations import ChildAvailabilityStatusesOperations
24-
from .operations import ChildResourcesOperations
25-
from .operations import Operations
26-
from . import models
27-
24+
from azure.core.rest import HttpRequest, HttpResponse
2825

2926
class MicrosoftResourceHealth(object):
3027
"""The Resource Health Client.
3128
3229
:ivar availability_statuses: AvailabilityStatusesOperations operations
33-
:vartype availability_statuses: azure.mgmt.resourcehealth.v2015_01_01.operations.AvailabilityStatusesOperations
30+
:vartype availability_statuses:
31+
azure.mgmt.resourcehealth.v2015_01_01.operations.AvailabilityStatusesOperations
3432
:ivar child_availability_statuses: ChildAvailabilityStatusesOperations operations
35-
:vartype child_availability_statuses: azure.mgmt.resourcehealth.v2015_01_01.operations.ChildAvailabilityStatusesOperations
33+
:vartype child_availability_statuses:
34+
azure.mgmt.resourcehealth.v2015_01_01.operations.ChildAvailabilityStatusesOperations
3635
:ivar child_resources: ChildResourcesOperations operations
37-
:vartype child_resources: azure.mgmt.resourcehealth.v2015_01_01.operations.ChildResourcesOperations
36+
:vartype child_resources:
37+
azure.mgmt.resourcehealth.v2015_01_01.operations.ChildResourcesOperations
3838
:ivar operations: Operations operations
3939
:vartype operations: azure.mgmt.resourcehealth.v2015_01_01.operations.Operations
4040
:param credential: Credential needed for the client to connect to Azure.
4141
:type credential: ~azure.core.credentials.TokenCredential
42-
:param subscription_id: Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
42+
:param subscription_id: Subscription credentials which uniquely identify Microsoft Azure
43+
subscription. The subscription ID forms part of the URI for every service call.
4344
:type subscription_id: str
44-
:param str base_url: Service URL
45+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
46+
:type base_url: str
4547
"""
4648

4749
def __init__(
4850
self,
4951
credential, # type: "TokenCredential"
5052
subscription_id, # type: str
51-
base_url=None, # type: Optional[str]
53+
base_url="https://management.azure.com", # type: str
5254
**kwargs # type: Any
5355
):
5456
# type: (...) -> None
55-
if not base_url:
56-
base_url = 'https://management.azure.com'
57-
self._config = MicrosoftResourceHealthConfiguration(credential, subscription_id, **kwargs)
57+
self._config = MicrosoftResourceHealthConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
5858
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
5959

6060
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
6161
self._serialize = Serializer(client_models)
62-
self._serialize.client_side_validation = False
6362
self._deserialize = Deserializer(client_models)
63+
self._serialize.client_side_validation = False
64+
self.availability_statuses = AvailabilityStatusesOperations(self._client, self._config, self._serialize, self._deserialize)
65+
self.child_availability_statuses = ChildAvailabilityStatusesOperations(self._client, self._config, self._serialize, self._deserialize)
66+
self.child_resources = ChildResourcesOperations(self._client, self._config, self._serialize, self._deserialize)
67+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
68+
6469

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

9297
def close(self):
9398
# type: () -> None

0 commit comments

Comments
 (0)