Skip to content

Commit 8a0caf3

Browse files
azclibotSDKAutoOchimsyyc
authored
[AutoRelease] t2-subscription-2022-01-21-81833 (Azure#22618)
* CodeGen from PR 17318 in Azure/azure-rest-api-specs Updated SubscriptionRP v2020-09-01 for s360 (Azure#17318) * Updated SubscriptionRP v2020-09-01 for s360 * Model validation errors are fixed Co-authored-by: Ochi <ochisamand@microsoft.com> * version,CHANGELOG * Update CHANGELOG.md Co-authored-by: SDKAuto <sdkautomation@microsoft.com> Co-authored-by: Ochi <ochisamand@microsoft.com> Co-authored-by: PythonSdkPipelines <PythonSdkPipelines> Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
1 parent fbdb860 commit 8a0caf3

35 files changed

+2749
-1902
lines changed

sdk/subscription/azure-mgmt-subscription/CHANGELOG.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Release History
22

3+
## 3.0.0 (2022-01-21)
4+
5+
**Features**
6+
7+
- Added operation group SubscriptionsOperations
8+
- Added operation group TenantsOperations
9+
- Model CanceledSubscriptionId has a new parameter subscription_id
10+
- Model EnabledSubscriptionId has a new parameter subscription_id
11+
- Model RenamedSubscriptionId has a new parameter subscription_id
12+
- Model SubscriptionAliasResponseProperties has a new parameter created_time
13+
14+
**Breaking changes**
15+
16+
- Model CanceledSubscriptionId no longer has parameter value
17+
- Model EnabledSubscriptionId no longer has parameter value
18+
- Model RenamedSubscriptionId no longer has parameter value
19+
320
## 2.0.0 (2021-11-25)
421

522
**Features**
@@ -17,7 +34,7 @@
1734
**Breaking changes**
1835

1936
- Removed operation group TenantsOperations
20-
- Removed operation group SubscriptionsOperations
37+
- Removed operation group SubscriptionsOperations(SubscriptionsOperations can be used in [azure-mgmt-resource](https://pypi.org/project/azure-mgmt-resource/))
2138

2239
## 1.0.0 (2020-12-16)
2340

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/modelerfour@4.19.2"
4+
"@autorest/python@5.12.0",
5+
"@autorest/modelerfour@4.19.3"
66
],
7-
"commit": "417fa30d2449b9aa56dab2b991a4e799a31f8cd4",
7+
"commit": "1b0a465061c68175898f8f5d27f0301f42ce994c",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/subscription/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/modelerfour@4.19.2 --version=3.4.5",
9+
"autorest_command": "autorest specification/subscription/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/modelerfour@4.19.3 --version=3.7.2",
1010
"readme": "specification/subscription/resource-manager/readme.md"
1111
}

sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/__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__ = ['SubscriptionClient']
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/subscription/azure-mgmt-subscription/azure/mgmt/subscription/_configuration.py

Lines changed: 7 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,14 @@ class SubscriptionClientConfiguration(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(SubscriptionClientConfiguration, self).__init__(**kwargs)
4038
if credential is None:
4139
raise ValueError("Parameter 'credential' must not be None.")
42-
super(SubscriptionClientConfiguration, self).__init__(**kwargs)
4340

4441
self.credential = credential
45-
self.api_version = "2021-10-01"
4642
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
4743
kwargs.setdefault('sdk_moniker', 'mgmt-subscription/{}'.format(VERSION))
4844
self._configure(**kwargs)
@@ -62,4 +58,4 @@ def _configure(
6258
self.redirect_policy = kwargs.get('redirect_policy') or policies.RedirectPolicy(**kwargs)
6359
self.authentication_policy = kwargs.get('authentication_policy')
6460
if self.credential and not self.authentication_policy:
65-
self.authentication_policy = policies.BearerTokenCredentialPolicy(self.credential, *self.credential_scopes, **kwargs)
61+
self.authentication_policy = ARMChallengeAuthenticationPolicy(self.credential, *self.credential_scopes, **kwargs)

sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/_metadata.json

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"chosen_version": "2021-10-01",
3-
"total_api_version_list": ["2021-10-01"],
2+
"chosen_version": "",
3+
"total_api_version_list": ["2016-06-01", "2021-10-01"],
44
"client": {
55
"name": "SubscriptionClient",
66
"filename": "_subscription_client",
77
"description": "The subscription 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": 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\": [\"SubscriptionClientConfiguration\"]}}, \"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\": [\"SubscriptionClientConfiguration\"]}}, \"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\": [\"SubscriptionClientConfiguration\"]}}, \"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\": [\"SubscriptionClientConfiguration\"]}}, \"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,13 +79,14 @@
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": {
88+
"subscriptions": "SubscriptionsOperations",
89+
"tenants": "TenantsOperations",
8990
"subscription": "SubscriptionOperations",
9091
"operations": "Operations",
9192
"alias": "AliasOperations",
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

sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/_subscription_client.py

Lines changed: 51 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,28 @@
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 SubscriptionClientConfiguration
18+
from .operations import AliasOperations, BillingAccountOperations, Operations, SubscriptionOperations, SubscriptionPolicyOperations, SubscriptionsOperations, TenantsOperations
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 SubscriptionClientConfiguration
22-
from .operations import SubscriptionOperations
23-
from .operations import Operations
24-
from .operations import AliasOperations
25-
from .operations import SubscriptionPolicyOperations
26-
from .operations import BillingAccountOperations
27-
from . import models
28-
2923

30-
class SubscriptionClient(object):
24+
class SubscriptionClient:
3125
"""The subscription client.
3226
27+
:ivar subscriptions: SubscriptionsOperations operations
28+
:vartype subscriptions: azure.mgmt.subscription.operations.SubscriptionsOperations
29+
:ivar tenants: TenantsOperations operations
30+
:vartype tenants: azure.mgmt.subscription.operations.TenantsOperations
3331
:ivar subscription: SubscriptionOperations operations
3432
:vartype subscription: azure.mgmt.subscription.operations.SubscriptionOperations
3533
:ivar operations: Operations operations
@@ -42,52 +40,59 @@ class SubscriptionClient(object):
4240
:vartype billing_account: azure.mgmt.subscription.operations.BillingAccountOperations
4341
:param credential: Credential needed for the client to connect to Azure.
4442
: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.
43+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
44+
:type base_url: str
45+
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no
46+
Retry-After header is present.
4747
"""
4848

4949
def __init__(
5050
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 = SubscriptionClientConfiguration(credential, **kwargs)
51+
credential: "TokenCredential",
52+
base_url: str = "https://management.azure.com",
53+
**kwargs: Any
54+
) -> None:
55+
self._config = SubscriptionClientConfiguration(credential=credential, **kwargs)
5956
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
6057

6158
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
6259
self._serialize = Serializer(client_models)
63-
self._serialize.client_side_validation = False
6460
self._deserialize = Deserializer(client_models)
61+
self._serialize.client_side_validation = False
62+
self.subscriptions = SubscriptionsOperations(self._client, self._config, self._serialize, self._deserialize)
63+
self.tenants = TenantsOperations(self._client, self._config, self._serialize, self._deserialize)
64+
self.subscription = SubscriptionOperations(self._client, self._config, self._serialize, self._deserialize)
65+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
66+
self.alias = AliasOperations(self._client, self._config, self._serialize, self._deserialize)
67+
self.subscription_policy = SubscriptionPolicyOperations(self._client, self._config, self._serialize, self._deserialize)
68+
self.billing_account = BillingAccountOperations(self._client, self._config, self._serialize, self._deserialize)
6569

66-
self.subscription = SubscriptionOperations(
67-
self._client, self._config, self._serialize, self._deserialize)
68-
self.operations = Operations(
69-
self._client, self._config, self._serialize, self._deserialize)
70-
self.alias = AliasOperations(
71-
self._client, self._config, self._serialize, self._deserialize)
72-
self.subscription_policy = SubscriptionPolicyOperations(
73-
self._client, self._config, self._serialize, self._deserialize)
74-
self.billing_account = BillingAccountOperations(
75-
self._client, self._config, self._serialize, self._deserialize)
76-
77-
def _send_request(self, http_request, **kwargs):
78-
# type: (HttpRequest, Any) -> HttpResponse
70+
71+
def _send_request(
72+
self,
73+
request, # type: HttpRequest
74+
**kwargs: Any
75+
) -> HttpResponse:
7976
"""Runs the network request through the client's chained policies.
8077
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.
78+
>>> from azure.core.rest import HttpRequest
79+
>>> request = HttpRequest("GET", "https://www.example.org/")
80+
<HttpRequest [GET], url: 'https://www.example.org/'>
81+
>>> response = client._send_request(request)
82+
<HttpResponse: 200 OK>
83+
84+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
85+
86+
:param request: The network request you want to make. Required.
87+
:type request: ~azure.core.rest.HttpRequest
88+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
8489
:return: The response of your network call. Does not do error handling on your response.
85-
:rtype: ~azure.core.pipeline.transport.HttpResponse
90+
:rtype: ~azure.core.rest.HttpResponse
8691
"""
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
92+
93+
request_copy = deepcopy(request)
94+
request_copy.url = self._client.format_url(request_copy.url)
95+
return self._client.send_request(request_copy, **kwargs)
9196

9297
def close(self):
9398
# type: () -> None

0 commit comments

Comments
 (0)