Skip to content

Commit 4524455

Browse files
azclibotmsyyc
authored andcommitted
[AutoRelease] t2-msi-2022-03-17-07408(Do not merge) (Azure#23553)
* code and test * Update CHANGELOG.md Co-authored-by: PythonSdkPipelines <PythonSdkPipelines> Co-authored-by: Yuchao Yan <[email protected]>
1 parent b787c5c commit 4524455

23 files changed

+1336
-1060
lines changed

sdk/resources/azure-mgmt-msi/CHANGELOG.md

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

3+
## 6.0.0b2 (2022-03-24)
4+
5+
**Features**
6+
7+
- Added operation UserAssignedIdentitiesOperations.list_associated_resources
8+
39
## 6.0.0b1 (2021-05-19)
410

511
This is beta preview version.
@@ -89,4 +95,4 @@ introduce breaking changes.
8995

9096
## 0.1.0 (2017-12-13)
9197

92-
- Initial Release
98+
- Initial Release
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.0",
5-
"@autorest/[email protected].1"
4+
"@autorest/python@5.12.0",
5+
"@autorest/[email protected].3"
66
],
7-
"commit": "19e140f6f848bf9616735a7bd360edeef25c6c8d",
7+
"commit": "f635d0ffb31308098993e02cc1ab1a83db6bb585",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/msi/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.0 --use=@autorest/[email protected].1 --version=3.4.2",
9+
"autorest_command": "autorest specification/msi/resource-manager/readme.md --multiapi --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/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/msi/resource-manager/readme.md"
1111
}

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

Lines changed: 9 additions & 12 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,20 +33,19 @@ class ManagedServiceIdentityClientConfiguration(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(ManagedServiceIdentityClientConfiguration, 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(ManagedServiceIdentityClientConfiguration, self).__init__(**kwargs)
4845

4946
self.credential = credential
5047
self.subscription_id = subscription_id
51-
self.api_version = "2018-11-30"
48+
self.api_version = "2021-09-30-preview"
5249
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5350
kwargs.setdefault('sdk_moniker', 'mgmt-msi/{}'.format(VERSION))
5451
self._configure(**kwargs)
@@ -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/resources/azure-mgmt-msi/azure/mgmt/msi/_managed_service_identity_client.py

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6,83 +6,83 @@
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 ManagedServiceIdentityClientConfiguration
18+
from .operations import Operations, SystemAssignedIdentitiesOperations, UserAssignedIdentitiesOperations
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 ManagedServiceIdentityClientConfiguration
22-
from .operations import SystemAssignedIdentitiesOperations
23-
from .operations import Operations
24-
from .operations import UserAssignedIdentitiesOperations
25-
from . import models
2623

27-
28-
class ManagedServiceIdentityClient(object):
24+
class ManagedServiceIdentityClient:
2925
"""The Managed Service Identity Client.
3026
3127
:ivar system_assigned_identities: SystemAssignedIdentitiesOperations operations
32-
:vartype system_assigned_identities: managed_service_identity_client.operations.SystemAssignedIdentitiesOperations
28+
:vartype system_assigned_identities:
29+
azure.mgmt.msi.operations.SystemAssignedIdentitiesOperations
3330
:ivar operations: Operations operations
34-
:vartype operations: managed_service_identity_client.operations.Operations
31+
:vartype operations: azure.mgmt.msi.operations.Operations
3532
:ivar user_assigned_identities: UserAssignedIdentitiesOperations operations
36-
:vartype user_assigned_identities: managed_service_identity_client.operations.UserAssignedIdentitiesOperations
33+
:vartype user_assigned_identities: azure.mgmt.msi.operations.UserAssignedIdentitiesOperations
3734
:param credential: Credential needed for the client to connect to Azure.
3835
:type credential: ~azure.core.credentials.TokenCredential
3936
:param subscription_id: The Id of the Subscription to which the identity belongs.
4037
:type subscription_id: str
41-
:param str base_url: Service URL
38+
:param base_url: Service URL. Default value is 'https://management.azure.com'.
39+
:type base_url: str
4240
"""
4341

4442
def __init__(
4543
self,
46-
credential, # type: "TokenCredential"
47-
subscription_id, # type: str
48-
base_url=None, # type: Optional[str]
49-
**kwargs # type: Any
50-
):
51-
# type: (...) -> None
52-
if not base_url:
53-
base_url = 'https://management.azure.com'
54-
self._config = ManagedServiceIdentityClientConfiguration(credential, subscription_id, **kwargs)
44+
credential: "TokenCredential",
45+
subscription_id: str,
46+
base_url: str = "https://management.azure.com",
47+
**kwargs: Any
48+
) -> None:
49+
self._config = ManagedServiceIdentityClientConfiguration(credential=credential, subscription_id=subscription_id, **kwargs)
5550
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
5651

5752
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
5853
self._serialize = Serializer(client_models)
59-
self._serialize.client_side_validation = False
6054
self._deserialize = Deserializer(client_models)
55+
self._serialize.client_side_validation = False
56+
self.system_assigned_identities = SystemAssignedIdentitiesOperations(self._client, self._config, self._serialize, self._deserialize)
57+
self.operations = Operations(self._client, self._config, self._serialize, self._deserialize)
58+
self.user_assigned_identities = UserAssignedIdentitiesOperations(self._client, self._config, self._serialize, self._deserialize)
6159

62-
self.system_assigned_identities = SystemAssignedIdentitiesOperations(
63-
self._client, self._config, self._serialize, self._deserialize)
64-
self.operations = Operations(
65-
self._client, self._config, self._serialize, self._deserialize)
66-
self.user_assigned_identities = UserAssignedIdentitiesOperations(
67-
self._client, self._config, self._serialize, self._deserialize)
6860

69-
def _send_request(self, http_request, **kwargs):
70-
# type: (HttpRequest, Any) -> HttpResponse
61+
def _send_request(
62+
self,
63+
request, # type: HttpRequest
64+
**kwargs: Any
65+
) -> HttpResponse:
7166
"""Runs the network request through the client's chained policies.
7267
73-
:param http_request: The network request you want to make. Required.
74-
:type http_request: ~azure.core.pipeline.transport.HttpRequest
75-
:keyword bool stream: Whether the response payload will be streamed. Defaults to True.
68+
>>> from azure.core.rest import HttpRequest
69+
>>> request = HttpRequest("GET", "https://www.example.org/")
70+
<HttpRequest [GET], url: 'https://www.example.org/'>
71+
>>> response = client._send_request(request)
72+
<HttpResponse: 200 OK>
73+
74+
For more information on this code flow, see https://aka.ms/azsdk/python/protocol/quickstart
75+
76+
:param request: The network request you want to make. Required.
77+
:type request: ~azure.core.rest.HttpRequest
78+
:keyword bool stream: Whether the response payload will be streamed. Defaults to False.
7679
:return: The response of your network call. Does not do error handling on your response.
77-
:rtype: ~azure.core.pipeline.transport.HttpResponse
80+
:rtype: ~azure.core.rest.HttpResponse
7881
"""
79-
path_format_arguments = {
80-
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
81-
}
82-
http_request.url = self._client.format_url(http_request.url, **path_format_arguments)
83-
stream = kwargs.pop("stream", True)
84-
pipeline_response = self._client._pipeline.run(http_request, stream=stream, **kwargs)
85-
return pipeline_response.http_response
82+
83+
request_copy = deepcopy(request)
84+
request_copy.url = self._client.format_url(request_copy.url)
85+
return self._client.send_request(request_copy, **kwargs)
8686

8787
def close(self):
8888
# type: () -> None

sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_metadata.json

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"chosen_version": "2018-11-30",
3-
"total_api_version_list": ["2018-11-30"],
2+
"chosen_version": "2021-09-30-preview",
3+
"total_api_version_list": ["2021-09-30-preview"],
44
"client": {
55
"name": "ManagedServiceIdentityClient",
66
"filename": "_managed_service_identity_client",
77
"description": "The Managed Service Identity 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\": [\"ManagedServiceIdentityClientConfiguration\"]}}, \"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\": [\"ManagedServiceIdentityClientConfiguration\"]}}, \"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\": [\"ManagedServiceIdentityClientConfiguration\"]}}, \"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\": [\"ManagedServiceIdentityClientConfiguration\"]}}, \"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
"system_assigned_identities": "SystemAssignedIdentitiesOperations",
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
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# --------------------------------------------------------------------------
2+
# Copyright (c) Microsoft Corporation. All rights reserved.
3+
# Licensed under the MIT License. See License.txt in the project root for license information.
4+
# Code generated by Microsoft (R) AutoRest Code Generator.
5+
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
6+
# --------------------------------------------------------------------------
7+
8+
from azure.core.pipeline.transport import HttpRequest
9+
10+
def _convert_request(request, files=None):
11+
data = request.content if not files else None
12+
request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
13+
if files:
14+
request.set_formdata_body(files)
15+
return request
16+
17+
def _format_url_section(template, **kwargs):
18+
components = template.split("/")
19+
while components:
20+
try:
21+
return template.format(**kwargs)
22+
except KeyError as key:
23+
formatted_components = template.split("/")
24+
components = [
25+
c for c in formatted_components if "{}".format(key.args[0]) not in c
26+
]
27+
template = "/".join(components)

sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
77
# --------------------------------------------------------------------------
88

9-
VERSION = "6.0.0b1"
9+
VERSION = "6.0.0b2"

sdk/resources/azure-mgmt-msi/azure/mgmt/msi/aio/__init__.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@
88

99
from ._managed_service_identity_client import ManagedServiceIdentityClient
1010
__all__ = ['ManagedServiceIdentityClient']
11+
12+
# `._patch.py` is used for handwritten extensions to the generated code
13+
# Example: https://github.com/Azure/azure-sdk-for-python/blob/main/doc/dev/customize_code/how-to-patch-sdk-code.md
14+
from ._patch import patch_sdk
15+
patch_sdk()

0 commit comments

Comments
 (0)