Skip to content

Fix #7651 #7652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chlowell merged 1 commit into from
Oct 7, 2019
Merged

Fix #7651 #7652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/aio/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
)
from ._polling_async import CreateCertificatePollerAsync
from .._shared import AsyncKeyVaultClientBase
from .._shared.exceptions import error_map
from .._shared.exceptions import error_map as _error_map


class CertificateClient(AsyncKeyVaultClientBase):
Expand Down Expand Up @@ -126,7 +126,7 @@ async def get_certificate_with_policy(self, name: str, **kwargs: "**Any") -> Cer
:dedent: 8
"""
bundle = await self._client.get_certificate(
vault_base_url=self.vault_url, certificate_name=name, certificate_version="", error_map=error_map, **kwargs
vault_base_url=self.vault_url, certificate_name=name, certificate_version="", error_map=_error_map, **kwargs
)
return Certificate._from_certificate_bundle(certificate_bundle=bundle)

Expand Down Expand Up @@ -157,7 +157,7 @@ async def get_certificate(self, name: str, version: str, **kwargs: "**Any") -> C
vault_base_url=self.vault_url,
certificate_name=name,
certificate_version=version,
error_map=error_map,
error_map=_error_map,
**kwargs
)
return Certificate._from_certificate_bundle(certificate_bundle=bundle)
Expand Down Expand Up @@ -187,7 +187,7 @@ async def delete_certificate(self, name: str, **kwargs: "**Any") -> DeletedCerti
:dedent: 8
"""
bundle = await self._client.delete_certificate(
vault_base_url=self.vault_url, certificate_name=name, error_map=error_map, **kwargs
vault_base_url=self.vault_url, certificate_name=name, error_map=_error_map, **kwargs
)
return DeletedCertificate._from_deleted_certificate_bundle(deleted_certificate_bundle=bundle)

Expand Down Expand Up @@ -216,7 +216,7 @@ async def get_deleted_certificate(self, name: str, **kwargs: "**Any") -> Deleted
:dedent: 8
"""
bundle = await self._client.get_deleted_certificate(
vault_base_url=self.vault_url, certificate_name=name, error_map=error_map, **kwargs
vault_base_url=self.vault_url, certificate_name=name, error_map=_error_map, **kwargs
)
return DeletedCertificate._from_deleted_certificate_bundle(deleted_certificate_bundle=bundle)

Expand Down Expand Up @@ -425,7 +425,7 @@ async def backup_certificate(self, name: str, **kwargs: "**Any") -> bytes:
:dedent: 8
"""
backup_result = await self._client.backup_certificate(
vault_base_url=self.vault_url, certificate_name=name, error_map=error_map, **kwargs
vault_base_url=self.vault_url, certificate_name=name, error_map=_error_map, **kwargs
)
return backup_result.value

Expand Down Expand Up @@ -654,7 +654,7 @@ async def get_certificate_operation(self, name: str, **kwargs: "**Any") -> Certi
"""

bundle = await self._client.get_certificate_operation(
vault_base_url=self.vault_url, certificate_name=name, error_map=error_map, **kwargs
vault_base_url=self.vault_url, certificate_name=name, error_map=_error_map, **kwargs
)
return CertificateOperation._from_certificate_operation_bundle(certificate_operation_bundle=bundle)

Expand All @@ -674,7 +674,7 @@ async def delete_certificate_operation(self, name: str, **kwargs: "**Any") -> Ce
:class:`~azure.core.exceptions.HttpResponseError` for other errors
"""
bundle = await self._client.delete_certificate_operation(
vault_base_url=self.vault_url, certificate_name=name, error_map=error_map, **kwargs
vault_base_url=self.vault_url, certificate_name=name, error_map=_error_map, **kwargs
)
return CertificateOperation._from_certificate_operation_bundle(certificate_operation_bundle=bundle)

Expand Down Expand Up @@ -737,7 +737,7 @@ async def get_pending_certificate_signing_request(
response = pipeline_response.http_response

if response.status_code not in [200]:
self._client.map_error(status_code=response.status_code, response=response, error_map=error_map)
self._client.map_error(status_code=response.status_code, response=response, error_map=_error_map)
raise self._client.models.KeyVaultErrorException(response, self._client._deserialize)

deserialized = None
Expand Down Expand Up @@ -811,7 +811,7 @@ async def get_issuer(self, name: str, **kwargs: "**Any") -> Issuer:
:dedent: 8
"""
issuer_bundle = await self._client.get_certificate_issuer(
vault_base_url=self.vault_url, issuer_name=name, error_map=error_map, **kwargs
vault_base_url=self.vault_url, issuer_name=name, error_map=_error_map, **kwargs
)
return Issuer._from_issuer_bundle(issuer_bundle=issuer_bundle)

Expand Down
12 changes: 6 additions & 6 deletions sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/aio/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ async def delete_key(self, name: str, **kwargs: "**Any") -> DeletedKey:
:caption: Delete a key
:dedent: 8
"""
bundle = await self._client.delete_key(self.vault_url, name, _error_map=_error_map, **kwargs)
bundle = await self._client.delete_key(self.vault_url, name, error_map=_error_map, **kwargs)
return DeletedKey._from_deleted_key_bundle(bundle)

@distributed_trace_async
Expand All @@ -257,7 +257,7 @@ async def get_key(self, name: str, version: Optional[str] = None, **kwargs: "**A
if version is None:
version = ""

bundle = await self._client.get_key(self.vault_url, name, version, _error_map=_error_map, **kwargs)
bundle = await self._client.get_key(self.vault_url, name, version, error_map=_error_map, **kwargs)
return Key._from_key_bundle(bundle)

@distributed_trace_async
Expand All @@ -280,7 +280,7 @@ async def get_deleted_key(self, name: str, **kwargs: "**Any") -> DeletedKey:
:caption: Get a deleted key
:dedent: 8
"""
bundle = await self._client.get_deleted_key(self.vault_url, name, _error_map=_error_map, **kwargs)
bundle = await self._client.get_deleted_key(self.vault_url, name, error_map=_error_map, **kwargs)
return DeletedKey._from_deleted_key_bundle(bundle)

@distributed_trace
Expand Down Expand Up @@ -449,7 +449,7 @@ async def update_key_properties(
key_ops=key_operations,
tags=tags,
key_attributes=attributes,
_error_map=_error_map,
error_map=_error_map,
**kwargs,
)
return Key._from_key_bundle(bundle)
Expand Down Expand Up @@ -477,7 +477,7 @@ async def backup_key(self, name: str, **kwargs: "**Any") -> bytes:
:caption: Get a key backup
:dedent: 8
"""
backup_result = await self._client.backup_key(self.vault_url, name, _error_map=_error_map, **kwargs)
backup_result = await self._client.backup_key(self.vault_url, name, error_map=_error_map, **kwargs)
return backup_result.value

@distributed_trace_async
Expand All @@ -503,7 +503,7 @@ async def restore_key(self, backup: bytes, **kwargs: "**Any") -> Key:
:caption: Restore a key backup
:dedent: 8
"""
bundle = await self._client.restore_key(self.vault_url, backup, _error_map=_error_map, **kwargs)
bundle = await self._client.restore_key(self.vault_url, backup, error_map=_error_map, **kwargs)
return Key._from_key_bundle(bundle)

@distributed_trace_async
Expand Down