Skip to content

Commit ee209c8

Browse files
authored
[Key Vault] Rename id parameter -> source_id (Azure#18995)
1 parent 5235c37 commit ee209c8

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_models.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ def cer(self):
395395
class KeyVaultCertificateIdentifier(object):
396396
"""Information about a KeyVaultCertificate parsed from a certificate ID.
397397
398-
:param str id: the full original identifier of a certificate
398+
:param str source_id: the full original identifier of a certificate
399399
:raises ValueError: if the certificate ID is improperly formatted
400400
Example:
401401
.. literalinclude:: ../tests/test_parse_id.py
@@ -406,9 +406,9 @@ class KeyVaultCertificateIdentifier(object):
406406
:dedent: 8
407407
"""
408408

409-
def __init__(self, id): # pylint: disable=W0622
409+
def __init__(self, source_id):
410410
# type: (str) -> None
411-
self._resource_id = parse_key_vault_id(id)
411+
self._resource_id = parse_key_vault_id(source_id)
412412

413413
@property
414414
def source_id(self):

sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ def test_recover_and_purge(self, client, **kwargs):
349349
client.begin_delete_certificate(certificate_name=cert_name).wait()
350350

351351
# validate all our deleted certificates are returned by list_deleted_certificates
352-
deleted = [KeyVaultCertificateIdentifier(id=c.id).name for c in client.list_deleted_certificates()]
352+
deleted = [KeyVaultCertificateIdentifier(source_id=c.id).name for c in client.list_deleted_certificates()]
353353
self.assertTrue(all(c in deleted for c in certs.keys()))
354354

355355
# recover select certificates (test resources have a "livekvtest" prefix)
@@ -364,7 +364,7 @@ def test_recover_and_purge(self, client, **kwargs):
364364
time.sleep(50)
365365

366366
# validate none of our deleted certificates are returned by list_deleted_certificates
367-
deleted = [KeyVaultCertificateIdentifier(id=c.id).name for c in client.list_deleted_certificates()]
367+
deleted = [KeyVaultCertificateIdentifier(source_id=c.id).name for c in client.list_deleted_certificates()]
368368
self.assertTrue(not any(c in deleted for c in certs.keys()))
369369

370370
# validate the recovered certificates

sdk/keyvault/azure-keyvault-certificates/tests/test_certificates_client_async.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ async def test_recover_and_purge(self, client, **kwargs):
350350
deleted_certificates = client.list_deleted_certificates()
351351
deleted = []
352352
async for c in deleted_certificates:
353-
deleted.append(KeyVaultCertificateIdentifier(id=c.id).name)
353+
deleted.append(KeyVaultCertificateIdentifier(source_id=c.id).name)
354354
self.assertTrue(all(c in deleted for c in certs.keys()))
355355

356356
# recover select certificates (test resources have a "livekvtest" prefix)
@@ -368,7 +368,7 @@ async def test_recover_and_purge(self, client, **kwargs):
368368
deleted_certificates = client.list_deleted_certificates()
369369
deleted = []
370370
async for c in deleted_certificates:
371-
deleted.append(KeyVaultCertificateIdentifier(id=c.id).name)
371+
deleted.append(KeyVaultCertificateIdentifier(source_id=c.id).name)
372372
self.assertTrue(not any(c in deleted for c in certs.keys()))
373373

374374
# validate the recovered certificates

sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_models.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ def key_operations(self):
328328
class KeyVaultKeyIdentifier(object):
329329
"""Information about a KeyVaultKey parsed from a key ID.
330330
331-
:param str id: the full original identifier of a key
331+
:param str source_id: the full original identifier of a key
332332
:raises ValueError: if the key ID is improperly formatted
333333
Example:
334334
.. literalinclude:: ../tests/test_parse_id.py
@@ -339,9 +339,9 @@ class KeyVaultKeyIdentifier(object):
339339
:dedent: 8
340340
"""
341341

342-
def __init__(self, id): # pylint: disable=W0622
342+
def __init__(self, source_id):
343343
# type: (str) -> None
344-
self._resource_id = parse_key_vault_id(id)
344+
self._resource_id = parse_key_vault_id(source_id)
345345

346346
@property
347347
def source_id(self):

sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_models.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def value(self):
248248
class KeyVaultSecretIdentifier(object):
249249
"""Information about a KeyVaultSecret parsed from a secret ID.
250250
251-
:param str id: the full original identifier of a secret
251+
:param str source_id: the full original identifier of a secret
252252
:raises ValueError: if the secret ID is improperly formatted
253253
Example:
254254
.. literalinclude:: ../tests/test_parse_id.py
@@ -259,9 +259,9 @@ class KeyVaultSecretIdentifier(object):
259259
:dedent: 8
260260
"""
261261

262-
def __init__(self, id): # pylint: disable=W0622
262+
def __init__(self, source_id):
263263
# type: (str) -> None
264-
self._resource_id = parse_key_vault_id(id)
264+
self._resource_id = parse_key_vault_id(source_id)
265265

266266
@property
267267
def source_id(self):

0 commit comments

Comments
 (0)