Skip to content

Commit c4e984a

Browse files
author
SDKAuto
committed
CodeGen from PR 18208 in Azure/azure-rest-api-specs
Merge 4772ab9f3e13afc920d577bea23077ec30e32528 into 2abe647120f14bb145968a5543ead8ed51394498
1 parent 14ff5a8 commit c4e984a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+3547
-3782
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": "33b8d6f7bf2eb081fe134333b0fc445777e488d6",
7+
"commit": "d6191d641c750189751bde4466749fa589265abc",
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-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/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: 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 GuestConfigurationClientConfiguration(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(GuestConfigurationClientConfiguration, 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(GuestConfigurationClientConfiguration, 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/machinelearning/azure-mgmt-guestconfig/azure/mgmt/guestconfig/_guest_configuration_client.py

Lines changed: 60 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -6,93 +6,96 @@
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 GuestConfigurationClientConfiguration
18+
from .operations import GuestConfigurationAssignmentReportsOperations, GuestConfigurationAssignmentsOperations, GuestConfigurationHCRPAssignmentReportsOperations, GuestConfigurationHCRPAssignmentsOperations, Operations
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 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
27-
from . import models
28-
2923

30-
class GuestConfigurationClient(object):
24+
class GuestConfigurationClient:
3125
"""Guest Configuration Client.
3226
3327
: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
28+
:vartype guest_configuration_assignments:
29+
azure.mgmt.guestconfig.operations.GuestConfigurationAssignmentsOperations
30+
:ivar guest_configuration_assignment_reports: GuestConfigurationAssignmentReportsOperations
31+
operations
32+
:vartype guest_configuration_assignment_reports:
33+
azure.mgmt.guestconfig.operations.GuestConfigurationAssignmentReportsOperations
34+
:ivar guest_configuration_hcrp_assignments: GuestConfigurationHCRPAssignmentsOperations
35+
operations
36+
:vartype guest_configuration_hcrp_assignments:
37+
azure.mgmt.guestconfig.operations.GuestConfigurationHCRPAssignmentsOperations
38+
:ivar guest_configuration_hcrp_assignment_reports:
39+
GuestConfigurationHCRPAssignmentReportsOperations operations
40+
:vartype guest_configuration_hcrp_assignment_reports:
41+
azure.mgmt.guestconfig.operations.GuestConfigurationHCRPAssignmentReportsOperations
4142
:ivar operations: Operations operations
4243
:vartype operations: azure.mgmt.guestconfig.operations.Operations
4344
:param credential: Credential needed for the client to connect to Azure.
4445
: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.
46+
:param subscription_id: Subscription ID which uniquely identify Microsoft Azure subscription.
47+
The subscription ID forms part of the URI for every service call.
4648
:type subscription_id: str
47-
:param str base_url: Service URL
49+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
50+
:type base_url: str
4851
"""
4952

5053
def __init__(
5154
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)
55+
credential: "TokenCredential",
56+
subscription_id: str,
57+
base_url: str = "https://management.azure.com",
58+
**kwargs: Any
59+
) -> None:
60+
self._config = GuestConfigurationClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
6161
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
6262

6363
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
6464
self._serialize = Serializer(client_models)
65-
self._serialize.client_side_validation = False
6665
self._deserialize = Deserializer(client_models)
66+
self._serialize.client_side_validation = False
67+
self.guest_configuration_assignments = GuestConfigurationAssignmentsOperations(self._client, self._config, self._serialize, self._deserialize)
68+
self.guest_configuration_assignment_reports = GuestConfigurationAssignmentReportsOperations(self._client, self._config, self._serialize, self._deserialize)
69+
self.guest_configuration_hcrp_assignments = GuestConfigurationHCRPAssignmentsOperations(self._client, self._config, self._serialize, self._deserialize)
70+
self.guest_configuration_hcrp_assignment_reports = GuestConfigurationHCRPAssignmentReportsOperations(self._client, self._config, self._serialize, self._deserialize)
71+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
6772

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
73+
74+
def _send_request(
75+
self,
76+
request, # type: HttpRequest
77+
**kwargs: Any
78+
) -> HttpResponse:
8179
"""Runs the network request through the client's chained policies.
8280
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.
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.
8692
:return: The response of your network call. Does not do error handling on your response.
87-
:rtype: ~azure.core.pipeline.transport.HttpResponse
93+
:rtype: ~azure.core.rest.HttpResponse
8894
"""
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
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)
9699

97100
def close(self):
98101
# type: () -> None

sdk/machinelearning/azure-mgmt-guestconfig/azure/mgmt/guestconfig/_metadata.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"name": "GuestConfigurationClient",
66
"filename": "_guest_configuration_client",
77
"description": "Guest Configuration 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\": [\"GuestConfigurationClientConfiguration\"]}}, \"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\": [\"GuestConfigurationClientConfiguration\"]}}, \"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\": [\"GuestConfigurationClientConfiguration\"]}}, \"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\": [\"GuestConfigurationClientConfiguration\"]}}, \"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
"guest_configuration_assignments": "GuestConfigurationAssignmentsOperations",
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

0 commit comments

Comments
 (0)