Skip to content

Commit 02e17b7

Browse files
lmazuellmazuel
authored
KV moved paging return type to ItemPaged (Azure#6558)
* KV with latest autorest * Make KV return ItemPaged from azure-core
1 parent 95220b7 commit 02e17b7

File tree

24 files changed

+498
-242
lines changed

24 files changed

+498
-242
lines changed

‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_client.py

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,12 @@ def list_deleted_keys(self, **kwargs):
353353
:dedent: 8
354354
"""
355355
max_page_size = kwargs.get("max_page_size", None)
356-
pages = self._client.get_deleted_keys(self._vault_url, maxresults=max_page_size, **kwargs)
357-
return (DeletedKey._from_deleted_key_item(item) for item in pages)
356+
return self._client.get_deleted_keys(
357+
self._vault_url,
358+
maxresults=max_page_size,
359+
cls=lambda objs: [DeletedKey._from_deleted_key_item(x) for x in objs],
360+
**kwargs
361+
)
358362

359363
@distributed_trace
360364
def list_keys(self, **kwargs):
@@ -381,8 +385,12 @@ def list_keys(self, **kwargs):
381385
:dedent: 8
382386
"""
383387
max_page_size = kwargs.get("max_page_size", None)
384-
pages = self._client.get_keys(self._vault_url, maxresults=max_page_size, **kwargs)
385-
return (KeyBase._from_key_item(item) for item in pages)
388+
return self._client.get_keys(
389+
self._vault_url,
390+
maxresults=max_page_size,
391+
cls=lambda objs: [KeyBase._from_key_item(x) for x in objs],
392+
**kwargs
393+
)
386394

387395
@distributed_trace
388396
def list_key_versions(self, name, **kwargs):
@@ -407,8 +415,13 @@ def list_key_versions(self, name, **kwargs):
407415
:dedent: 8
408416
"""
409417
max_page_size = kwargs.get("max_page_size", None)
410-
pages = self._client.get_key_versions(self._vault_url, name, maxresults=max_page_size, **kwargs)
411-
return (KeyBase._from_key_item(item) for item in pages)
418+
return self._client.get_key_versions(
419+
self._vault_url,
420+
name,
421+
maxresults=max_page_size,
422+
cls=lambda objs: [KeyBase._from_key_item(x) for x in objs],
423+
**kwargs
424+
)
412425

413426
@distributed_trace
414427
def purge_deleted_key(self, name, **kwargs):

‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ def parse_vault_id(url):
4949

5050
try:
5151
from .async_challenge_auth_policy import AsyncChallengeAuthPolicy
52-
from .async_client_base import AsyncKeyVaultClientBase, AsyncPagingAdapter
52+
from .async_client_base import AsyncKeyVaultClientBase
5353

54-
__all__.extend(["AsyncChallengeAuthPolicy", "AsyncKeyVaultClientBase", "AsyncPagingAdapter"])
54+
__all__.extend(["AsyncChallengeAuthPolicy", "AsyncKeyVaultClientBase"])
5555
except (SyntaxError, ImportError):
5656
pass

‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/aio/operations_async/_key_vault_client_operations_async.py

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,10 @@ def prepare_request(next_link=None):
423423

424424
async def extract_data_async(response):
425425
deserialized = self._deserialize('KeyListResult', response)
426-
return deserialized.next_link, AsyncList(deserialized.value)
426+
list_of_elem = deserialized.value
427+
if cls:
428+
list_of_elem = cls(list_of_elem)
429+
return deserialized.next_link, AsyncList(list_of_elem)
427430

428431
async def get_next_async(next_link=None):
429432
request = prepare_request(next_link)
@@ -494,7 +497,10 @@ def prepare_request(next_link=None):
494497

495498
async def extract_data_async(response):
496499
deserialized = self._deserialize('KeyListResult', response)
497-
return deserialized.next_link, AsyncList(deserialized.value)
500+
list_of_elem = deserialized.value
501+
if cls:
502+
list_of_elem = cls(list_of_elem)
503+
return deserialized.next_link, AsyncList(list_of_elem)
498504

499505
async def get_next_async(next_link=None):
500506
request = prepare_request(next_link)
@@ -1174,7 +1180,10 @@ def prepare_request(next_link=None):
11741180

11751181
async def extract_data_async(response):
11761182
deserialized = self._deserialize('DeletedKeyListResult', response)
1177-
return deserialized.next_link, AsyncList(deserialized.value)
1183+
list_of_elem = deserialized.value
1184+
if cls:
1185+
list_of_elem = cls(list_of_elem)
1186+
return deserialized.next_link, AsyncList(list_of_elem)
11781187

11791188
async def get_next_async(next_link=None):
11801189
request = prepare_request(next_link)
@@ -1678,7 +1687,10 @@ def prepare_request(next_link=None):
16781687

16791688
async def extract_data_async(response):
16801689
deserialized = self._deserialize('SecretListResult', response)
1681-
return deserialized.next_link, AsyncList(deserialized.value)
1690+
list_of_elem = deserialized.value
1691+
if cls:
1692+
list_of_elem = cls(list_of_elem)
1693+
return deserialized.next_link, AsyncList(list_of_elem)
16821694

16831695
async def get_next_async(next_link=None):
16841696
request = prepare_request(next_link)
@@ -1749,7 +1761,10 @@ def prepare_request(next_link=None):
17491761

17501762
async def extract_data_async(response):
17511763
deserialized = self._deserialize('SecretListResult', response)
1752-
return deserialized.next_link, AsyncList(deserialized.value)
1764+
list_of_elem = deserialized.value
1765+
if cls:
1766+
list_of_elem = cls(list_of_elem)
1767+
return deserialized.next_link, AsyncList(list_of_elem)
17531768

17541769
async def get_next_async(next_link=None):
17551770
request = prepare_request(next_link)
@@ -1817,7 +1832,10 @@ def prepare_request(next_link=None):
18171832

18181833
async def extract_data_async(response):
18191834
deserialized = self._deserialize('DeletedSecretListResult', response)
1820-
return deserialized.next_link, AsyncList(deserialized.value)
1835+
list_of_elem = deserialized.value
1836+
if cls:
1837+
list_of_elem = cls(list_of_elem)
1838+
return deserialized.next_link, AsyncList(list_of_elem)
18211839

18221840
async def get_next_async(next_link=None):
18231841
request = prepare_request(next_link)
@@ -2170,7 +2188,10 @@ def prepare_request(next_link=None):
21702188

21712189
async def extract_data_async(response):
21722190
deserialized = self._deserialize('CertificateListResult', response)
2173-
return deserialized.next_link, AsyncList(deserialized.value)
2191+
list_of_elem = deserialized.value
2192+
if cls:
2193+
list_of_elem = cls(list_of_elem)
2194+
return deserialized.next_link, AsyncList(list_of_elem)
21742195

21752196
async def get_next_async(next_link=None):
21762197
request = prepare_request(next_link)
@@ -2464,7 +2485,10 @@ def prepare_request(next_link=None):
24642485

24652486
async def extract_data_async(response):
24662487
deserialized = self._deserialize('CertificateIssuerListResult', response)
2467-
return deserialized.next_link, AsyncList(deserialized.value)
2488+
list_of_elem = deserialized.value
2489+
if cls:
2490+
list_of_elem = cls(list_of_elem)
2491+
return deserialized.next_link, AsyncList(list_of_elem)
24682492

24692493
async def get_next_async(next_link=None):
24702494
request = prepare_request(next_link)
@@ -2951,7 +2975,10 @@ def prepare_request(next_link=None):
29512975

29522976
async def extract_data_async(response):
29532977
deserialized = self._deserialize('CertificateListResult', response)
2954-
return deserialized.next_link, AsyncList(deserialized.value)
2978+
list_of_elem = deserialized.value
2979+
if cls:
2980+
list_of_elem = cls(list_of_elem)
2981+
return deserialized.next_link, AsyncList(list_of_elem)
29552982

29562983
async def get_next_async(next_link=None):
29572984
request = prepare_request(next_link)
@@ -3533,7 +3560,10 @@ def prepare_request(next_link=None):
35333560

35343561
async def extract_data_async(response):
35353562
deserialized = self._deserialize('DeletedCertificateListResult', response)
3536-
return deserialized.next_link, AsyncList(deserialized.value)
3563+
list_of_elem = deserialized.value
3564+
if cls:
3565+
list_of_elem = cls(list_of_elem)
3566+
return deserialized.next_link, AsyncList(list_of_elem)
35373567

35383568
async def get_next_async(next_link=None):
35393569
request = prepare_request(next_link)
@@ -3768,7 +3798,10 @@ def prepare_request(next_link=None):
37683798

37693799
async def extract_data_async(response):
37703800
deserialized = self._deserialize('StorageListResult', response)
3771-
return deserialized.next_link, AsyncList(deserialized.value)
3801+
list_of_elem = deserialized.value
3802+
if cls:
3803+
list_of_elem = cls(list_of_elem)
3804+
return deserialized.next_link, AsyncList(list_of_elem)
37723805

37733806
async def get_next_async(next_link=None):
37743807
request = prepare_request(next_link)
@@ -4158,7 +4191,10 @@ def prepare_request(next_link=None):
41584191

41594192
async def extract_data_async(response):
41604193
deserialized = self._deserialize('SasDefinitionListResult', response)
4161-
return deserialized.next_link, AsyncList(deserialized.value)
4194+
list_of_elem = deserialized.value
4195+
if cls:
4196+
list_of_elem = cls(list_of_elem)
4197+
return deserialized.next_link, AsyncList(list_of_elem)
41624198

41634199
async def get_next_async(next_link=None):
41644200
request = prepare_request(next_link)

‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/models/_models.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -692,14 +692,6 @@ def __init__(self, **kwargs):
692692
self.tags = kwargs.get('tags', None)
693693

694694

695-
class CloudError(Model):
696-
"""CloudError.
697-
"""
698-
699-
_attribute_map = {
700-
}
701-
702-
703695
class Contact(Model):
704696
"""The contact information for the vault certificates.
705697

‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/models/_models_py3.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -692,14 +692,6 @@ def __init__(self, *, certificate_policy=None, certificate_attributes=None, tags
692692
self.tags = tags
693693

694694

695-
class CloudError(Model):
696-
"""CloudError.
697-
"""
698-
699-
_attribute_map = {
700-
}
701-
702-
703695
class Contact(Model):
704696
"""The contact information for the vault certificates.
705697

‎sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_shared/_generated/v2016_10_01/operations/_key_vault_client_operations.py

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,10 @@ def prepare_request(next_link=None):
423423

424424
def extract_data(response):
425425
deserialized = self._deserialize('KeyListResult', response)
426-
return deserialized.next_link, iter(deserialized.value)
426+
list_of_elem = deserialized.value
427+
if cls:
428+
list_of_elem = cls(list_of_elem)
429+
return deserialized.next_link, iter(list_of_elem)
427430

428431
def get_next(next_link=None):
429432
request = prepare_request(next_link)
@@ -494,7 +497,10 @@ def prepare_request(next_link=None):
494497

495498
def extract_data(response):
496499
deserialized = self._deserialize('KeyListResult', response)
497-
return deserialized.next_link, iter(deserialized.value)
500+
list_of_elem = deserialized.value
501+
if cls:
502+
list_of_elem = cls(list_of_elem)
503+
return deserialized.next_link, iter(list_of_elem)
498504

499505
def get_next(next_link=None):
500506
request = prepare_request(next_link)
@@ -1174,7 +1180,10 @@ def prepare_request(next_link=None):
11741180

11751181
def extract_data(response):
11761182
deserialized = self._deserialize('DeletedKeyListResult', response)
1177-
return deserialized.next_link, iter(deserialized.value)
1183+
list_of_elem = deserialized.value
1184+
if cls:
1185+
list_of_elem = cls(list_of_elem)
1186+
return deserialized.next_link, iter(list_of_elem)
11781187

11791188
def get_next(next_link=None):
11801189
request = prepare_request(next_link)
@@ -1678,7 +1687,10 @@ def prepare_request(next_link=None):
16781687

16791688
def extract_data(response):
16801689
deserialized = self._deserialize('SecretListResult', response)
1681-
return deserialized.next_link, iter(deserialized.value)
1690+
list_of_elem = deserialized.value
1691+
if cls:
1692+
list_of_elem = cls(list_of_elem)
1693+
return deserialized.next_link, iter(list_of_elem)
16821694

16831695
def get_next(next_link=None):
16841696
request = prepare_request(next_link)
@@ -1749,7 +1761,10 @@ def prepare_request(next_link=None):
17491761

17501762
def extract_data(response):
17511763
deserialized = self._deserialize('SecretListResult', response)
1752-
return deserialized.next_link, iter(deserialized.value)
1764+
list_of_elem = deserialized.value
1765+
if cls:
1766+
list_of_elem = cls(list_of_elem)
1767+
return deserialized.next_link, iter(list_of_elem)
17531768

17541769
def get_next(next_link=None):
17551770
request = prepare_request(next_link)
@@ -1817,7 +1832,10 @@ def prepare_request(next_link=None):
18171832

18181833
def extract_data(response):
18191834
deserialized = self._deserialize('DeletedSecretListResult', response)
1820-
return deserialized.next_link, iter(deserialized.value)
1835+
list_of_elem = deserialized.value
1836+
if cls:
1837+
list_of_elem = cls(list_of_elem)
1838+
return deserialized.next_link, iter(list_of_elem)
18211839

18221840
def get_next(next_link=None):
18231841
request = prepare_request(next_link)
@@ -2170,7 +2188,10 @@ def prepare_request(next_link=None):
21702188

21712189
def extract_data(response):
21722190
deserialized = self._deserialize('CertificateListResult', response)
2173-
return deserialized.next_link, iter(deserialized.value)
2191+
list_of_elem = deserialized.value
2192+
if cls:
2193+
list_of_elem = cls(list_of_elem)
2194+
return deserialized.next_link, iter(list_of_elem)
21742195

21752196
def get_next(next_link=None):
21762197
request = prepare_request(next_link)
@@ -2464,7 +2485,10 @@ def prepare_request(next_link=None):
24642485

24652486
def extract_data(response):
24662487
deserialized = self._deserialize('CertificateIssuerListResult', response)
2467-
return deserialized.next_link, iter(deserialized.value)
2488+
list_of_elem = deserialized.value
2489+
if cls:
2490+
list_of_elem = cls(list_of_elem)
2491+
return deserialized.next_link, iter(list_of_elem)
24682492

24692493
def get_next(next_link=None):
24702494
request = prepare_request(next_link)
@@ -2951,7 +2975,10 @@ def prepare_request(next_link=None):
29512975

29522976
def extract_data(response):
29532977
deserialized = self._deserialize('CertificateListResult', response)
2954-
return deserialized.next_link, iter(deserialized.value)
2978+
list_of_elem = deserialized.value
2979+
if cls:
2980+
list_of_elem = cls(list_of_elem)
2981+
return deserialized.next_link, iter(list_of_elem)
29552982

29562983
def get_next(next_link=None):
29572984
request = prepare_request(next_link)
@@ -3533,7 +3560,10 @@ def prepare_request(next_link=None):
35333560

35343561
def extract_data(response):
35353562
deserialized = self._deserialize('DeletedCertificateListResult', response)
3536-
return deserialized.next_link, iter(deserialized.value)
3563+
list_of_elem = deserialized.value
3564+
if cls:
3565+
list_of_elem = cls(list_of_elem)
3566+
return deserialized.next_link, iter(list_of_elem)
35373567

35383568
def get_next(next_link=None):
35393569
request = prepare_request(next_link)
@@ -3768,7 +3798,10 @@ def prepare_request(next_link=None):
37683798

37693799
def extract_data(response):
37703800
deserialized = self._deserialize('StorageListResult', response)
3771-
return deserialized.next_link, iter(deserialized.value)
3801+
list_of_elem = deserialized.value
3802+
if cls:
3803+
list_of_elem = cls(list_of_elem)
3804+
return deserialized.next_link, iter(list_of_elem)
37723805

37733806
def get_next(next_link=None):
37743807
request = prepare_request(next_link)
@@ -4158,7 +4191,10 @@ def prepare_request(next_link=None):
41584191

41594192
def extract_data(response):
41604193
deserialized = self._deserialize('SasDefinitionListResult', response)
4161-
return deserialized.next_link, iter(deserialized.value)
4194+
list_of_elem = deserialized.value
4195+
if cls:
4196+
list_of_elem = cls(list_of_elem)
4197+
return deserialized.next_link, iter(list_of_elem)
41624198

41634199
def get_next(next_link=None):
41644200
request = prepare_request(next_link)

0 commit comments

Comments
 (0)