Skip to content

Commit 263d3ff

Browse files
author
SDKAuto
committed
CodeGen from PR 17811 in Azure/azure-rest-api-specs
Merge 4d4078e749e4f03319580dc7437e64efe4fbdc38 into 77b673c60d3efe1bc9cb30525db176e67b8d24dd
1 parent 4a52c8b commit 263d3ff

31 files changed

+3622
-1984
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.13.0",
5+
"@autorest/[email protected].3"
66
],
7-
"commit": "33b8d6f7bf2eb081fe134333b0fc445777e488d6",
7+
"commit": "b72597d9112b6f2e41d9ff70dea876631ac9f70d",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/guestconfiguration/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/guestconfiguration/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/guestconfiguration/resource-manager/readme.md"
1111
}

sdk/machinelearning/azure-mgmt-guestconfig/azure/mgmt/guestconfig/__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__ = ['GuestConfigurationClient']
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/machinelearning/azure-mgmt-guestconfig/azure/mgmt/guestconfig/_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 GuestConfigurationClientConfiguration(Configuration):
22+
class GuestConfigurationClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
2523
"""Configuration for GuestConfigurationClient.
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 ID which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
30+
:param subscription_id: Subscription ID which uniquely identify Microsoft Azure subscription.
31+
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-01-25". 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(GuestConfigurationClientConfiguration, self).__init__(**kwargs)
45+
api_version = kwargs.pop('api_version', "2022-01-25") # 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(GuestConfigurationClientConfiguration, self).__init__(**kwargs)
4851

4952
self.credential = credential
5053
self.subscription_id = subscription_id
51-
self.api_version = "2020-06-25"
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-guestconfig/{}'.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/machinelearning/azure-mgmt-guestconfig/azure/mgmt/guestconfig/_guest_configuration_client.py

Lines changed: 75 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,93 +6,110 @@
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 GuestConfigurationClientConfiguration
22-
from .operations import GuestConfigurationAssignmentsOperations
23-
from .operations import GuestConfigurationAssignmentReportsOperations
24-
from .operations import GuestConfigurationHCRPAssignmentsOperations
25-
from .operations import GuestConfigurationHCRPAssignmentReportsOperations
26-
from .operations import Operations
2717
from . import models
18+
from ._configuration import GuestConfigurationClientConfiguration
19+
from .operations import GuestConfigurationAssignmentReportsOperations, GuestConfigurationAssignmentReportsVMSSOperations, GuestConfigurationAssignmentsOperations, GuestConfigurationAssignmentsVMSSOperations, GuestConfigurationHCRPAssignmentReportsOperations, GuestConfigurationHCRPAssignmentsOperations, Operations
2820

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

30-
class GuestConfigurationClient(object):
25+
class GuestConfigurationClient: # pylint: disable=too-many-instance-attributes
3126
"""Guest Configuration Client.
3227
3328
:ivar guest_configuration_assignments: GuestConfigurationAssignmentsOperations operations
34-
:vartype guest_configuration_assignments: azure.mgmt.guestconfig.operations.GuestConfigurationAssignmentsOperations
35-
:ivar guest_configuration_assignment_reports: GuestConfigurationAssignmentReportsOperations operations
36-
:vartype guest_configuration_assignment_reports: azure.mgmt.guestconfig.operations.GuestConfigurationAssignmentReportsOperations
37-
:ivar guest_configuration_hcrp_assignments: GuestConfigurationHCRPAssignmentsOperations operations
38-
:vartype guest_configuration_hcrp_assignments: azure.mgmt.guestconfig.operations.GuestConfigurationHCRPAssignmentsOperations
39-
:ivar guest_configuration_hcrp_assignment_reports: GuestConfigurationHCRPAssignmentReportsOperations operations
40-
:vartype guest_configuration_hcrp_assignment_reports: azure.mgmt.guestconfig.operations.GuestConfigurationHCRPAssignmentReportsOperations
29+
:vartype guest_configuration_assignments:
30+
azure.mgmt.guestconfig.operations.GuestConfigurationAssignmentsOperations
31+
:ivar guest_configuration_assignment_reports: GuestConfigurationAssignmentReportsOperations
32+
operations
33+
:vartype guest_configuration_assignment_reports:
34+
azure.mgmt.guestconfig.operations.GuestConfigurationAssignmentReportsOperations
35+
:ivar guest_configuration_hcrp_assignments: GuestConfigurationHCRPAssignmentsOperations
36+
operations
37+
:vartype guest_configuration_hcrp_assignments:
38+
azure.mgmt.guestconfig.operations.GuestConfigurationHCRPAssignmentsOperations
39+
:ivar guest_configuration_hcrp_assignment_reports:
40+
GuestConfigurationHCRPAssignmentReportsOperations operations
41+
:vartype guest_configuration_hcrp_assignment_reports:
42+
azure.mgmt.guestconfig.operations.GuestConfigurationHCRPAssignmentReportsOperations
43+
:ivar guest_configuration_assignments_vmss: GuestConfigurationAssignmentsVMSSOperations
44+
operations
45+
:vartype guest_configuration_assignments_vmss:
46+
azure.mgmt.guestconfig.operations.GuestConfigurationAssignmentsVMSSOperations
47+
:ivar guest_configuration_assignment_reports_vmss:
48+
GuestConfigurationAssignmentReportsVMSSOperations operations
49+
:vartype guest_configuration_assignment_reports_vmss:
50+
azure.mgmt.guestconfig.operations.GuestConfigurationAssignmentReportsVMSSOperations
4151
:ivar operations: Operations operations
4252
:vartype operations: azure.mgmt.guestconfig.operations.Operations
4353
:param credential: Credential needed for the client to connect to Azure.
4454
:type credential: ~azure.core.credentials.TokenCredential
45-
:param subscription_id: Subscription ID which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
55+
:param subscription_id: Subscription ID which uniquely identify Microsoft Azure subscription.
56+
The subscription ID forms part of the URI for every service call.
4657
:type subscription_id: str
47-
:param str base_url: Service URL
58+
:param base_url: Service URL. Default value is "https://management.azure.com".
59+
:type base_url: str
60+
:keyword api_version: Api Version. Default value is "2022-01-25". Note that overriding this
61+
default value may result in unsupported behavior.
62+
:paramtype api_version: str
4863
"""
4964

5065
def __init__(
5166
self,
52-
credential, # type: "TokenCredential"
53-
subscription_id, # type: str
54-
base_url=None, # type: Optional[str]
55-
**kwargs # type: Any
56-
):
57-
# type: (...) -> None
58-
if not base_url:
59-
base_url = 'https://management.azure.com'
60-
self._config = GuestConfigurationClientConfiguration(credential, subscription_id, **kwargs)
67+
credential: "TokenCredential",
68+
subscription_id: str,
69+
base_url: str = "https://management.azure.com",
70+
**kwargs: Any
71+
) -> None:
72+
self._config = GuestConfigurationClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
6173
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
6274

6375
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
6476
self._serialize = Serializer(client_models)
65-
self._serialize.client_side_validation = False
6677
self._deserialize = Deserializer(client_models)
78+
self._serialize.client_side_validation = False
79+
self.guest_configuration_assignments = GuestConfigurationAssignmentsOperations(self._client, self._config, self._serialize, self._deserialize)
80+
self.guest_configuration_assignment_reports = GuestConfigurationAssignmentReportsOperations(self._client, self._config, self._serialize, self._deserialize)
81+
self.guest_configuration_hcrp_assignments = GuestConfigurationHCRPAssignmentsOperations(self._client, self._config, self._serialize, self._deserialize)
82+
self.guest_configuration_hcrp_assignment_reports = GuestConfigurationHCRPAssignmentReportsOperations(self._client, self._config, self._serialize, self._deserialize)
83+
self.guest_configuration_assignments_vmss = GuestConfigurationAssignmentsVMSSOperations(self._client, self._config, self._serialize, self._deserialize)
84+
self.guest_configuration_assignment_reports_vmss = GuestConfigurationAssignmentReportsVMSSOperations(self._client, self._config, self._serialize, self._deserialize)
85+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
86+
6787

68-
self.guest_configuration_assignments = GuestConfigurationAssignmentsOperations(
69-
self._client, self._config, self._serialize, self._deserialize)
70-
self.guest_configuration_assignment_reports = GuestConfigurationAssignmentReportsOperations(
71-
self._client, self._config, self._serialize, self._deserialize)
72-
self.guest_configuration_hcrp_assignments = GuestConfigurationHCRPAssignmentsOperations(
73-
self._client, self._config, self._serialize, self._deserialize)
74-
self.guest_configuration_hcrp_assignment_reports = GuestConfigurationHCRPAssignmentReportsOperations(
75-
self._client, self._config, self._serialize, self._deserialize)
76-
self.operations = Operations(
77-
self._client, self._config, self._serialize, self._deserialize)
78-
79-
def _send_request(self, http_request, **kwargs):
80-
# type: (HttpRequest, Any) -> HttpResponse
88+
def _send_request(
89+
self,
90+
request: HttpRequest,
91+
**kwargs: Any
92+
) -> HttpResponse:
8193
"""Runs the network request through the client's chained policies.
8294
83-
:param http_request: The network request you want to make. Required.
84-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
85-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
95+
>>> from azure.core.rest import HttpRequest
96+
>>> request = HttpRequest("GET", "https://www.example.org/")
97+
<HttpRequest [GET], url: 'https://www.example.org/'>
98+
>>> response = client._send_request(request)
99+
<HttpResponse: 200 OK>
100+
101+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
102+
103+
:param request: The network request you want to make. Required.
104+
:type request: ~azure.core.rest.HttpRequest
105+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
86106
:return: The response of your network call. Does not do error handling on your response.
87-
:rtype: ~azure.core.pipeline.transport.HttpResponse
107+
:rtype: ~azure.core.rest.HttpResponse
88108
"""
89-
path_format_arguments = {
90-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
91-
}
92-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
93-
stream = kwargs.pop("stream", True)
94-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
95-
return pipeline_response.http_response
109+
110+
request_copy = deepcopy(request)
111+
request_copy.url = self._client.format_url(request_copy.url)
112+
return self._client.send_request(request_copy, **kwargs)
96113

97114
def close(self):
98115
# type: () -> None

0 commit comments

Comments
 (0)