Skip to content

Commit a447329

Browse files
SDKAutoPaul Selvaraj
SDKAuto
and
Paul Selvaraj
committed
CodeGen from PR 19482 in Azure/azure-rest-api-specs
[Hub Generated] Review request for Microsoft.Maintenance to add version preview/2022-07-01-preview (Azure#19482) * Adds base for updating Microsoft.Maintenance from version preview/2021-09-01-preview to version 2022-07-01-preview * Updates readme * Updates API version in new specs and examples * Adding Resource as Maintenance Scope for Maintenance Configuration APIs. Co-authored-by: Paul Selvaraj <[email protected]>
1 parent 78020f6 commit a447329

39 files changed

+4428
-3295
lines changed

‎sdk/maintenance/azure-mgmt-maintenance/_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.16.0",
5+
"@autorest/[email protected].3"
66
],
7-
"commit": "f4c77149bdbc236d428576d806690a954e4bb0aa",
7+
"commit": "6c11930fe7757c6416cb2580eeddb4e57695c707",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/maintenance/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/maintenance/resource-manager/readme.md --python --python-sdks-folder=/mnt/vss/_work/1/s/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.16.0 --use=@autorest/[email protected].3 --version=3.7.2",
1010
"readme": "specification/maintenance/resource-manager/readme.md"
1111
}

‎sdk/maintenance/azure-mgmt-maintenance/azure/mgmt/maintenance/__init__.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@
1010
from ._version import VERSION
1111

1212
__version__ = VERSION
13-
__all__ = ['MaintenanceManagementClient']
1413

1514
try:
16-
from ._patch import patch_sdk # type: ignore
17-
patch_sdk()
15+
from ._patch import __all__ as _patch_all
16+
from ._patch import * # type: ignore # pylint: disable=unused-wildcard-import
1817
except ImportError:
19-
pass
18+
_patch_all = []
19+
from ._patch import patch_sdk as _patch_sdk
20+
__all__ = ['MaintenanceManagementClient']
21+
__all__.extend([p for p in _patch_all if p not in __all__])
22+
23+
_patch_sdk()

‎sdk/maintenance/azure-mgmt-maintenance/azure/mgmt/maintenance/_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 MaintenanceManagementClientConfiguration(Configuration):
22+
class MaintenanceManagementClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
2523
"""Configuration for MaintenanceManagementClient.
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 credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
30+
:param subscription_id: Subscription credentials that uniquely identify a Microsoft Azure
31+
subscription. 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-07-01-preview". Note that overriding
34+
this 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(MaintenanceManagementClientConfiguration, self).__init__(**kwargs)
45+
api_version = kwargs.pop('api_version', "2022-07-01-preview") # 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(MaintenanceManagementClientConfiguration, self).__init__(**kwargs)
4851

4952
self.credential = credential
5053
self.subscription_id = subscription_id
51-
self.api_version = "2021-09-01-preview"
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-maintenance/{}'.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/maintenance/azure-mgmt-maintenance/azure/mgmt/maintenance/_maintenance_management_client.py

Lines changed: 80 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -6,113 +6,131 @@
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 MaintenanceManagementClientConfiguration
22-
from .operations import PublicMaintenanceConfigurationsOperations
23-
from .operations import ApplyUpdatesOperations
24-
from .operations import ConfigurationAssignmentsOperations
25-
from .operations import MaintenanceConfigurationsOperations
26-
from .operations import MaintenanceConfigurationsForResourceGroupOperations
27-
from .operations import ApplyUpdateForResourceGroupOperations
28-
from .operations import ConfigurationAssignmentsWithinSubscriptionOperations
29-
from .operations import Operations
30-
from .operations import UpdatesOperations
3117
from . import models
18+
from ._configuration import MaintenanceManagementClientConfiguration
19+
from .operations import ApplyUpdateForResourceGroupOperations, ApplyUpdatesOperations, ConfigurationAssignmentsOperations, ConfigurationAssignmentsWithinSubscriptionOperations, MaintenanceConfigurationsForResourceGroupOperations, MaintenanceConfigurationsOperations, Operations, PublicMaintenanceConfigurationsOperations, UpdatesOperations
3220

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

34-
class MaintenanceManagementClient(object):
25+
class MaintenanceManagementClient: # pylint: disable=too-many-instance-attributes
3526
"""Azure Maintenance Management Client.
3627
3728
:ivar public_maintenance_configurations: PublicMaintenanceConfigurationsOperations operations
38-
:vartype public_maintenance_configurations: azure.mgmt.maintenance.operations.PublicMaintenanceConfigurationsOperations
29+
:vartype public_maintenance_configurations:
30+
azure.mgmt.maintenance.operations.PublicMaintenanceConfigurationsOperations
3931
:ivar apply_updates: ApplyUpdatesOperations operations
4032
:vartype apply_updates: azure.mgmt.maintenance.operations.ApplyUpdatesOperations
4133
:ivar configuration_assignments: ConfigurationAssignmentsOperations operations
42-
:vartype configuration_assignments: azure.mgmt.maintenance.operations.ConfigurationAssignmentsOperations
34+
:vartype configuration_assignments:
35+
azure.mgmt.maintenance.operations.ConfigurationAssignmentsOperations
4336
:ivar maintenance_configurations: MaintenanceConfigurationsOperations operations
44-
:vartype maintenance_configurations: azure.mgmt.maintenance.operations.MaintenanceConfigurationsOperations
45-
:ivar maintenance_configurations_for_resource_group: MaintenanceConfigurationsForResourceGroupOperations operations
46-
:vartype maintenance_configurations_for_resource_group: azure.mgmt.maintenance.operations.MaintenanceConfigurationsForResourceGroupOperations
37+
:vartype maintenance_configurations:
38+
azure.mgmt.maintenance.operations.MaintenanceConfigurationsOperations
39+
:ivar maintenance_configurations_for_resource_group:
40+
MaintenanceConfigurationsForResourceGroupOperations operations
41+
:vartype maintenance_configurations_for_resource_group:
42+
azure.mgmt.maintenance.operations.MaintenanceConfigurationsForResourceGroupOperations
4743
:ivar apply_update_for_resource_group: ApplyUpdateForResourceGroupOperations operations
48-
:vartype apply_update_for_resource_group: azure.mgmt.maintenance.operations.ApplyUpdateForResourceGroupOperations
49-
:ivar configuration_assignments_within_subscription: ConfigurationAssignmentsWithinSubscriptionOperations operations
50-
:vartype configuration_assignments_within_subscription: azure.mgmt.maintenance.operations.ConfigurationAssignmentsWithinSubscriptionOperations
44+
:vartype apply_update_for_resource_group:
45+
azure.mgmt.maintenance.operations.ApplyUpdateForResourceGroupOperations
46+
:ivar configuration_assignments_within_subscription:
47+
ConfigurationAssignmentsWithinSubscriptionOperations operations
48+
:vartype configuration_assignments_within_subscription:
49+
azure.mgmt.maintenance.operations.ConfigurationAssignmentsWithinSubscriptionOperations
5150
:ivar operations: Operations operations
5251
:vartype operations: azure.mgmt.maintenance.operations.Operations
5352
:ivar updates: UpdatesOperations operations
5453
:vartype updates: azure.mgmt.maintenance.operations.UpdatesOperations
5554
:param credential: Credential needed for the client to connect to Azure.
5655
:type credential: ~azure.core.credentials.TokenCredential
57-
:param subscription_id: Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
56+
:param subscription_id: Subscription credentials that uniquely identify a Microsoft Azure
57+
subscription. The subscription ID forms part of the URI for every service call.
5858
:type subscription_id: str
59-
:param str base_url: Service URL
59+
:param base_url: Service URL. Default value is "https://management.azure.com".
60+
:type base_url: str
61+
:keyword api_version: Api Version. Default value is "2022-07-01-preview". Note that overriding
62+
this default value may result in unsupported behavior.
63+
:paramtype api_version: str
6064
"""
6165

6266
def __init__(
6367
self,
64-
credential, # type: "TokenCredential"
65-
subscription_id, # type: str
66-
base_url=None, # type: Optional[str]
67-
**kwargs # type: Any
68-
):
69-
# type: (...) -> None
70-
if not base_url:
71-
base_url = 'https://management.azure.com'
72-
self._config = MaintenanceManagementClientConfiguration(credential, subscription_id, **kwargs)
68+
credential: "TokenCredential",
69+
subscription_id: str,
70+
base_url: str = "https://management.azure.com",
71+
**kwargs: Any
72+
) -> None:
73+
self._config = MaintenanceManagementClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
7374
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
7475

7576
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
7677
self._serialize = Serializer(client_models)
77-
self._serialize.client_side_validation = False
7878
self._deserialize = Deserializer(client_models)
79-
79+
self._serialize.client_side_validation = False
8080
self.public_maintenance_configurations = PublicMaintenanceConfigurationsOperations(
81-
self._client, self._config, self._serialize, self._deserialize)
81+
self._client, self._config, self._serialize, self._deserialize
82+
)
8283
self.apply_updates = ApplyUpdatesOperations(
83-
self._client, self._config, self._serialize, self._deserialize)
84+
self._client, self._config, self._serialize, self._deserialize
85+
)
8486
self.configuration_assignments = ConfigurationAssignmentsOperations(
85-
self._client, self._config, self._serialize, self._deserialize)
87+
self._client, self._config, self._serialize, self._deserialize
88+
)
8689
self.maintenance_configurations = MaintenanceConfigurationsOperations(
87-
self._client, self._config, self._serialize, self._deserialize)
90+
self._client, self._config, self._serialize, self._deserialize
91+
)
8892
self.maintenance_configurations_for_resource_group = MaintenanceConfigurationsForResourceGroupOperations(
89-
self._client, self._config, self._serialize, self._deserialize)
93+
self._client, self._config, self._serialize, self._deserialize
94+
)
9095
self.apply_update_for_resource_group = ApplyUpdateForResourceGroupOperations(
91-
self._client, self._config, self._serialize, self._deserialize)
96+
self._client, self._config, self._serialize, self._deserialize
97+
)
9298
self.configuration_assignments_within_subscription = ConfigurationAssignmentsWithinSubscriptionOperations(
93-
self._client, self._config, self._serialize, self._deserialize)
99+
self._client, self._config, self._serialize, self._deserialize
100+
)
94101
self.operations = Operations(
95-
self._client, self._config, self._serialize, self._deserialize)
102+
self._client, self._config, self._serialize, self._deserialize
103+
)
96104
self.updates = UpdatesOperations(
97-
self._client, self._config, self._serialize, self._deserialize)
105+
self._client, self._config, self._serialize, self._deserialize
106+
)
107+
98108

99-
def _send_request(self, http_request, **kwargs):
100-
# type: (HttpRequest, Any) -> HttpResponse
109+
def _send_request(
110+
self,
111+
request: HttpRequest,
112+
**kwargs: Any
113+
) -> HttpResponse:
101114
"""Runs the network request through the client's chained policies.
102115
103-
:param http_request: The network request you want to make. Required.
104-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
105-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
116+
>>> from azure.core.rest import HttpRequest
117+
>>> request = HttpRequest("GET", "https://www.example.org/")
118+
<HttpRequest [GET], url: 'https://www.example.org/'>
119+
>>> response = client._send_request(request)
120+
<HttpResponse: 200 OK>
121+
122+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
123+
124+
:param request: The network request you want to make. Required.
125+
:type request: ~azure.core.rest.HttpRequest
126+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
106127
:return: The response of your network call. Does not do error handling on your response.
107-
:rtype: ~azure.core.pipeline.transport.HttpResponse
128+
:rtype: ~azure.core.rest.HttpResponse
108129
"""
109-
path_format_arguments = {
110-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
111-
}
112-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
113-
stream = kwargs.pop("stream", True)
114-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
115-
return pipeline_response.http_response
130+
131+
request_copy = deepcopy(request)
132+
request_copy.url = self._client.format_url(request_copy.url)
133+
return self._client.send_request(request_copy, **kwargs)
116134

117135
def close(self):
118136
# type: () -> None

0 commit comments

Comments
 (0)