Skip to content

Commit ec6ed05

Browse files
authored
Remove unused custom excertion handling in all KeyVault (Azure#30277)
1 parent ec1ddc4 commit ec6ed05

File tree

21 files changed

+188
-369
lines changed

21 files changed

+188
-369
lines changed

sdk/keyvault/azure-keyvault-administration/azure/keyvault/administration/_internal/exceptions.py

Lines changed: 0 additions & 56 deletions
This file was deleted.

sdk/keyvault/azure-keyvault-certificates/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "python",
44
"TagPrefix": "python/keyvault/azure-keyvault-certificates",
5-
"Tag": "python/keyvault/azure-keyvault-certificates_e24380c294"
5+
"Tag": "python/keyvault/azure-keyvault-certificates_f472924e90"
66
}

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

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
from azure.core.tracing.decorator import distributed_trace
1111

1212
from ._shared import KeyVaultClientBase
13-
from ._shared.exceptions import error_map as _error_map
1413
from ._shared._polling import DeleteRecoverPollingMethod, KeyVaultOperationPoller
1514
from ._models import (
1615
KeyVaultCertificate,
@@ -124,7 +123,6 @@ def begin_create_certificate(
124123
vault_base_url=self.vault_url,
125124
certificate_name=certificate_name,
126125
parameters=parameters,
127-
error_map=_error_map,
128126
**kwargs
129127
)
130128

@@ -167,7 +165,6 @@ def get_certificate(self, certificate_name: str, **kwargs) -> KeyVaultCertificat
167165
vault_base_url=self.vault_url,
168166
certificate_name=certificate_name,
169167
certificate_version="",
170-
error_map=_error_map,
171168
**kwargs
172169
)
173170
return KeyVaultCertificate._from_certificate_bundle(certificate_bundle=bundle)
@@ -203,7 +200,6 @@ def get_certificate_version(
203200
vault_base_url=self.vault_url,
204201
certificate_name=certificate_name,
205202
certificate_version=version,
206-
error_map=_error_map,
207203
**kwargs
208204
)
209205
return KeyVaultCertificate._from_certificate_bundle(certificate_bundle=bundle)
@@ -241,7 +237,7 @@ def begin_delete_certificate(self, certificate_name: str, **kwargs) -> LROPoller
241237
if polling_interval is None:
242238
polling_interval = 2
243239
deleted_cert_bundle = self._client.delete_certificate(
244-
vault_base_url=self.vault_url, certificate_name=certificate_name, error_map=_error_map, **kwargs
240+
vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
245241
)
246242
deleted_cert = DeletedCertificate._from_deleted_certificate_bundle(deleted_cert_bundle)
247243

@@ -280,7 +276,7 @@ def get_deleted_certificate(self, certificate_name: str, **kwargs) -> DeletedCer
280276
:dedent: 8
281277
"""
282278
bundle = self._client.get_deleted_certificate(
283-
vault_base_url=self.vault_url, certificate_name=certificate_name, error_map=_error_map, **kwargs
279+
vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
284280
)
285281
return DeletedCertificate._from_deleted_certificate_bundle(deleted_certificate_bundle=bundle)
286282

@@ -302,7 +298,7 @@ def purge_deleted_certificate(self, certificate_name: str, **kwargs) -> None:
302298
:raises: :class:`~azure.core.exceptions.HttpResponseError`
303299
"""
304300
self._client.purge_deleted_certificate(
305-
vault_base_url=self.vault_url, certificate_name=certificate_name, error_map=_error_map, **kwargs
301+
vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
306302
)
307303

308304
@distributed_trace
@@ -339,7 +335,7 @@ def begin_recover_deleted_certificate(
339335
polling_interval = 2
340336

341337
recovered_cert_bundle = self._client.recover_deleted_certificate(
342-
vault_base_url=self.vault_url, certificate_name=certificate_name, error_map=_error_map, **kwargs
338+
vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
343339
)
344340
recovered_certificate = KeyVaultCertificate._from_certificate_bundle(recovered_cert_bundle)
345341
command = partial(self.get_certificate, certificate_name=certificate_name, **kwargs)
@@ -402,7 +398,6 @@ def import_certificate(
402398
vault_base_url=self.vault_url,
403399
certificate_name=certificate_name,
404400
parameters=parameters,
405-
error_map=_error_map,
406401
**kwargs
407402
)
408403
return KeyVaultCertificate._from_certificate_bundle(certificate_bundle=bundle)
@@ -421,7 +416,7 @@ def get_certificate_policy(self, certificate_name: str, **kwargs) -> Certificate
421416
:raises: :class:`~azure.core.exceptions.HttpResponseError`
422417
"""
423418
bundle = self._client.get_certificate_policy(
424-
vault_base_url=self.vault_url, certificate_name=certificate_name, error_map=_error_map, **kwargs
419+
vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
425420
)
426421
return CertificatePolicy._from_certificate_policy_bundle(certificate_policy_bundle=bundle)
427422

@@ -446,7 +441,6 @@ def update_certificate_policy(
446441
vault_base_url=self.vault_url,
447442
certificate_name=certificate_name,
448443
certificate_policy=policy._to_certificate_policy_bundle(),
449-
error_map=_error_map,
450444
**kwargs
451445
)
452446
return CertificatePolicy._from_certificate_policy_bundle(certificate_policy_bundle=bundle)
@@ -494,7 +488,6 @@ def update_certificate_properties(
494488
certificate_name=certificate_name,
495489
certificate_version=version or "",
496490
parameters=parameters,
497-
error_map=_error_map,
498491
**kwargs
499492
)
500493
return KeyVaultCertificate._from_certificate_bundle(certificate_bundle=bundle)
@@ -526,7 +519,7 @@ def backup_certificate(self, certificate_name: str, **kwargs) -> bytes:
526519
:dedent: 8
527520
"""
528521
backup_result = self._client.backup_certificate(
529-
vault_base_url=self.vault_url, certificate_name=certificate_name, error_map=_error_map, **kwargs
522+
vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
530523
)
531524
return backup_result.value
532525

@@ -556,7 +549,6 @@ def restore_certificate_backup(self, backup: bytes, **kwargs) -> KeyVaultCertifi
556549
bundle = self._client.restore_certificate(
557550
vault_base_url=self.vault_url,
558551
parameters=self._models.CertificateRestoreParameters(certificate_bundle_backup=backup),
559-
error_map=_error_map,
560552
**kwargs
561553
)
562554
return KeyVaultCertificate._from_certificate_bundle(certificate_bundle=bundle)
@@ -597,7 +589,6 @@ def list_deleted_certificates(self, **kwargs) -> "ItemPaged[DeletedCertificate]"
597589
cls=lambda objs: [
598590
DeletedCertificate._from_deleted_certificate_item(deleted_certificate_item=x) for x in objs
599591
],
600-
error_map=_error_map,
601592
**kwargs
602593
)
603594

@@ -635,7 +626,6 @@ def list_properties_of_certificates(self, **kwargs) -> "ItemPaged[CertificatePro
635626
vault_base_url=self._vault_url,
636627
maxresults=max_page_size,
637628
cls=lambda objs: [CertificateProperties._from_certificate_item(certificate_item=x) for x in objs],
638-
error_map=_error_map,
639629
**kwargs
640630
)
641631

@@ -668,7 +658,6 @@ def list_properties_of_certificate_versions(
668658
certificate_name=certificate_name,
669659
maxresults=max_page_size,
670660
cls=lambda objs: [CertificateProperties._from_certificate_item(certificate_item=x) for x in objs],
671-
error_map=_error_map,
672661
**kwargs
673662
)
674663

@@ -695,7 +684,6 @@ def set_contacts(self, contacts: "List[CertificateContact]", **kwargs) -> "List[
695684
new_contacts = self._client.set_certificate_contacts(
696685
vault_base_url=self.vault_url,
697686
contacts=self._models.Contacts(contact_list=[c._to_certificate_contacts_item() for c in contacts]),
698-
error_map=_error_map,
699687
**kwargs
700688
)
701689
return [
@@ -719,7 +707,7 @@ def get_contacts(self, **kwargs) -> "List[CertificateContact]":
719707
:caption: Get contacts
720708
:dedent: 8
721709
"""
722-
contacts = self._client.get_certificate_contacts(vault_base_url=self._vault_url, error_map=_error_map, **kwargs)
710+
contacts = self._client.get_certificate_contacts(vault_base_url=self._vault_url, **kwargs)
723711
return [CertificateContact._from_certificate_contacts_item(contact_item=item) for item in contacts.contact_list]
724712

725713
@distributed_trace
@@ -740,7 +728,7 @@ def delete_contacts(self, **kwargs) -> "List[CertificateContact]":
740728
:dedent: 8
741729
"""
742730
contacts = self._client.delete_certificate_contacts(
743-
vault_base_url=self.vault_url, error_map=_error_map, **kwargs
731+
vault_base_url=self.vault_url, **kwargs
744732
)
745733
return [CertificateContact._from_certificate_contacts_item(contact_item=item) for item in contacts.contact_list]
746734

@@ -759,7 +747,7 @@ def get_certificate_operation(self, certificate_name: str, **kwargs) -> Certific
759747
"""
760748

761749
bundle = self._client.get_certificate_operation(
762-
vault_base_url=self.vault_url, certificate_name=certificate_name, error_map=_error_map, **kwargs
750+
vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
763751
)
764752
return CertificateOperation._from_certificate_operation_bundle(certificate_operation_bundle=bundle)
765753

@@ -777,7 +765,7 @@ def delete_certificate_operation(self, certificate_name: str, **kwargs) -> Certi
777765
:raises: :class:`~azure.core.exceptions.HttpResponseError`
778766
"""
779767
bundle = self._client.delete_certificate_operation(
780-
vault_base_url=self.vault_url, certificate_name=certificate_name, error_map=_error_map, **kwargs
768+
vault_base_url=self.vault_url, certificate_name=certificate_name, **kwargs
781769
)
782770
return CertificateOperation._from_certificate_operation_bundle(certificate_operation_bundle=bundle)
783771

@@ -796,7 +784,6 @@ def cancel_certificate_operation(self, certificate_name: str, **kwargs) -> Certi
796784
vault_base_url=self.vault_url,
797785
certificate_name=certificate_name,
798786
certificate_operation=self._models.CertificateOperationUpdateParameter(cancellation_requested=True),
799-
error_map=_error_map,
800787
**kwargs
801788
)
802789
return CertificateOperation._from_certificate_operation_bundle(certificate_operation_bundle=bundle)
@@ -842,7 +829,6 @@ def merge_certificate(
842829
vault_base_url=self.vault_url,
843830
certificate_name=certificate_name,
844831
parameters=parameters,
845-
error_map=_error_map,
846832
**kwargs
847833
)
848834
return KeyVaultCertificate._from_certificate_bundle(certificate_bundle=bundle)
@@ -869,7 +855,7 @@ def get_issuer(self, issuer_name: str, **kwargs) -> CertificateIssuer:
869855
:dedent: 8
870856
"""
871857
issuer_bundle = self._client.get_certificate_issuer(
872-
vault_base_url=self.vault_url, issuer_name=issuer_name, error_map=_error_map, **kwargs
858+
vault_base_url=self.vault_url, issuer_name=issuer_name, **kwargs
873859
)
874860
return CertificateIssuer._from_issuer_bundle(issuer_bundle=issuer_bundle)
875861

@@ -941,7 +927,7 @@ def create_issuer(self, issuer_name: str, provider: str, **kwargs) -> Certificat
941927
)
942928

943929
issuer_bundle = self._client.set_certificate_issuer(
944-
vault_base_url=self.vault_url, issuer_name=issuer_name, parameter=parameters, error_map=_error_map, **kwargs
930+
vault_base_url=self.vault_url, issuer_name=issuer_name, parameter=parameters, **kwargs
945931
)
946932
return CertificateIssuer._from_issuer_bundle(issuer_bundle=issuer_bundle)
947933

@@ -1004,7 +990,7 @@ def update_issuer(self, issuer_name: str, **kwargs) -> CertificateIssuer:
1004990
)
1005991

1006992
issuer_bundle = self._client.update_certificate_issuer(
1007-
vault_base_url=self.vault_url, issuer_name=issuer_name, parameter=parameters, error_map=_error_map, **kwargs
993+
vault_base_url=self.vault_url, issuer_name=issuer_name, parameter=parameters, **kwargs
1008994
)
1009995
return CertificateIssuer._from_issuer_bundle(issuer_bundle=issuer_bundle)
1010996

@@ -1030,7 +1016,7 @@ def delete_issuer(self, issuer_name: str, **kwargs) -> CertificateIssuer:
10301016
:dedent: 8
10311017
"""
10321018
issuer_bundle = self._client.delete_certificate_issuer(
1033-
vault_base_url=self.vault_url, issuer_name=issuer_name, error_map=_error_map, **kwargs
1019+
vault_base_url=self.vault_url, issuer_name=issuer_name, **kwargs
10341020
)
10351021
return CertificateIssuer._from_issuer_bundle(issuer_bundle=issuer_bundle)
10361022

@@ -1058,6 +1044,5 @@ def list_properties_of_issuers(self, **kwargs) -> "ItemPaged[IssuerProperties]":
10581044
vault_base_url=self.vault_url,
10591045
maxresults=max_page_size,
10601046
cls=lambda objs: [IssuerProperties._from_issuer_item(issuer_item=x) for x in objs],
1061-
error_map=_error_map,
10621047
**kwargs
10631048
)

sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/exceptions.py

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)