Skip to content

Commit cfb581b

Browse files
author
SDKAuto
committed
CodeGen from PR 17870 in Azure/azure-rest-api-specs
Merge bf973a9b57961a59d9e38f0ae8e931480fe4dd70 into 6282e52
1 parent 6ab40ed commit cfb581b

19 files changed

+1102
-1236
lines changed

‎sdk/fluidrelay/azure-mgmt-fluidrelay/_meta.json‎

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.12.0",
5+
"@autorest/[email protected].3"
66
],
7-
"commit": "a8e6d89a08f7b872be9da82b735274bc84199e8e",
7+
"commit": "75929c1a7f30d402ae3508bd8b952b1a1e4d6ab2",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/fluidrelay/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/fluidrelay/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/[email protected].3 --version=3.7.2",
1010
"readme": "specification/fluidrelay/resource-manager/readme.md"
1111
}

‎sdk/fluidrelay/azure-mgmt-fluidrelay/azure/mgmt/fluidrelay/__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__ = ['FluidRelayManagementClient']
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/fluidrelay/azure-mgmt-fluidrelay/azure/mgmt/fluidrelay/_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 FluidRelayManagementClientConfiguration(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(FluidRelayManagementClientConfiguration, 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(FluidRelayManagementClientConfiguration, 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/fluidrelay/azure-mgmt-fluidrelay/azure/mgmt/fluidrelay/_fluid_relay_management_client.py‎

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,78 +6,81 @@
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 FluidRelayManagementClientConfiguration
18+
from .operations import FluidRelayOperationsOperations, FluidRelayServersOperations
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 FluidRelayManagementClientConfiguration
22-
from .operations import FluidRelayOperationsOperations
23-
from .operations import FluidRelayServersOperations
24-
from . import models
2523

26-
27-
class FluidRelayManagementClient(object):
24+
class FluidRelayManagementClient:
2825
"""FluidRelayManagementClient.
2926
3027
:ivar fluid_relay_operations: FluidRelayOperationsOperations operations
31-
:vartype fluid_relay_operations: fluid_relay_management_client.operations.FluidRelayOperationsOperations
28+
:vartype fluid_relay_operations:
29+
fluid_relay_management_client.operations.FluidRelayOperationsOperations
3230
:ivar fluid_relay_servers: FluidRelayServersOperations operations
33-
:vartype fluid_relay_servers: fluid_relay_management_client.operations.FluidRelayServersOperations
31+
:vartype fluid_relay_servers:
32+
fluid_relay_management_client.operations.FluidRelayServersOperations
3433
:param credential: Credential needed for the client to connect to Azure.
3534
:type credential: ~azure.core.credentials.TokenCredential
3635
:param subscription_id: The subscription id (GUID) for this resource.
3736
:type subscription_id: str
38-
:param str base_url: Service URL
37+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
38+
:type base_url: str
3939
"""
4040

4141
def __init__(
4242
self,
43-
credential, # type: "TokenCredential"
44-
subscription_id, # type: str
45-
base_url=None, # type: Optional[str]
46-
**kwargs # type: Any
47-
):
48-
# type: (...) -> None
49-
if not base_url:
50-
base_url = 'https://management.azure.com'
51-
self._config = FluidRelayManagementClientConfiguration(credential, subscription_id, **kwargs)
43+
credential: "TokenCredential",
44+
subscription_id: str,
45+
base_url: str = "https://management.azure.com",
46+
**kwargs: Any
47+
) -> None:
48+
self._config = FluidRelayManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
5249
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
5350

5451
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
5552
self._serialize = Serializer(client_models)
56-
self._serialize.client_side_validation = False
5753
self._deserialize = Deserializer(client_models)
54+
self._serialize.client_side_validation = False
55+
self.fluid_relay_operations = FluidRelayOperationsOperations(self._client, self._config, self._serialize, self._deserialize)
56+
self.fluid_relay_servers = FluidRelayServersOperations(self._client, self._config, self._serialize, self._deserialize)
5857

59-
self.fluid_relay_operations = FluidRelayOperationsOperations(
60-
self._client, self._config, self._serialize, self._deserialize)
61-
self.fluid_relay_servers = FluidRelayServersOperations(
62-
self._client, self._config, self._serialize, self._deserialize)
6358

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

8285
def close(self):
8386
# type: () -> None

‎sdk/fluidrelay/azure-mgmt-fluidrelay/azure/mgmt/fluidrelay/_metadata.json‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"name": "FluidRelayManagementClient",
66
"filename": "_fluid_relay_management_client",
77
"description": "FluidRelayManagementClient.",
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\": [\"FluidRelayManagementClientConfiguration\"]}}, \"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\": [\"FluidRelayManagementClientConfiguration\"]}}, \"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\": [\"FluidRelayManagementClientConfiguration\"]}}, \"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\": [\"FluidRelayManagementClientConfiguration\"]}}, \"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
"fluid_relay_operations": "FluidRelayOperationsOperations",

‎sdk/fluidrelay/azure-mgmt-fluidrelay/azure/mgmt/fluidrelay/_patch.py‎

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

‎sdk/fluidrelay/azure-mgmt-fluidrelay/azure/mgmt/fluidrelay/_vendor.py‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# --------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# Code generated by Microsoft (R) AutoRest Code Generator.
5+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
6+
# --------------------------------------------------------------------------
7+
8+
from azure.core.pipeline.transport import HttpRequest
9+
10+
def _convert_request(request, files=None):
11+
data = request.content if not files else None
12+
request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
13+
if files:
14+
request.set_formdata_body(files)
15+
return request
16+
17+
def _format_url_section(template, **kwargs):
18+
components = template.split("/")
19+
while components:
20+
try:
21+
return template.format(**kwargs)
22+
except KeyError as key:
23+
formatted_components = template.split("/")
24+
components = [
25+
c for c in formatted_components if "{}".format(key.args[0]) not in c
26+
]
27+
template = "/".join(components)

‎sdk/fluidrelay/azure-mgmt-fluidrelay/azure/mgmt/fluidrelay/aio/__init__.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@
88

99
from ._fluid_relay_management_client import FluidRelayManagementClient
1010
__all__ = ['FluidRelayManagementClient']
11+
12+
# `._patch.py` is used for handwritten extensions to the generated code
13+
# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
14+
from ._patch import patch_sdk
15+
patch_sdk()

‎sdk/fluidrelay/azure-mgmt-fluidrelay/azure/mgmt/fluidrelay/aio/_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 ARMHttpLoggingPolicy, AsyncARMChallengeAuthenticationPolicy
1414

1515
from .._version import VERSION
1616

@@ -37,11 +37,11 @@ def __init__(
3737
subscription_id: str,
3838
**kwargs: Any
3939
) -> None:
40+
super(FluidRelayManagementClientConfiguration, self).__init__(**kwargs)
4041
if credential is None:
4142
raise ValueError("Parameter 'credential' must not be None.")
4243
if subscription_id is None:
4344
raise ValueError("Parameter 'subscription_id' must not be None.")
44-
super(FluidRelayManagementClientConfiguration, self).__init__(**kwargs)
4545

4646
self.credential = credential
4747
self.subscription_id = subscription_id
@@ -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)

0 commit comments

Comments
 (0)