Skip to content

Commit eff1990

Browse files
SDKAutomsyyc
andcommitted
CodeGen from PR 15284 in Azure/azure-rest-api-specs
Containerregistry maps datamigration t1 del (Azure#15284) * sql t2 readme config * readme config * Update readme.python.md * conflient resolve * t1 del Co-authored-by: msyyc <[email protected]>
1 parent 64128ba commit eff1990

File tree

15 files changed

+398
-83
lines changed

15 files changed

+398
-83
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/[email protected]",
4-
"commit": "5e6a5758c2bd7128984f131be88200cd4d2d1a17",
2+
"autorest": "3.4.5",
3+
"use": [
4+
"@autorest/[email protected]",
5+
"@autorest/[email protected]"
6+
],
7+
"commit": "2a8442856438f3c78b7150f4a32270c03fc99d43",
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.4 --use=@autorest/[email protected] --version=3.4.5",
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 = "1.0.0b1"

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: 23 additions & 23 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,15 +67,15 @@ 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

7474
# Construct URL
7575
url = self.create_or_update.metadata['url'] # type: ignore
7676
path_format_arguments = {
7777
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
78-
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
78+
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1),
7979
'accountName': self._serialize.url("account_name", account_name, 'str'),
8080
}
8181
url = self._client.format_url(url, **path_format_arguments)
@@ -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,15 +139,15 @@ 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

146146
# Construct URL
147147
url = self.update.metadata['url'] # type: ignore
148148
path_format_arguments = {
149149
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
150-
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
150+
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1),
151151
'accountName': self._serialize.url("account_name", account_name, 'str'),
152152
}
153153
url = self._client.format_url(url, **path_format_arguments)
@@ -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,14 +203,14 @@ 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
210210
url = self.delete.metadata['url'] # type: ignore
211211
path_format_arguments = {
212212
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
213-
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
213+
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1),
214214
'accountName': self._serialize.url("account_name", account_name, 'str'),
215215
}
216216
url = self._client.format_url(url, **path_format_arguments)
@@ -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,14 +259,14 @@ 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
266266
url = self.get.metadata['url'] # type: ignore
267267
path_format_arguments = {
268268
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
269-
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
269+
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1),
270270
'accountName': self._serialize.url("account_name", account_name, 'str'),
271271
}
272272
url = self._client.format_url(url, **path_format_arguments)
@@ -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):
@@ -328,7 +328,7 @@ def prepare_request(next_link=None):
328328
url = self.list_by_resource_group.metadata['url'] # type: ignore
329329
path_format_arguments = {
330330
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
331-
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
331+
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1),
332332
}
333333
url = self._client.format_url(url, **path_format_arguments)
334334
# Construct parameters
@@ -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,14 +458,14 @@ 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
465465
url = self.list_keys.metadata['url'] # type: ignore
466466
path_format_arguments = {
467467
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
468-
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
468+
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1),
469469
'accountName': self._serialize.url("account_name", account_name, 'str'),
470470
}
471471
url = self._client.format_url(url, **path_format_arguments)
@@ -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,15 +521,15 @@ 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

528528
# Construct URL
529529
url = self.regenerate_keys.metadata['url'] # type: ignore
530530
path_format_arguments = {
531531
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
532-
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
532+
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1),
533533
'accountName': self._serialize.url("account_name", account_name, 'str'),
534534
}
535535
url = self._client.format_url(url, **path_format_arguments)

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

Lines changed: 15 additions & 15 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):
@@ -76,7 +76,7 @@ def prepare_request(next_link=None):
7676
url = self.list_by_account.metadata['url'] # type: ignore
7777
path_format_arguments = {
7878
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
79-
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
79+
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1),
8080
'accountName': self._serialize.url("account_name", account_name, 'str'),
8181
}
8282
url = self._client.format_url(url, **path_format_arguments)
@@ -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,15 +146,15 @@ 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

153153
# Construct URL
154154
url = self.create_or_update.metadata['url'] # type: ignore
155155
path_format_arguments = {
156156
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
157-
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
157+
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1),
158158
'accountName': self._serialize.url("account_name", account_name, 'str'),
159159
'creatorName': self._serialize.url("creator_name", creator_name, 'str'),
160160
}
@@ -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,15 +222,15 @@ 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

229229
# Construct URL
230230
url = self.update.metadata['url'] # type: ignore
231231
path_format_arguments = {
232232
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
233-
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
233+
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1),
234234
'accountName': self._serialize.url("account_name", account_name, 'str'),
235235
'creatorName': self._serialize.url("creator_name", creator_name, 'str'),
236236
}
@@ -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,14 +290,14 @@ 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
297297
url = self.delete.metadata['url'] # type: ignore
298298
path_format_arguments = {
299299
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
300-
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
300+
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1),
301301
'accountName': self._serialize.url("account_name", account_name, 'str'),
302302
'creatorName': self._serialize.url("creator_name", creator_name, 'str'),
303303
}
@@ -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,14 +350,14 @@ 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
357357
url = self.get.metadata['url'] # type: ignore
358358
path_format_arguments = {
359359
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str', min_length=1),
360-
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
360+
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1),
361361
'accountName': self._serialize.url("account_name", account_name, 'str'),
362362
'creatorName': self._serialize.url("creator_name", creator_name, 'str'),
363363
}

0 commit comments

Comments
 (0)