Skip to content

Commit 7ec5c5e

Browse files
author
SDKAuto
committed
CodeGen from PR 18850 in Azure/azure-rest-api-specs
Merge 57f31c2186db2531a6ab739f6fc482ea61f7f485 into ea9af04161c73743cdb40c1439a3046f16f35f71
1 parent 53f6617 commit 7ec5c5e

37 files changed

+3481
-172
lines changed

‎sdk/resources/azure-mgmt-msi/_meta.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"autorest": "3.7.2",
33
"use": [
4-
"@autorest/python@5.12.0",
4+
"@autorest/python@5.13.0",
55
"@autorest/modelerfour@4.19.3"
66
],
7-
"commit": "3026119ab41bbce77275cfa3a1afbabf43af5aea",
7+
"commit": "44c855cc0a7e63e726e5bfbabbb911000d7c3fd7",
88
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
9-
"autorest_command": "autorest specification/msi/resource-manager/readme.md --multiapi --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --python3-only --use=@autorest/python@5.12.0 --use=@autorest/modelerfour@4.19.3 --version=3.7.2",
9+
"autorest_command": "autorest specification/msi/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/modelerfour@4.19.3 --version=3.7.2",
1010
"readme": "specification/msi/resource-manager/readme.md"
1111
}

‎sdk/resources/azure-mgmt-msi/azure/mgmt/msi/_managed_service_identity_client.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
from typing import TYPE_CHECKING
1313

14+
from msrest import Deserializer, Serializer
15+
1416
from azure.mgmt.core import ARMPipelineClient
1517
from azure.profiles import KnownProfiles, ProfileDefinition
1618
from azure.profiles.multiapiclient import MultiApiClientMixin
17-
from msrest import Deserializer, Serializer
1819

1920
from ._configuration import ManagedServiceIdentityClientConfiguration
2021

@@ -88,13 +89,13 @@ def models(cls, api_version=DEFAULT_API_VERSION):
8889
"""Module depends on the API version:
8990
9091
* 2018-11-30: :mod:`v2018_11_30.models<azure.mgmt.msi.v2018_11_30.models>`
91-
* 2021-09-30-preview: :mod:`v2019_09_01_preview.models<azure.mgmt.msi.v2019_09_01_preview.models>`
92+
* 2021-09-30-preview: :mod:`v2021_09_30_preview.models<azure.mgmt.msi.v2021_09_30_preview.models>`
9293
"""
9394
if api_version == '2018-11-30':
9495
from .v2018_11_30 import models
9596
return models
9697
elif api_version == '2021-09-30-preview':
97-
from .v2019_09_01_preview import models
98+
from .v2021_09_30_preview import models
9899
return models
99100
raise ValueError("API version {} is not available".format(api_version))
100101

@@ -103,13 +104,13 @@ def operations(self):
103104
"""Instance depends on the API version:
104105
105106
* 2018-11-30: :class:`Operations<azure.mgmt.msi.v2018_11_30.operations.Operations>`
106-
* 2021-09-30-preview: :class:`Operations<azure.mgmt.msi.v2019_09_01_preview.operations.Operations>`
107+
* 2021-09-30-preview: :class:`Operations<azure.mgmt.msi.v2021_09_30_preview.operations.Operations>`
107108
"""
108109
api_version = self._get_api_version('operations')
109110
if api_version == '2018-11-30':
110111
from .v2018_11_30.operations import Operations as OperationClass
111112
elif api_version == '2021-09-30-preview':
112-
from .v2019_09_01_preview.operations import Operations as OperationClass
113+
from .v2021_09_30_preview.operations import Operations as OperationClass
113114
else:
114115
raise ValueError("API version {} does not have operation group 'operations'".format(api_version))
115116
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -119,13 +120,13 @@ def system_assigned_identities(self):
119120
"""Instance depends on the API version:
120121
121122
* 2018-11-30: :class:`SystemAssignedIdentitiesOperations<azure.mgmt.msi.v2018_11_30.operations.SystemAssignedIdentitiesOperations>`
122-
* 2021-09-30-preview: :class:`SystemAssignedIdentitiesOperations<azure.mgmt.msi.v2019_09_01_preview.operations.SystemAssignedIdentitiesOperations>`
123+
* 2021-09-30-preview: :class:`SystemAssignedIdentitiesOperations<azure.mgmt.msi.v2021_09_30_preview.operations.SystemAssignedIdentitiesOperations>`
123124
"""
124125
api_version = self._get_api_version('system_assigned_identities')
125126
if api_version == '2018-11-30':
126127
from .v2018_11_30.operations import SystemAssignedIdentitiesOperations as OperationClass
127128
elif api_version == '2021-09-30-preview':
128-
from .v2019_09_01_preview.operations import SystemAssignedIdentitiesOperations as OperationClass
129+
from .v2021_09_30_preview.operations import SystemAssignedIdentitiesOperations as OperationClass
129130
else:
130131
raise ValueError("API version {} does not have operation group 'system_assigned_identities'".format(api_version))
131132
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -135,13 +136,13 @@ def user_assigned_identities(self):
135136
"""Instance depends on the API version:
136137
137138
* 2018-11-30: :class:`UserAssignedIdentitiesOperations<azure.mgmt.msi.v2018_11_30.operations.UserAssignedIdentitiesOperations>`
138-
* 2021-09-30-preview: :class:`UserAssignedIdentitiesOperations<azure.mgmt.msi.v2019_09_01_preview.operations.UserAssignedIdentitiesOperations>`
139+
* 2021-09-30-preview: :class:`UserAssignedIdentitiesOperations<azure.mgmt.msi.v2021_09_30_preview.operations.UserAssignedIdentitiesOperations>`
139140
"""
140141
api_version = self._get_api_version('user_assigned_identities')
141142
if api_version == '2018-11-30':
142143
from .v2018_11_30.operations import UserAssignedIdentitiesOperations as OperationClass
143144
elif api_version == '2021-09-30-preview':
144-
from .v2019_09_01_preview.operations import UserAssignedIdentitiesOperations as OperationClass
145+
from .v2021_09_30_preview.operations import UserAssignedIdentitiesOperations as OperationClass
145146
else:
146147
raise ValueError("API version {} does not have operation group 'user_assigned_identities'".format(api_version))
147148
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

‎sdk/resources/azure-mgmt-msi/azure/mgmt/msi/aio/_managed_service_identity_client.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111

1212
from typing import Any, Optional, TYPE_CHECKING
1313

14+
from msrest import Deserializer, Serializer
15+
1416
from azure.mgmt.core import AsyncARMPipelineClient
1517
from azure.profiles import KnownProfiles, ProfileDefinition
1618
from azure.profiles.multiapiclient import MultiApiClientMixin
17-
from msrest import Deserializer, Serializer
1819

1920
from ._configuration import ManagedServiceIdentityClientConfiguration
2021

@@ -87,13 +88,13 @@ def models(cls, api_version=DEFAULT_API_VERSION):
8788
"""Module depends on the API version:
8889
8990
* 2018-11-30: :mod:`v2018_11_30.models<azure.mgmt.msi.v2018_11_30.models>`
90-
* 2021-09-30-preview: :mod:`v2019_09_01_preview.models<azure.mgmt.msi.v2019_09_01_preview.models>`
91+
* 2021-09-30-preview: :mod:`v2021_09_30_preview.models<azure.mgmt.msi.v2021_09_30_preview.models>`
9192
"""
9293
if api_version == '2018-11-30':
9394
from ..v2018_11_30 import models
9495
return models
9596
elif api_version == '2021-09-30-preview':
96-
from ..v2019_09_01_preview import models
97+
from ..v2021_09_30_preview import models
9798
return models
9899
raise ValueError("API version {} is not available".format(api_version))
99100

@@ -102,13 +103,13 @@ def operations(self):
102103
"""Instance depends on the API version:
103104
104105
* 2018-11-30: :class:`Operations<azure.mgmt.msi.v2018_11_30.aio.operations.Operations>`
105-
* 2021-09-30-preview: :class:`Operations<azure.mgmt.msi.v2019_09_01_preview.aio.operations.Operations>`
106+
* 2021-09-30-preview: :class:`Operations<azure.mgmt.msi.v2021_09_30_preview.aio.operations.Operations>`
106107
"""
107108
api_version = self._get_api_version('operations')
108109
if api_version == '2018-11-30':
109110
from ..v2018_11_30.aio.operations import Operations as OperationClass
110111
elif api_version == '2021-09-30-preview':
111-
from ..v2019_09_01_preview.aio.operations import Operations as OperationClass
112+
from ..v2021_09_30_preview.aio.operations import Operations as OperationClass
112113
else:
113114
raise ValueError("API version {} does not have operation group 'operations'".format(api_version))
114115
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -118,13 +119,13 @@ def system_assigned_identities(self):
118119
"""Instance depends on the API version:
119120
120121
* 2018-11-30: :class:`SystemAssignedIdentitiesOperations<azure.mgmt.msi.v2018_11_30.aio.operations.SystemAssignedIdentitiesOperations>`
121-
* 2021-09-30-preview: :class:`SystemAssignedIdentitiesOperations<azure.mgmt.msi.v2019_09_01_preview.aio.operations.SystemAssignedIdentitiesOperations>`
122+
* 2021-09-30-preview: :class:`SystemAssignedIdentitiesOperations<azure.mgmt.msi.v2021_09_30_preview.aio.operations.SystemAssignedIdentitiesOperations>`
122123
"""
123124
api_version = self._get_api_version('system_assigned_identities')
124125
if api_version == '2018-11-30':
125126
from ..v2018_11_30.aio.operations import SystemAssignedIdentitiesOperations as OperationClass
126127
elif api_version == '2021-09-30-preview':
127-
from ..v2019_09_01_preview.aio.operations import SystemAssignedIdentitiesOperations as OperationClass
128+
from ..v2021_09_30_preview.aio.operations import SystemAssignedIdentitiesOperations as OperationClass
128129
else:
129130
raise ValueError("API version {} does not have operation group 'system_assigned_identities'".format(api_version))
130131
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -134,13 +135,13 @@ def user_assigned_identities(self):
134135
"""Instance depends on the API version:
135136
136137
* 2018-11-30: :class:`UserAssignedIdentitiesOperations<azure.mgmt.msi.v2018_11_30.aio.operations.UserAssignedIdentitiesOperations>`
137-
* 2021-09-30-preview: :class:`UserAssignedIdentitiesOperations<azure.mgmt.msi.v2019_09_01_preview.aio.operations.UserAssignedIdentitiesOperations>`
138+
* 2021-09-30-preview: :class:`UserAssignedIdentitiesOperations<azure.mgmt.msi.v2021_09_30_preview.aio.operations.UserAssignedIdentitiesOperations>`
138139
"""
139140
api_version = self._get_api_version('user_assigned_identities')
140141
if api_version == '2018-11-30':
141142
from ..v2018_11_30.aio.operations import UserAssignedIdentitiesOperations as OperationClass
142143
elif api_version == '2021-09-30-preview':
143-
from ..v2019_09_01_preview.aio.operations import UserAssignedIdentitiesOperations as OperationClass
144+
from ..v2021_09_30_preview.aio.operations import UserAssignedIdentitiesOperations as OperationClass
144145
else:
145146
raise ValueError("API version {} does not have operation group 'user_assigned_identities'".format(api_version))
146147
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

‎sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_configuration.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from azure.core.credentials import TokenCredential
2020

2121

22-
class ManagedServiceIdentityClientConfiguration(Configuration):
22+
class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
2323
"""Configuration for ManagedServiceIdentityClient.
2424
2525
Note that all parameters used to create this instance are saved as instance
@@ -29,6 +29,9 @@ class ManagedServiceIdentityClientConfiguration(Configuration):
2929
:type credential: ~azure.core.credentials.TokenCredential
3030
:param subscription_id: The Id of the Subscription to which the identity belongs.
3131
:type subscription_id: str
32+
:keyword api_version: Api Version. Default value is "2018-11-30". Note that overriding this
33+
default value may result in unsupported behavior.
34+
:paramtype api_version: str
3235
"""
3336

3437
def __init__(
@@ -38,14 +41,16 @@ def __init__(
3841
**kwargs: Any
3942
) -> None:
4043
super(ManagedServiceIdentityClientConfiguration, self).__init__(**kwargs)
44+
api_version = kwargs.pop('api_version', "2018-11-30") # type: str
45+
4146
if credential is None:
4247
raise ValueError("Parameter 'credential' must not be None.")
4348
if subscription_id is None:
4449
raise ValueError("Parameter 'subscription_id' must not be None.")
4550

4651
self.credential = credential
4752
self.subscription_id = subscription_id
48-
self.api_version = "2018-11-30"
53+
self.api_version = api_version
4954
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5055
kwargs.setdefault('sdk_moniker', 'mgmt-msi/{}'.format(VERSION))
5156
self._configure(**kwargs)

‎sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_managed_service_identity_client.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
# --------------------------------------------------------------------------
88

99
from copy import deepcopy
10-
from typing import Any, Optional, TYPE_CHECKING
10+
from typing import Any, TYPE_CHECKING
11+
12+
from msrest import Deserializer, Serializer
1113

1214
from azure.core.rest import HttpRequest, HttpResponse
1315
from azure.mgmt.core import ARMPipelineClient
14-
from msrest import Deserializer, Serializer
1516

1617
from . import models
1718
from ._configuration import ManagedServiceIdentityClientConfiguration
@@ -36,8 +37,11 @@ class ManagedServiceIdentityClient:
3637
:type credential: ~azure.core.credentials.TokenCredential
3738
:param subscription_id: The Id of the Subscription to which the identity belongs.
3839
:type subscription_id: str
39-
:param base_url: Service URL. Default value is 'https://management.azure.com'.
40+
:param base_url: Service URL. Default value is "https://management.azure.com".
4041
:type base_url: str
42+
:keyword api_version: Api Version. Default value is "2018-11-30". Note that overriding this
43+
default value may result in unsupported behavior.
44+
:paramtype api_version: str
4145
"""
4246

4347
def __init__(
@@ -61,7 +65,7 @@ def __init__(
6165

6266
def _send_request(
6367
self,
64-
request, # type: HttpRequest
68+
request: HttpRequest,
6569
**kwargs: Any
6670
) -> HttpResponse:
6771
"""Runs the network request through the client's chained policies.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
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\"]}}}",
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\"]}}}"
13+
"sync_imports": "{\"typing\": {\"azurecore\": {\"azure.core.credentials\": [\"TokenCredential\"]}}, \"regular\": {\"azurecore\": {\"azure.profiles\": [\"KnownProfiles\", \"ProfileDefinition\"], \"azure.profiles.multiapiclient\": [\"MultiApiClientMixin\"], \"azure.mgmt.core\": [\"ARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"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\"], \"azure.mgmt.core\": [\"AsyncARMPipelineClient\"]}, \"local\": {\"._configuration\": [\"ManagedServiceIdentityClientConfiguration\"]}, \"thirdparty\": {\"msrest\": [\"Deserializer\", \"Serializer\"]}}, \"conditional\": {\"stdlib\": {\"typing\": [\"Any\", \"Optional\"]}}}"
1515
},
1616
"global_parameters": {
1717
"sync": {

‎sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/_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.0"
9+
VERSION = "1.0.0b1"

‎sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_configuration.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from azure.core.credentials_async import AsyncTokenCredential
2020

2121

22-
class ManagedServiceIdentityClientConfiguration(Configuration):
22+
class ManagedServiceIdentityClientConfiguration(Configuration): # pylint: disable=too-many-instance-attributes
2323
"""Configuration for ManagedServiceIdentityClient.
2424
2525
Note that all parameters used to create this instance are saved as instance
@@ -29,6 +29,9 @@ class ManagedServiceIdentityClientConfiguration(Configuration):
2929
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
3030
:param subscription_id: The Id of the Subscription to which the identity belongs.
3131
:type subscription_id: str
32+
:keyword api_version: Api Version. Default value is "2018-11-30". Note that overriding this
33+
default value may result in unsupported behavior.
34+
:paramtype api_version: str
3235
"""
3336

3437
def __init__(
@@ -38,14 +41,16 @@ def __init__(
3841
**kwargs: Any
3942
) -> None:
4043
super(ManagedServiceIdentityClientConfiguration, self).__init__(**kwargs)
44+
api_version = kwargs.pop('api_version', "2018-11-30") # type: str
45+
4146
if credential is None:
4247
raise ValueError("Parameter 'credential' must not be None.")
4348
if subscription_id is None:
4449
raise ValueError("Parameter 'subscription_id' must not be None.")
4550

4651
self.credential = credential
4752
self.subscription_id = subscription_id
48-
self.api_version = "2018-11-30"
53+
self.api_version = api_version
4954
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5055
kwargs.setdefault('sdk_moniker', 'mgmt-msi/{}'.format(VERSION))
5156
self._configure(**kwargs)

‎sdk/resources/azure-mgmt-msi/azure/mgmt/msi/v2018_11_30/aio/_managed_service_identity_client.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
# --------------------------------------------------------------------------
88

99
from copy import deepcopy
10-
from typing import Any, Awaitable, Optional, TYPE_CHECKING
10+
from typing import Any, Awaitable, TYPE_CHECKING
11+
12+
from msrest import Deserializer, Serializer
1113

1214
from azure.core.rest import AsyncHttpResponse, HttpRequest
1315
from azure.mgmt.core import AsyncARMPipelineClient
14-
from msrest import Deserializer, Serializer
1516

1617
from .. import models
1718
from ._configuration import ManagedServiceIdentityClientConfiguration
@@ -36,8 +37,11 @@ class ManagedServiceIdentityClient:
3637
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
3738
:param subscription_id: The Id of the Subscription to which the identity belongs.
3839
:type subscription_id: str
39-
:param base_url: Service URL. Default value is 'https://management.azure.com'.
40+
:param base_url: Service URL. Default value is "https://management.azure.com".
4041
:type base_url: str
42+
:keyword api_version: Api Version. Default value is "2018-11-30". Note that overriding this
43+
default value may result in unsupported behavior.
44+
:paramtype api_version: str
4145
"""
4246

4347
def __init__(

0 commit comments

Comments
 (0)