Skip to content

Commit c5c16b9

Browse files
author
SDKAuto
committed
CodeGen from PR 17089 in Azure/azure-rest-api-specs
Merge 79e686683ad64deefd8c09bcdd1a0b827e622b20 into 0e85ddc
1 parent 8d5fbf2 commit c5c16b9

30 files changed

+2193
-1993
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
2-
"autorest": "3.3.0",
3-
"use": "@autorest/[email protected]",
4-
"commit": "528c0cffd4de3d4acdf451a1ea5f7cf6f3cb790c",
2+
"autorest": "3.7.2",
3+
"use": [
4+
"@autorest/[email protected]",
5+
"@autorest/[email protected]"
6+
],
7+
"commit": "422f836549ce014a518265b4970dc1cb96edcc7e",
58
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
6-
"autorest_command": "autorest specification/managedservices/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.6.6 --version=3.3.0",
9+
"autorest_command": "autorest specification/managedservices/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] --version=3.7.2",
710
"readme": "specification/managedservices/resource-manager/readme.md"
811
}

‎sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/__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__ = ['ManagedServicesClient']
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/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/_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

@@ -33,16 +31,15 @@ class ManagedServicesClientConfiguration(Configuration):
3331

3432
def __init__(
3533
self,
36-
credential, # type: "TokenCredential"
37-
**kwargs # type: Any
38-
):
39-
# type: (...) -> None
34+
credential: "TokenCredential",
35+
**kwargs: Any
36+
) -> None:
37+
super(ManagedServicesClientConfiguration, self).__init__(**kwargs)
4038
if credential is None:
4139
raise ValueError("Parameter 'credential' must not be None.")
42-
super(ManagedServicesClientConfiguration, self).__init__(**kwargs)
4340

4441
self.credential = credential
45-
self.api_version = "2020-02-01-preview"
42+
self.api_version = "2022-01-01-preview"
4643
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
4744
kwargs.setdefault('sdk_moniker', 'mgmt-managedservices/{}'.format(VERSION))
4845
self._configure(**kwargs)
@@ -62,4 +59,4 @@ def _configure(
6259
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6360
self.authentication_policy = kwargs.get('authentication_policy')
6461
if self.credential and not self.authentication_policy:
65-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
62+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

‎sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/_managed_services_client.py‎

Lines changed: 62 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -6,88 +6,97 @@
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 ManagedServicesClientConfiguration
18+
from .operations import MarketplaceRegistrationDefinitionsOperations, MarketplaceRegistrationDefinitionsWithoutScopeOperations, Operations, OperationsWithScopeOperations, RegistrationAssignmentsOperations, RegistrationDefinitionsOperations
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 ManagedServicesClientConfiguration
22-
from .operations import RegistrationDefinitionsOperations
23-
from .operations import RegistrationAssignmentsOperations
24-
from .operations import MarketplaceRegistrationDefinitionsOperations
25-
from .operations import MarketplaceRegistrationDefinitionsWithoutScopeOperations
26-
from .operations import Operations
27-
from . import models
28-
2923

30-
class ManagedServicesClient(object):
31-
"""Specification for ManagedServices.
24+
class ManagedServicesClient:
25+
"""The specification for ManagedServices.
3226
3327
:ivar registration_definitions: RegistrationDefinitionsOperations operations
34-
:vartype registration_definitions: azure.mgmt.managedservices.operations.RegistrationDefinitionsOperations
28+
:vartype registration_definitions:
29+
azure.mgmt.managedservices.operations.RegistrationDefinitionsOperations
3530
:ivar registration_assignments: RegistrationAssignmentsOperations operations
36-
:vartype registration_assignments: azure.mgmt.managedservices.operations.RegistrationAssignmentsOperations
37-
:ivar marketplace_registration_definitions: MarketplaceRegistrationDefinitionsOperations operations
38-
:vartype marketplace_registration_definitions: azure.mgmt.managedservices.operations.MarketplaceRegistrationDefinitionsOperations
39-
:ivar marketplace_registration_definitions_without_scope: MarketplaceRegistrationDefinitionsWithoutScopeOperations operations
40-
:vartype marketplace_registration_definitions_without_scope: azure.mgmt.managedservices.operations.MarketplaceRegistrationDefinitionsWithoutScopeOperations
31+
:vartype registration_assignments:
32+
azure.mgmt.managedservices.operations.RegistrationAssignmentsOperations
33+
:ivar marketplace_registration_definitions: MarketplaceRegistrationDefinitionsOperations
34+
operations
35+
:vartype marketplace_registration_definitions:
36+
azure.mgmt.managedservices.operations.MarketplaceRegistrationDefinitionsOperations
37+
:ivar marketplace_registration_definitions_without_scope:
38+
MarketplaceRegistrationDefinitionsWithoutScopeOperations operations
39+
:vartype marketplace_registration_definitions_without_scope:
40+
azure.mgmt.managedservices.operations.MarketplaceRegistrationDefinitionsWithoutScopeOperations
4141
:ivar operations: Operations operations
4242
:vartype operations: azure.mgmt.managedservices.operations.Operations
43+
:ivar operations_with_scope: OperationsWithScopeOperations operations
44+
:vartype operations_with_scope:
45+
azure.mgmt.managedservices.operations.OperationsWithScopeOperations
4346
:param credential: Credential needed for the client to connect to Azure.
4447
:type credential: ~azure.core.credentials.TokenCredential
45-
:param str base_url: Service URL
46-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
48+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
49+
:type base_url: str
50+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
51+
Retry-After header is present.
4752
"""
4853

4954
def __init__(
5055
self,
51-
credential, # type: "TokenCredential"
52-
base_url=None, # type: Optional[str]
53-
**kwargs # type: Any
54-
):
55-
# type: (...) -> None
56-
if not base_url:
57-
base_url = 'https://management.azure.com'
58-
self._config = ManagedServicesClientConfiguration(credential, **kwargs)
56+
credential: "TokenCredential",
57+
base_url: str = "https://management.azure.com",
58+
**kwargs: Any
59+
) -> None:
60+
self._config = ManagedServicesClientConfiguration(credential=credential, **kwargs)
5961
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
6062

6163
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
6264
self._serialize = Serializer(client_models)
63-
self._serialize.client_side_validation = False
6465
self._deserialize = Deserializer(client_models)
66+
self._serialize.client_side_validation = False
67+
self.registration_definitions = RegistrationDefinitionsOperations(self._client, self._config, self._serialize, self._deserialize)
68+
self.registration_assignments = RegistrationAssignmentsOperations(self._client, self._config, self._serialize, self._deserialize)
69+
self.marketplace_registration_definitions = MarketplaceRegistrationDefinitionsOperations(self._client, self._config, self._serialize, self._deserialize)
70+
self.marketplace_registration_definitions_without_scope = MarketplaceRegistrationDefinitionsWithoutScopeOperations(self._client, self._config, self._serialize, self._deserialize)
71+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
72+
self.operations_with_scope = OperationsWithScopeOperations(self._client, self._config, self._serialize, self._deserialize)
6573

66-
self.registration_definitions = RegistrationDefinitionsOperations(
67-
self._client, self._config, self._serialize, self._deserialize)
68-
self.registration_assignments = RegistrationAssignmentsOperations(
69-
self._client, self._config, self._serialize, self._deserialize)
70-
self.marketplace_registration_definitions = MarketplaceRegistrationDefinitionsOperations(
71-
self._client, self._config, self._serialize, self._deserialize)
72-
self.marketplace_registration_definitions_without_scope = MarketplaceRegistrationDefinitionsWithoutScopeOperations(
73-
self._client, self._config, self._serialize, self._deserialize)
74-
self.operations = Operations(
75-
self._client, self._config, self._serialize, self._deserialize)
76-
77-
def _send_request(self, http_request, **kwargs):
78-
# type: (HttpRequest, Any) -> HttpResponse
74+
75+
def _send_request(
76+
self,
77+
request, # type: HttpRequest
78+
**kwargs: Any
79+
) -> HttpResponse:
7980
"""Runs the network request through the client's chained policies.
8081
81-
:param http_request: The network request you want to make. Required.
82-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
83-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
82+
>>> from azure.core.rest import HttpRequest
83+
>>> request = HttpRequest("GET", "https://www.example.org/")
84+
<HttpRequest [GET], url: 'https://www.example.org/'>
85+
>>> response = client._send_request(request)
86+
<HttpResponse: 200 OK>
87+
88+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
89+
90+
:param request: The network request you want to make. Required.
91+
:type request: ~azure.core.rest.HttpRequest
92+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
8493
:return: The response of your network call. Does not do error handling on your response.
85-
:rtype: ~azure.core.pipeline.transport.HttpResponse
94+
:rtype: ~azure.core.rest.HttpResponse
8695
"""
87-
http_request.url = self._client.format_url(http_request.url)
88-
stream = kwargs.pop("stream", True)
89-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
90-
return pipeline_response.http_response
96+
97+
request_copy = deepcopy(request)
98+
request_copy.url = self._client.format_url(request_copy.url)
99+
return self._client.send_request(request_copy, **kwargs)
91100

92101
def close(self):
93102
# type: () -> None

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"chosen_version": "2020-02-01-preview",
3-
"total_api_version_list": ["2020-02-01-preview"],
2+
"chosen_version": "2022-01-01-preview",
3+
"total_api_version_list": ["2022-01-01-preview"],
44
"client": {
55
"name": "ManagedServicesClient",
66
"filename": "_managed_services_client",
7-
"description": "Specification for ManagedServices.",
8-
"base_url": "\u0027https://management.azure.com\u0027",
9-
"custom_base_url": null,
7+
"description": "The specification for ManagedServices.",
8+
"host_value": "\"https://management.azure.com\"",
9+
"parameterized_host_template": null,
1010
"azure_arm": true,
1111
"has_lro_operations": true,
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\": [\"ManagedServicesClientConfiguration\"]}}, \"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\": [\"ManagedServicesClientConfiguration\"]}}, \"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\": [\"ManagedServicesClientConfiguration\"]}}, \"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\": [\"ManagedServicesClientConfiguration\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
1515
},
1616
"global_parameters": {
1717
"sync": {
@@ -42,7 +42,7 @@
4242
"required": false
4343
},
4444
"base_url": {
45-
"signature": "base_url=None, # type: Optional[str]",
45+
"signature": "base_url=\"https://management.azure.com\", # type: str",
4646
"description": "Service URL",
4747
"docstring_type": "str",
4848
"required": false
@@ -62,7 +62,7 @@
6262
"required": false
6363
},
6464
"base_url": {
65-
"signature": "base_url: Optional[str] = None,",
65+
"signature": "base_url: str = \"https://management.azure.com\",",
6666
"description": "Service URL",
6767
"docstring_type": "str",
6868
"required": false
@@ -79,17 +79,17 @@
7979
"config": {
8080
"credential": true,
8181
"credential_scopes": ["https://management.azure.com/.default"],
82-
"credential_default_policy_type": "BearerTokenCredentialPolicy",
83-
"credential_default_policy_type_has_async_version": true,
84-
"credential_key_header_name": null,
85-
"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\"]}}}",
86-
"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\"]}}}"
82+
"credential_call_sync": "ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
83+
"credential_call_async": "AsyncARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)",
84+
"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\"]}}}",
85+
"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\"]}}}"
8786
},
8887
"operation_groups": {
8988
"registration_definitions": "RegistrationDefinitionsOperations",
9089
"registration_assignments": "RegistrationAssignmentsOperations",
9190
"marketplace_registration_definitions": "MarketplaceRegistrationDefinitionsOperations",
9291
"marketplace_registration_definitions_without_scope": "MarketplaceRegistrationDefinitionsWithoutScopeOperations",
93-
"operations": "Operations"
92+
"operations": "Operations",
93+
"operations_with_scope": "OperationsWithScopeOperations"
9494
}
9595
}

0 commit comments

Comments
 (0)