Skip to content

Commit 5bec1e8

Browse files
author
SDKAuto
committed
CodeGen from PR 14316 in Azure/azure-rest-api-specs
Merge c899777caf18c11b99cc6ba71baa4a029549a43e into 683e3f4
1 parent ef0bf15 commit 5bec1e8

File tree

15 files changed

+374
-59
lines changed

15 files changed

+374
-59
lines changed
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
2-
"autorest": "3.3.0",
3-
"use": "@autorest/python@5.6.6",
4-
"commit": "5e6a5758c2bd7128984f131be88200cd4d2d1a17",
2+
"autorest": "3.4.2",
3+
"use": [
4+
"@autorest/python@5.8.0",
5+
"@autorest/modelerfour@4.19.1"
6+
],
7+
"commit": "cb6fa5be15d499a8cb83d65193f3146bee1cbd48",
58
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
6-
"autorest_command": "autorest specification/maps/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.6.6 --version=3.3.0",
9+
"autorest_command": "autorest specification/maps/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/modelerfour@4.19.1 --version=3.4.2",
710
"readme": "specification/maps/resource-manager/readme.md"
811
}

sdk/maps/azure-mgmt-maps/azure/mgmt/maps/_configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def __init__(
4848

4949
self.credential = credential
5050
self.subscription_id = subscription_id
51-
self.api_version = "2021-02-01"
51+
self.api_version = "2021-07-01-preview"
5252
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5353
kwargs.setdefault('sdk_moniker', 'mgmt-maps/{}'.format(VERSION))
5454
self._configure(**kwargs)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"chosen_version": "2021-02-01",
3-
"total_api_version_list": ["2021-02-01"],
2+
"chosen_version": "2021-07-01-preview",
3+
"total_api_version_list": ["2021-07-01-preview"],
44
"client": {
55
"name": "AzureMapsManagementClient",
66
"filename": "_azure_maps_management_client",

sdk/maps/azure-mgmt-maps/azure/mgmt/maps/_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 = "2.0.0"
9+
VERSION = "0.1.0"

sdk/maps/azure-mgmt-maps/azure/mgmt/maps/aio/_configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def __init__(
4545

4646
self.credential = credential
4747
self.subscription_id = subscription_id
48-
self.api_version = "2021-02-01"
48+
self.api_version = "2021-07-01-preview"
4949
self.credential_scopes = kwargs.pop('credential_scopes', ['https://management.azure.com/.default'])
5050
kwargs.setdefault('sdk_moniker', 'mgmt-maps/{}'.format(VERSION))
5151
self._configure(**kwargs)

sdk/maps/azure-mgmt-maps/azure/mgmt/maps/aio/operations/_accounts_operations.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ async def create_or_update(
4646
resource_group_name: str,
4747
account_name: str,
4848
maps_account: "_models.MapsAccount",
49-
**kwargs
49+
**kwargs: Any
5050
) -> "_models.MapsAccount":
5151
"""Create or update a Maps Account. A Maps Account holds the keys which allow access to the Maps
5252
REST APIs.
@@ -67,7 +67,7 @@ async def create_or_update(
6767
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
6868
}
6969
error_map.update(kwargs.pop('error_map', {}))
70-
api_version = "2021-02-01"
70+
api_version = "2021-07-01-preview"
7171
content_type = kwargs.pop("content_type", "application/json")
7272
accept = "application/json"
7373

@@ -118,7 +118,7 @@ async def update(
118118
resource_group_name: str,
119119
account_name: str,
120120
maps_account_update_parameters: "_models.MapsAccountUpdateParameters",
121-
**kwargs
121+
**kwargs: Any
122122
) -> "_models.MapsAccount":
123123
"""Updates a Maps Account. Only a subset of the parameters may be updated after creation, such as
124124
Sku, Tags, Properties.
@@ -139,7 +139,7 @@ async def update(
139139
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
140140
}
141141
error_map.update(kwargs.pop('error_map', {}))
142-
api_version = "2021-02-01"
142+
api_version = "2021-07-01-preview"
143143
content_type = kwargs.pop("content_type", "application/json")
144144
accept = "application/json"
145145

@@ -185,7 +185,7 @@ async def delete(
185185
self,
186186
resource_group_name: str,
187187
account_name: str,
188-
**kwargs
188+
**kwargs: Any
189189
) -> None:
190190
"""Delete a Maps Account.
191191
@@ -203,7 +203,7 @@ async def delete(
203203
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
204204
}
205205
error_map.update(kwargs.pop('error_map', {}))
206-
api_version = "2021-02-01"
206+
api_version = "2021-07-01-preview"
207207
accept = "application/json"
208208

209209
# Construct URL
@@ -241,7 +241,7 @@ async def get(
241241
self,
242242
resource_group_name: str,
243243
account_name: str,
244-
**kwargs
244+
**kwargs: Any
245245
) -> "_models.MapsAccount":
246246
"""Get a Maps Account.
247247
@@ -259,7 +259,7 @@ async def get(
259259
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
260260
}
261261
error_map.update(kwargs.pop('error_map', {}))
262-
api_version = "2021-02-01"
262+
api_version = "2021-07-01-preview"
263263
accept = "application/json"
264264

265265
# Construct URL
@@ -299,7 +299,7 @@ async def get(
299299
def list_by_resource_group(
300300
self,
301301
resource_group_name: str,
302-
**kwargs
302+
**kwargs: Any
303303
) -> AsyncIterable["_models.MapsAccounts"]:
304304
"""Get all Maps Accounts in a Resource Group.
305305
@@ -315,7 +315,7 @@ def list_by_resource_group(
315315
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
316316
}
317317
error_map.update(kwargs.pop('error_map', {}))
318-
api_version = "2021-02-01"
318+
api_version = "2021-07-01-preview"
319319
accept = "application/json"
320320

321321
def prepare_request(next_link=None):
@@ -369,7 +369,7 @@ async def get_next(next_link=None):
369369

370370
def list_by_subscription(
371371
self,
372-
**kwargs
372+
**kwargs: Any
373373
) -> AsyncIterable["_models.MapsAccounts"]:
374374
"""Get all Maps Accounts in a Subscription.
375375
@@ -383,7 +383,7 @@ def list_by_subscription(
383383
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
384384
}
385385
error_map.update(kwargs.pop('error_map', {}))
386-
api_version = "2021-02-01"
386+
api_version = "2021-07-01-preview"
387387
accept = "application/json"
388388

389389
def prepare_request(next_link=None):
@@ -438,7 +438,7 @@ async def list_keys(
438438
self,
439439
resource_group_name: str,
440440
account_name: str,
441-
**kwargs
441+
**kwargs: Any
442442
) -> "_models.MapsAccountKeys":
443443
"""Get the keys to use with the Maps APIs. A key is used to authenticate and authorize access to
444444
the Maps REST APIs. Only one key is needed at a time; two are given to provide seamless key
@@ -458,7 +458,7 @@ async def list_keys(
458458
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
459459
}
460460
error_map.update(kwargs.pop('error_map', {}))
461-
api_version = "2021-02-01"
461+
api_version = "2021-07-01-preview"
462462
accept = "application/json"
463463

464464
# Construct URL
@@ -500,7 +500,7 @@ async def regenerate_keys(
500500
resource_group_name: str,
501501
account_name: str,
502502
key_specification: "_models.MapsKeySpecification",
503-
**kwargs
503+
**kwargs: Any
504504
) -> "_models.MapsAccountKeys":
505505
"""Regenerate either the primary or secondary key for use with the Maps APIs. The old key will
506506
stop working immediately.
@@ -521,7 +521,7 @@ async def regenerate_keys(
521521
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
522522
}
523523
error_map.update(kwargs.pop('error_map', {}))
524-
api_version = "2021-02-01"
524+
api_version = "2021-07-01-preview"
525525
content_type = kwargs.pop("content_type", "application/json")
526526
accept = "application/json"
527527

sdk/maps/azure-mgmt-maps/azure/mgmt/maps/aio/operations/_creators_operations.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def list_by_account(
4545
self,
4646
resource_group_name: str,
4747
account_name: str,
48-
**kwargs
48+
**kwargs: Any
4949
) -> AsyncIterable["_models.CreatorList"]:
5050
"""Get all Creator instances for an Azure Maps Account.
5151
@@ -63,7 +63,7 @@ def list_by_account(
6363
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
6464
}
6565
error_map.update(kwargs.pop('error_map', {}))
66-
api_version = "2021-02-01"
66+
api_version = "2021-07-01-preview"
6767
accept = "application/json"
6868

6969
def prepare_request(next_link=None):
@@ -122,7 +122,7 @@ async def create_or_update(
122122
account_name: str,
123123
creator_name: str,
124124
creator_resource: "_models.Creator",
125-
**kwargs
125+
**kwargs: Any
126126
) -> "_models.Creator":
127127
"""Create or update a Maps Creator resource. Creator resource will manage Azure resources required
128128
to populate a custom set of mapping data. It requires an account to exist before it can be
@@ -146,7 +146,7 @@ async def create_or_update(
146146
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
147147
}
148148
error_map.update(kwargs.pop('error_map', {}))
149-
api_version = "2021-02-01"
149+
api_version = "2021-07-01-preview"
150150
content_type = kwargs.pop("content_type", "application/json")
151151
accept = "application/json"
152152

@@ -199,7 +199,7 @@ async def update(
199199
account_name: str,
200200
creator_name: str,
201201
creator_update_parameters: "_models.CreatorUpdateParameters",
202-
**kwargs
202+
**kwargs: Any
203203
) -> "_models.Creator":
204204
"""Updates the Maps Creator resource. Only a subset of the parameters may be updated after
205205
creation, such as Tags.
@@ -222,7 +222,7 @@ async def update(
222222
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
223223
}
224224
error_map.update(kwargs.pop('error_map', {}))
225-
api_version = "2021-02-01"
225+
api_version = "2021-07-01-preview"
226226
content_type = kwargs.pop("content_type", "application/json")
227227
accept = "application/json"
228228

@@ -270,7 +270,7 @@ async def delete(
270270
resource_group_name: str,
271271
account_name: str,
272272
creator_name: str,
273-
**kwargs
273+
**kwargs: Any
274274
) -> None:
275275
"""Delete a Maps Creator resource.
276276
@@ -290,7 +290,7 @@ async def delete(
290290
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
291291
}
292292
error_map.update(kwargs.pop('error_map', {}))
293-
api_version = "2021-02-01"
293+
api_version = "2021-07-01-preview"
294294
accept = "application/json"
295295

296296
# Construct URL
@@ -330,7 +330,7 @@ async def get(
330330
resource_group_name: str,
331331
account_name: str,
332332
creator_name: str,
333-
**kwargs
333+
**kwargs: Any
334334
) -> "_models.Creator":
335335
"""Get a Maps Creator resource.
336336
@@ -350,7 +350,7 @@ async def get(
350350
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
351351
}
352352
error_map.update(kwargs.pop('error_map', {}))
353-
api_version = "2021-02-01"
353+
api_version = "2021-07-01-preview"
354354
accept = "application/json"
355355

356356
# Construct URL

sdk/maps/azure-mgmt-maps/azure/mgmt/maps/aio/operations/_maps_operations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def __init__(self, client, config, serializer, deserializer) -> None:
4343

4444
def list_operations(
4545
self,
46-
**kwargs
46+
**kwargs: Any
4747
) -> AsyncIterable["_models.MapsOperations"]:
4848
"""List operations available for the Maps Resource Provider.
4949
@@ -57,7 +57,7 @@ def list_operations(
5757
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
5858
}
5959
error_map.update(kwargs.pop('error_map', {}))
60-
api_version = "2021-02-01"
60+
api_version = "2021-07-01-preview"
6161
accept = "application/json"
6262

6363
def prepare_request(next_link=None):

sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/__init__.py

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

99
try:
10+
from ._models_py3 import Components1Jq1T4ISchemasManagedserviceidentityPropertiesUserassignedidentitiesAdditionalproperties
1011
from ._models_py3 import Creator
1112
from ._models_py3 import CreatorList
1213
from ._models_py3 import CreatorProperties
@@ -15,6 +16,8 @@
1516
from ._models_py3 import ErrorAdditionalInfo
1617
from ._models_py3 import ErrorDetail
1718
from ._models_py3 import ErrorResponse
19+
from ._models_py3 import LinkedResource
20+
from ._models_py3 import ManagedServiceIdentity
1821
from ._models_py3 import MapsAccount
1922
from ._models_py3 import MapsAccountKeys
2023
from ._models_py3 import MapsAccountProperties
@@ -31,6 +34,7 @@
3134
from ._models_py3 import SystemData
3235
from ._models_py3 import TrackedResource
3336
except (SyntaxError, ImportError):
37+
from ._models import Components1Jq1T4ISchemasManagedserviceidentityPropertiesUserassignedidentitiesAdditionalproperties # type: ignore
3438
from ._models import Creator # type: ignore
3539
from ._models import CreatorList # type: ignore
3640
from ._models import CreatorProperties # type: ignore
@@ -39,6 +43,8 @@
3943
from ._models import ErrorAdditionalInfo # type: ignore
4044
from ._models import ErrorDetail # type: ignore
4145
from ._models import ErrorResponse # type: ignore
46+
from ._models import LinkedResource # type: ignore
47+
from ._models import ManagedServiceIdentity # type: ignore
4248
from ._models import MapsAccount # type: ignore
4349
from ._models import MapsAccountKeys # type: ignore
4450
from ._models import MapsAccountProperties # type: ignore
@@ -60,9 +66,11 @@
6066
KeyType,
6167
Kind,
6268
Name,
69+
ResourceIdentityType,
6370
)
6471

6572
__all__ = [
73+
'Components1Jq1T4ISchemasManagedserviceidentityPropertiesUserassignedidentitiesAdditionalproperties',
6674
'Creator',
6775
'CreatorList',
6876
'CreatorProperties',
@@ -71,6 +79,8 @@
7179
'ErrorAdditionalInfo',
7280
'ErrorDetail',
7381
'ErrorResponse',
82+
'LinkedResource',
83+
'ManagedServiceIdentity',
7484
'MapsAccount',
7585
'MapsAccountKeys',
7686
'MapsAccountProperties',
@@ -90,4 +100,5 @@
90100
'KeyType',
91101
'Kind',
92102
'Name',
103+
'ResourceIdentityType',
93104
]

sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/_azure_maps_management_client_enums.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,12 @@ class Name(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
5656
S0 = "S0"
5757
S1 = "S1"
5858
G2 = "G2"
59+
60+
class ResourceIdentityType(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
61+
"""The identity type.
62+
"""
63+
64+
SYSTEM_ASSIGNED = "SystemAssigned"
65+
USER_ASSIGNED = "UserAssigned"
66+
SYSTEM_ASSIGNED_USER_ASSIGNED = "SystemAssigned, UserAssigned"
67+
NONE = "None"

0 commit comments

Comments
 (0)