Skip to content

Commit dc7fe25

Browse files
author
SDKAuto
committed
CodeGen from PR 19401 in Azure/azure-rest-api-specs
Merge 6dd76a8d4c0ad3a76c8b745a1913b9f475ef92e5 into d006e1d15d8fe19a6c558861dd5bba6b7baa8dd8
1 parent e86b4fa commit dc7fe25

23 files changed

+2538
-1519
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": "a8e6d89a08f7b872be9da82b735274bc84199e8e",
7+
"commit": "74f751adde83db4b9a99bf28c23040ef3eae42d5",
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 --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/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: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +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 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 FluidRelayManagementClientConfiguration(Configuration):
22+
class FluidRelayManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
2523
"""Configuration for FluidRelayManagementClient.
2624
2725
Note that all parameters used to create this instance are saved as instance
@@ -31,24 +29,28 @@ class FluidRelayManagementClientConfiguration(Configuration):
3129
:type credential: ~azure.core.credentials.TokenCredential
3230
:param subscription_id: The subscription id (GUID) for this resource.
3331
:type subscription_id: str
32+
:keyword api_version: Api Version. Default value is "2022-05-26". Note that overriding this
33+
default value may result in unsupported behavior.
34+
:paramtype api_version: str
3435
"""
3536

3637
def __init__(
3738
self,
38-
credential, # type: "TokenCredential"
39-
subscription_id, # type: str
40-
**kwargs # type: Any
41-
):
42-
# type: (...) -> None
39+
credential: "TokenCredential",
40+
subscription_id: str,
41+
**kwargs: Any
42+
) -> None:
43+
super(FluidRelayManagementClientConfiguration, self).__init__(**kwargs)
44+
api_version = kwargs.pop('api_version', "2022-05-26") # type: str
45+
4346
if credential is None:
4447
raise ValueError("Parameter 'credential' must not be None.")
4548
if subscription_id is None:
4649
raise ValueError("Parameter 'subscription_id' must not be None.")
47-
super(FluidRelayManagementClientConfiguration, self).__init__(**kwargs)
4850

4951
self.credential = credential
5052
self.subscription_id = subscription_id
51-
self.api_version = "2021-06-15-preview"
53+
self.api_version = api_version
5254
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5355
kwargs.setdefault('sdk_moniker', 'mgmt-fluidrelay/{}'.format(VERSION))
5456
self._configure(**kwargs)
@@ -68,4 +70,4 @@ def _configure(
6870
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6971
self.authentication_policy = kwargs.get('authentication_policy')
7072
if self.credential and not self.authentication_policy:
71-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
73+
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: 52 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,78 +6,88 @@
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 FluidRelayManagementClientConfiguration
22-
from .operations import FluidRelayOperationsOperations
23-
from .operations import FluidRelayServersOperations
2417
from . import models
18+
from ._configuration import FluidRelayManagementClientConfiguration
19+
from .operations import FluidRelayContainersOperations, FluidRelayOperationsOperations, FluidRelayServersOperations
2520

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

27-
class FluidRelayManagementClient(object):
25+
class FluidRelayManagementClient:
2826
"""FluidRelayManagementClient.
2927
3028
:ivar fluid_relay_operations: FluidRelayOperationsOperations operations
31-
:vartype fluid_relay_operations: fluid_relay_management_client.operations.FluidRelayOperationsOperations
29+
:vartype fluid_relay_operations:
30+
azure.mgmt.fluidrelay.operations.FluidRelayOperationsOperations
3231
:ivar fluid_relay_servers: FluidRelayServersOperations operations
33-
:vartype fluid_relay_servers: fluid_relay_management_client.operations.FluidRelayServersOperations
32+
:vartype fluid_relay_servers: azure.mgmt.fluidrelay.operations.FluidRelayServersOperations
33+
:ivar fluid_relay_containers: FluidRelayContainersOperations operations
34+
:vartype fluid_relay_containers:
35+
azure.mgmt.fluidrelay.operations.FluidRelayContainersOperations
3436
:param credential: Credential needed for the client to connect to Azure.
3537
:type credential: ~azure.core.credentials.TokenCredential
3638
:param subscription_id: The subscription id (GUID) for this resource.
3739
:type subscription_id: str
38-
:param str base_url: Service URL
40+
:param base_url: Service URL. Default value is "https://management.azure.com".
41+
:type base_url: str
42+
:keyword api_version: Api Version. Default value is "2022-05-26". Note that overriding this
43+
default value may result in unsupported behavior.
44+
:paramtype api_version: str
3945
"""
4046

4147
def __init__(
4248
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)
49+
credential: "TokenCredential",
50+
subscription_id: str,
51+
base_url: str = "https://management.azure.com",
52+
**kwargs: Any
53+
) -> None:
54+
self._config = FluidRelayManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
5255
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
5356

5457
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
5558
self._serialize = Serializer(client_models)
56-
self._serialize.client_side_validation = False
5759
self._deserialize = Deserializer(client_models)
60+
self._serialize.client_side_validation = False
61+
self.fluid_relay_operations = FluidRelayOperationsOperations(self._client, self._config, self._serialize, self._deserialize)
62+
self.fluid_relay_servers = FluidRelayServersOperations(self._client, self._config, self._serialize, self._deserialize)
63+
self.fluid_relay_containers = FluidRelayContainersOperations(self._client, self._config, self._serialize, self._deserialize)
5864

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)
6365

64-
def _send_request(self, http_request, **kwargs):
65-
# type: (HttpRequest, Any) -> HttpResponse
66+
def _send_request(
67+
self,
68+
request: HttpRequest,
69+
**kwargs: Any
70+
) -> HttpResponse:
6671
"""Runs the network request through the client's chained policies.
6772
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.
73+
>>> from azure.core.rest import HttpRequest
74+
>>> request = HttpRequest("GET", "https://www.example.org/")
75+
<HttpRequest [GET], url: 'https://www.example.org/'>
76+
>>> response = client._send_request(request)
77+
<HttpResponse: 200 OK>
78+
79+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
80+
81+
:param request: The network request you want to make. Required.
82+
:type request: ~azure.core.rest.HttpRequest
83+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
7184
:return: The response of your network call. Does not do error handling on your response.
72-
:rtype: ~azure.core.pipeline.transport.HttpResponse
85+
:rtype: ~azure.core.rest.HttpResponse
7386
"""
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
87+
88+
request_copy = deepcopy(request)
89+
request_copy.url = self._client.format_url(request_copy.url)
90+
return self._client.send_request(request_copy, **kwargs)
8191

8292
def close(self):
8393
# type: () -> None

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

Lines changed: 0 additions & 104 deletions
This file was deleted.
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
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)

0 commit comments

Comments
 (0)