Skip to content

Commit 1970985

Browse files
author
SDKAuto
committed
CodeGen from PR 18571 in Azure/azure-rest-api-specs
Merge 04a91a7ba4a654b74b78dd672cc3455429d40c27 into bfc629362a914f63133ec7ecdbe3c1bdd539512f
1 parent 9cfaceb commit 1970985

File tree

49 files changed

+10173
-8950
lines changed

Some content is hidden

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

49 files changed

+10173
-8950
lines changed

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

+5-5
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": "8d0a1bce1741e7b181746bcce6ad25dad31a3b11",
7+
"commit": "9fd0441cb90ff78d70908ef23053b529e1384055",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/dataprotection/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/dataprotection/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/dataprotection/resource-manager/readme.md"
1111
}

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
__version__ = VERSION
1313
__all__ = ['DataProtectionClient']
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/dataprotection/azure-mgmt-dataprotection/azure/mgmt/dataprotection/_configuration.py

+15-13
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 DataProtectionClientConfiguration(Configuration):
22+
class DataProtectionClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
2523
"""Configuration for DataProtectionClient.
2624
2725
Note that all parameters used to create this instance are saved as instance
@@ -31,24 +29,28 @@ class DataProtectionClientConfiguration(Configuration):
3129
:type credential: ~azure.core.credentials.TokenCredential
3230
:param subscription_id: The subscription Id.
3331
:type subscription_id: str
32+
:keyword api_version: Api Version. Default value is "2022-04-01". 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(DataProtectionClientConfiguration, self).__init__(**kwargs)
44+
api_version = kwargs.pop('api_version', "2022-04-01") # 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(DataProtectionClientConfiguration, self).__init__(**kwargs)
4850

4951
self.credential = credential
5052
self.subscription_id = subscription_id
51-
self.api_version = "2021-07-01"
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-dataprotection/{}'.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/dataprotection/azure-mgmt-dataprotection/azure/mgmt/dataprotection/_data_protection_client.py

+79-83
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,23 @@
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 DataProtectionClientConfiguration
22-
from .operations import BackupVaultsOperations
23-
from .operations import OperationResultOperations
24-
from .operations import OperationStatusOperations
25-
from .operations import BackupVaultOperationResultsOperations
26-
from .operations import DataProtectionOperations
27-
from .operations import DataProtectionOperationsOperations
28-
from .operations import BackupPoliciesOperations
29-
from .operations import BackupInstancesOperations
30-
from .operations import RecoveryPointsOperations
31-
from .operations import JobsOperations
32-
from .operations import RestorableTimeRangesOperations
33-
from .operations import ExportJobsOperations
34-
from .operations import ExportJobsOperationResultOperations
35-
from .operations import ResourceGuardsOperations
3617
from . import models
18+
from ._configuration import DataProtectionClientConfiguration
19+
from .operations import BackupInstancesOperations, BackupPoliciesOperations, BackupVaultOperationResultsOperations, BackupVaultsOperations, DataProtectionOperations, DataProtectionOperationsOperations, ExportJobsOperationResultOperations, ExportJobsOperations, JobsOperations, OperationResultOperations, OperationStatusBackupVaultContextOperations, OperationStatusOperations, OperationStatusResourceGroupContextOperations, RecoveryPointsOperations, ResourceGuardsOperations, RestorableTimeRangesOperations
3720

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

39-
class DataProtectionClient(object):
25+
class DataProtectionClient: # pylint: disable=too-many-instance-attributes
4026
"""Open API 2.0 Specs for Azure Data Protection service.
4127
4228
:ivar backup_vaults: BackupVaultsOperations operations
@@ -45,12 +31,22 @@ class DataProtectionClient(object):
4531
:vartype operation_result: azure.mgmt.dataprotection.operations.OperationResultOperations
4632
:ivar operation_status: OperationStatusOperations operations
4733
:vartype operation_status: azure.mgmt.dataprotection.operations.OperationStatusOperations
34+
:ivar operation_status_backup_vault_context: OperationStatusBackupVaultContextOperations
35+
operations
36+
:vartype operation_status_backup_vault_context:
37+
azure.mgmt.dataprotection.operations.OperationStatusBackupVaultContextOperations
38+
:ivar operation_status_resource_group_context: OperationStatusResourceGroupContextOperations
39+
operations
40+
:vartype operation_status_resource_group_context:
41+
azure.mgmt.dataprotection.operations.OperationStatusResourceGroupContextOperations
4842
:ivar backup_vault_operation_results: BackupVaultOperationResultsOperations operations
49-
:vartype backup_vault_operation_results: azure.mgmt.dataprotection.operations.BackupVaultOperationResultsOperations
43+
:vartype backup_vault_operation_results:
44+
azure.mgmt.dataprotection.operations.BackupVaultOperationResultsOperations
5045
:ivar data_protection: DataProtectionOperations operations
5146
:vartype data_protection: azure.mgmt.dataprotection.operations.DataProtectionOperations
5247
:ivar data_protection_operations: DataProtectionOperationsOperations operations
53-
:vartype data_protection_operations: azure.mgmt.dataprotection.operations.DataProtectionOperationsOperations
48+
:vartype data_protection_operations:
49+
azure.mgmt.dataprotection.operations.DataProtectionOperationsOperations
5450
:ivar backup_policies: BackupPoliciesOperations operations
5551
:vartype backup_policies: azure.mgmt.dataprotection.operations.BackupPoliciesOperations
5652
:ivar backup_instances: BackupInstancesOperations operations
@@ -60,85 +56,85 @@ class DataProtectionClient(object):
6056
:ivar jobs: JobsOperations operations
6157
:vartype jobs: azure.mgmt.dataprotection.operations.JobsOperations
6258
:ivar restorable_time_ranges: RestorableTimeRangesOperations operations
63-
:vartype restorable_time_ranges: azure.mgmt.dataprotection.operations.RestorableTimeRangesOperations
59+
:vartype restorable_time_ranges:
60+
azure.mgmt.dataprotection.operations.RestorableTimeRangesOperations
6461
:ivar export_jobs: ExportJobsOperations operations
6562
:vartype export_jobs: azure.mgmt.dataprotection.operations.ExportJobsOperations
6663
:ivar export_jobs_operation_result: ExportJobsOperationResultOperations operations
67-
:vartype export_jobs_operation_result: azure.mgmt.dataprotection.operations.ExportJobsOperationResultOperations
64+
:vartype export_jobs_operation_result:
65+
azure.mgmt.dataprotection.operations.ExportJobsOperationResultOperations
6866
:ivar resource_guards: ResourceGuardsOperations operations
6967
:vartype resource_guards: azure.mgmt.dataprotection.operations.ResourceGuardsOperations
7068
:param credential: Credential needed for the client to connect to Azure.
7169
:type credential: ~azure.core.credentials.TokenCredential
7270
:param subscription_id: The subscription Id.
7371
:type subscription_id: str
74-
:param str base_url: Service URL
75-
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
72+
:param base_url: Service URL. Default value is "https://management.azure.com".
73+
:type base_url: str
74+
:keyword api_version: Api Version. Default value is "2022-04-01". Note that overriding this
75+
default value may result in unsupported behavior.
76+
:paramtype api_version: str
77+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
78+
Retry-After header is present.
7679
"""
7780

7881
def __init__(
7982
self,
80-
credential, # type: "TokenCredential"
81-
subscription_id, # type: str
82-
base_url=None, # type: Optional[str]
83-
**kwargs # type: Any
84-
):
85-
# type: (...) -> None
86-
if not base_url:
87-
base_url = 'https://management.azure.com'
88-
self._config = DataProtectionClientConfiguration(credential, subscription_id, **kwargs)
83+
credential: "TokenCredential",
84+
subscription_id: str,
85+
base_url: str = "https://management.azure.com",
86+
**kwargs: Any
87+
) -> None:
88+
self._config = DataProtectionClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
8989
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
9090

9191
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
9292
self._serialize = Serializer(client_models)
93-
self._serialize.client_side_validation = False
9493
self._deserialize = Deserializer(client_models)
95-
96-
self.backup_vaults = BackupVaultsOperations(
97-
self._client, self._config, self._serialize, self._deserialize)
98-
self.operation_result = OperationResultOperations(
99-
self._client, self._config, self._serialize, self._deserialize)
100-
self.operation_status = OperationStatusOperations(
101-
self._client, self._config, self._serialize, self._deserialize)
102-
self.backup_vault_operation_results = BackupVaultOperationResultsOperations(
103-
self._client, self._config, self._serialize, self._deserialize)
104-
self.data_protection = DataProtectionOperations(
105-
self._client, self._config, self._serialize, self._deserialize)
106-
self.data_protection_operations = DataProtectionOperationsOperations(
107-
self._client, self._config, self._serialize, self._deserialize)
108-
self.backup_policies = BackupPoliciesOperations(
109-
self._client, self._config, self._serialize, self._deserialize)
110-
self.backup_instances = BackupInstancesOperations(
111-
self._client, self._config, self._serialize, self._deserialize)
112-
self.recovery_points = RecoveryPointsOperations(
113-
self._client, self._config, self._serialize, self._deserialize)
114-
self.jobs = JobsOperations(
115-
self._client, self._config, self._serialize, self._deserialize)
116-
self.restorable_time_ranges = RestorableTimeRangesOperations(
117-
self._client, self._config, self._serialize, self._deserialize)
118-
self.export_jobs = ExportJobsOperations(
119-
self._client, self._config, self._serialize, self._deserialize)
120-
self.export_jobs_operation_result = ExportJobsOperationResultOperations(
121-
self._client, self._config, self._serialize, self._deserialize)
122-
self.resource_guards = ResourceGuardsOperations(
123-
self._client, self._config, self._serialize, self._deserialize)
124-
125-
def _send_request(self, http_request, **kwargs):
126-
# type: (HttpRequest, Any) -> HttpResponse
94+
self._serialize.client_side_validation = False
95+
self.backup_vaults = BackupVaultsOperations(self._client, self._config, self._serialize, self._deserialize)
96+
self.operation_result = OperationResultOperations(self._client, self._config, self._serialize, self._deserialize)
97+
self.operation_status = OperationStatusOperations(self._client, self._config, self._serialize, self._deserialize)
98+
self.operation_status_backup_vault_context = OperationStatusBackupVaultContextOperations(self._client, self._config, self._serialize, self._deserialize)
99+
self.operation_status_resource_group_context = OperationStatusResourceGroupContextOperations(self._client, self._config, self._serialize, self._deserialize)
100+
self.backup_vault_operation_results = BackupVaultOperationResultsOperations(self._client, self._config, self._serialize, self._deserialize)
101+
self.data_protection = DataProtectionOperations(self._client, self._config, self._serialize, self._deserialize)
102+
self.data_protection_operations = DataProtectionOperationsOperations(self._client, self._config, self._serialize, self._deserialize)
103+
self.backup_policies = BackupPoliciesOperations(self._client, self._config, self._serialize, self._deserialize)
104+
self.backup_instances = BackupInstancesOperations(self._client, self._config, self._serialize, self._deserialize)
105+
self.recovery_points = RecoveryPointsOperations(self._client, self._config, self._serialize, self._deserialize)
106+
self.jobs = JobsOperations(self._client, self._config, self._serialize, self._deserialize)
107+
self.restorable_time_ranges = RestorableTimeRangesOperations(self._client, self._config, self._serialize, self._deserialize)
108+
self.export_jobs = ExportJobsOperations(self._client, self._config, self._serialize, self._deserialize)
109+
self.export_jobs_operation_result = ExportJobsOperationResultOperations(self._client, self._config, self._serialize, self._deserialize)
110+
self.resource_guards = ResourceGuardsOperations(self._client, self._config, self._serialize, self._deserialize)
111+
112+
113+
def _send_request(
114+
self,
115+
request: HttpRequest,
116+
**kwargs: Any
117+
) -> HttpResponse:
127118
"""Runs the network request through the client's chained policies.
128119
129-
:param http_request: The network request you want to make. Required.
130-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
131-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
120+
>>> from azure.core.rest import HttpRequest
121+
>>> request = HttpRequest("GET", "https://www.example.org/")
122+
<HttpRequest [GET], url: 'https://www.example.org/'>
123+
>>> response = client._send_request(request)
124+
<HttpResponse: 200 OK>
125+
126+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
127+
128+
:param request: The network request you want to make. Required.
129+
:type request: ~azure.core.rest.HttpRequest
130+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
132131
:return: The response of your network call. Does not do error handling on your response.
133-
:rtype: ~azure.core.pipeline.transport.HttpResponse
132+
:rtype: ~azure.core.rest.HttpResponse
134133
"""
135-
path_format_arguments = {
136-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
137-
}
138-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
139-
stream = kwargs.pop("stream", True)
140-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
141-
return pipeline_response.http_response
134+
135+
request_copy = deepcopy(request)
136+
request_copy.url = self._client.format_url(request_copy.url)
137+
return self._client.send_request(request_copy, **kwargs)
142138

143139
def close(self):
144140
# type: () -> None

0 commit comments

Comments
 (0)