Skip to content

Key Vault: Design board changes #7635

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
iscai-msft merged 20 commits into from
Oct 7, 2019
Merged

Key Vault: Design board changes #7635

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9766a4b
switched vault_url to vault_endpoint across key vault
iscai-msft Oct 4, 2019
c5cb880
moved enabled and tags to kwargs
iscai-msft Oct 4, 2019
245c98d
changed the name parameter for get_policy and update_policy to certif…
iscai-msft Oct 4, 2019
cd9b4c4
updated changelog
iscai-msft Oct 4, 2019
3a85f85
[Core] Updated release notes (#7627)
annatisch Oct 4, 2019
1285a03
Core doc fix (#7638)
lmazuel Oct 5, 2019
f740459
update app config doc (#7618)
xiangyan99 Oct 5, 2019
eaba336
[AutoPR] netapp/resource-manager (#7092)
AutorestCI Oct 5, 2019
9f8bd5c
extending pypy timeout. (#7640)
scbedd Oct 5, 2019
b2fa036
Eventhubs preview4 merge to master (#7605)
YijunXieMS Oct 5, 2019
4d8a7d5
Resolve Global Install Errors (#7642)
scbedd Oct 6, 2019
481efd2
Setup core for unified pipelines. (#7577)
mitchdenny Oct 6, 2019
ffc06d5
Publish the packages artifact. (#7643)
mitchdenny Oct 6, 2019
3750ac7
Enable template for unified templates. (#7644)
mitchdenny Oct 7, 2019
3330436
ensure error_map is used consistently and correctly (#7637)
chlowell Oct 7, 2019
5f530a8
switched vault_url to vault_endpoint across key vault
iscai-msft Oct 4, 2019
bfb2742
ran black on keyvault
iscai-msft Oct 7, 2019
de77e4c
reverted <<<HEAD additions to code
iscai-msft Oct 7, 2019
03d2ab1
Merge branch 'master' of github.com:Azure/azure-sdk-for-python into d…
iscai-msft Oct 7, 2019
dd7c293
got rid of black changes that broke python 3.5
iscai-msft Oct 7, 2019
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
Prev Previous commit
Next Next commit
reverted <<<HEAD additions to code
  • Loading branch information
@iscai-msft
iscai-msft committed Oct 7, 2019
commit de77e4cf0f426cf075b39eca1aaa856be769ccc9
44 changes: 2 additions & 42 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 @@ -126,19 +126,11 @@ async def get_certificate_with_policy(self, name: str, **kwargs: "**Any") -> Cer
:dedent: 8
"""
bundle = await self._client.get_certificate(
<<<<<<< HEAD
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, certificate_name=name, certificate_version="", error_map=_error_map, **kwargs
=======
vault_base_url=self.vault_endpoint, certificate_name=name, certificate_version="", error_map=error_map, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
=======
vault_base_url=self.vault_endpoint,
certificate_name=name,
certificate_version="",
error_map=error_map,
**kwargs
>>>>>>> ran black on keyvault
)
return Certificate._from_certificate_bundle(certificate_bundle=bundle)

Expand Down Expand Up @@ -169,7 +161,7 @@ async def get_certificate(self, name: str, version: str, **kwargs: "**Any") -> C
vault_base_url=self.vault_endpoint,
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 @@ -199,11 +191,7 @@ async def delete_certificate(self, name: str, **kwargs: "**Any") -> DeletedCerti
:dedent: 8
"""
bundle = await self._client.delete_certificate(
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=_error_map, **kwargs
=======
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=error_map, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
)
return DeletedCertificate._from_deleted_certificate_bundle(deleted_certificate_bundle=bundle)

Expand Down Expand Up @@ -232,11 +220,7 @@ async def get_deleted_certificate(self, name: str, **kwargs: "**Any") -> Deleted
:dedent: 8
"""
bundle = await self._client.get_deleted_certificate(
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=_error_map, **kwargs
=======
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=error_map, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
)
return DeletedCertificate._from_deleted_certificate_bundle(deleted_certificate_bundle=bundle)

Expand Down Expand Up @@ -353,11 +337,7 @@ async def get_policy(self, certificate_name: str, **kwargs: "**Any") -> Certific
:raises: :class:`~azure.core.exceptions.HttpResponseError`
"""
bundle = await self._client.get_certificate_policy(
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, certificate_name=certificate_name, **kwargs
=======
vault_base_url=self.vault_endpoint, certificate_name=name, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
)
return CertificatePolicy._from_certificate_policy_bundle(certificate_policy_bundle=bundle)

Expand All @@ -379,11 +359,7 @@ async def update_policy(
"""
bundle = await self._client.update_certificate_policy(
vault_base_url=self.vault_endpoint,
<<<<<<< HEAD
certificate_name=certificate_name,
=======
certificate_name=name,
>>>>>>> switched vault_url to vault_endpoint across key vault
certificate_policy=policy._to_certificate_policy_bundle(),
**kwargs
)
Expand Down Expand Up @@ -460,11 +436,7 @@ async def backup_certificate(self, name: str, **kwargs: "**Any") -> bytes:
:dedent: 8
"""
backup_result = await self._client.backup_certificate(
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=_error_map, **kwargs
=======
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=error_map, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
)
return backup_result.value

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

bundle = await self._client.get_certificate_operation(
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=_error_map, **kwargs
=======
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=error_map, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
)
return CertificateOperation._from_certificate_operation_bundle(certificate_operation_bundle=bundle)

Expand All @@ -719,11 +687,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(
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=_error_map, **kwargs
=======
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=error_map, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
)
return CertificateOperation._from_certificate_operation_bundle(certificate_operation_bundle=bundle)

Expand Down Expand Up @@ -786,7 +750,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 @@ -858,11 +822,7 @@ async def get_issuer(self, name: str, **kwargs: "**Any") -> Issuer:
:dedent: 8
"""
issuer_bundle = await self._client.get_certificate_issuer(
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, issuer_name=name, error_map=_error_map, **kwargs
=======
vault_base_url=self.vault_endpoint, issuer_name=name, error_map=error_map, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
)
return Issuer._from_issuer_bundle(issuer_bundle=issuer_bundle)

Expand Down
68 changes: 4 additions & 64 deletions sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from azure.core.tracing.decorator import distributed_trace

from ._shared import KeyVaultClientBase
from ._shared.exceptions import error_map as _error_map
from ._shared.exceptions import error_map
from .models import (
Certificate,
CertificateProperties,
Expand Down Expand Up @@ -140,19 +140,11 @@ def get_certificate_with_policy(self, name, **kwargs):
:dedent: 8
"""
bundle = self._client.get_certificate(
<<<<<<< HEAD
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, certificate_name=name, certificate_version="", error_map=_error_map, **kwargs
=======
vault_base_url=self.vault_endpoint, certificate_name=name, certificate_version="", error_map=error_map, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
=======
vault_base_url=self.vault_endpoint,
certificate_name=name,
certificate_version="",
error_map=_error_map,
error_map=error_map,
**kwargs
>>>>>>> ran black on keyvault
)
return Certificate._from_certificate_bundle(certificate_bundle=bundle)

Expand Down Expand Up @@ -184,7 +176,7 @@ def get_certificate(self, name, version, **kwargs):
vault_base_url=self.vault_endpoint,
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 @@ -215,15 +207,7 @@ def delete_certificate(self, name, **kwargs):
:dedent: 8
"""
bundle = self._client.delete_certificate(
<<<<<<< HEAD
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=_error_map, **kwargs
=======
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=error_map, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
=======
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=_error_map, **kwargs
>>>>>>> ran black on keyvault
)
return DeletedCertificate._from_deleted_certificate_bundle(deleted_certificate_bundle=bundle)

Expand Down Expand Up @@ -253,15 +237,7 @@ def get_deleted_certificate(self, name, **kwargs):
:dedent: 8
"""
bundle = self._client.get_deleted_certificate(
<<<<<<< HEAD
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=_error_map, **kwargs
=======
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=error_map, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
=======
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=_error_map, **kwargs
>>>>>>> ran black on keyvault
)
return DeletedCertificate._from_deleted_certificate_bundle(deleted_certificate_bundle=bundle)

Expand Down Expand Up @@ -379,17 +355,9 @@ def get_policy(self, certificate_name, **kwargs):
:rtype: ~azure.keyvault.certificates.models.CertificatePolicy
:raises: :class:`~azure.core.exceptions.HttpResponseError`
"""
<<<<<<< HEAD
<<<<<<< HEAD
bundle = self._client.get_certificate_policy(vault_base_url=self.vault_endpoint, certificate_name=certificate_name, **kwargs)
=======
bundle = self._client.get_certificate_policy(vault_base_url=self.vault_endpoint, certificate_name=name, **kwargs)
>>>>>>> switched vault_url to vault_endpoint across key vault
=======
bundle = self._client.get_certificate_policy(
vault_base_url=self.vault_endpoint, certificate_name=certificate_name, **kwargs
)
>>>>>>> ran black on keyvault
return CertificatePolicy._from_certificate_policy_bundle(certificate_policy_bundle=bundle)

@distributed_trace
Expand All @@ -409,11 +377,7 @@ def update_policy(self, certificate_name, policy, **kwargs):
"""
bundle = self._client.update_certificate_policy(
vault_base_url=self.vault_endpoint,
<<<<<<< HEAD
certificate_name=certificate_name,
=======
certificate_name=name,
>>>>>>> switched vault_url to vault_endpoint across key vault
certificate_policy=policy._to_certificate_policy_bundle(),
**kwargs
)
Expand Down Expand Up @@ -496,15 +460,7 @@ def backup_certificate(self, name, **kwargs):
:dedent: 8
"""
backup_result = self._client.backup_certificate(
<<<<<<< HEAD
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=_error_map, **kwargs
=======
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=error_map, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
=======
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=_error_map, **kwargs
>>>>>>> ran black on keyvault
)
return backup_result.value

Expand Down Expand Up @@ -729,15 +685,7 @@ def get_certificate_operation(self, name, **kwargs):
"""

bundle = self._client.get_certificate_operation(
<<<<<<< HEAD
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=_error_map, **kwargs
=======
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=error_map, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
=======
vault_base_url=self.vault_endpoint, certificate_name=name, error_map=_error_map, **kwargs
>>>>>>> ran black on keyvault
)
return CertificateOperation._from_certificate_operation_bundle(certificate_operation_bundle=bundle)

Expand Down Expand Up @@ -866,7 +814,7 @@ 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 @@ -900,15 +848,7 @@ def get_issuer(self, name, **kwargs):
:dedent: 8
"""
issuer_bundle = self._client.get_certificate_issuer(
<<<<<<< HEAD
<<<<<<< HEAD
vault_base_url=self.vault_endpoint, issuer_name=name, error_map=_error_map, **kwargs
=======
vault_base_url=self.vault_endpoint, issuer_name=name, error_map=error_map, **kwargs
>>>>>>> switched vault_url to vault_endpoint across key vault
=======
vault_base_url=self.vault_endpoint, issuer_name=name, error_map=_error_map, **kwargs
>>>>>>> ran black on keyvault
)
return Issuer._from_issuer_bundle(issuer_bundle=issuer_bundle)

Expand Down
44 changes: 2 additions & 42 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 @@ -10,7 +10,7 @@
from azure.keyvault.keys.models import DeletedKey, JsonWebKey, Key, KeyProperties
from azure.keyvault.keys._shared import AsyncKeyVaultClientBase

from .._shared.exceptions import error_map as _error_map
from .._shared.exceptions import error_map
from ..crypto.aio import CryptographyClient


Expand Down Expand Up @@ -231,15 +231,7 @@ async def delete_key(self, name: str, **kwargs: "**Any") -> DeletedKey:
:caption: Delete a key
:dedent: 8
"""
<<<<<<< HEAD
<<<<<<< HEAD
bundle = await self._client.delete_key(self.vault_endpoint, name, error_map=_error_map, **kwargs)
=======
bundle = await self._client.delete_key(self.vault_endpoint, name, error_map=error_map, **kwargs)
>>>>>>> switched vault_url to vault_endpoint across key vault
=======
bundle = await self._client.delete_key(self.vault_endpoint, name, error_map=_error_map, **kwargs)
>>>>>>> ran black on keyvault
return DeletedKey._from_deleted_key_bundle(bundle)

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

<<<<<<< HEAD
<<<<<<< HEAD
bundle = await self._client.get_key(self.vault_endpoint, name, version, error_map=_error_map, **kwargs)
=======
bundle = await self._client.get_key(self.vault_endpoint, name, version, error_map=error_map, **kwargs)
>>>>>>> switched vault_url to vault_endpoint across key vault
=======
bundle = await self._client.get_key(self.vault_endpoint, name, version, error_map=_error_map, **kwargs)
>>>>>>> ran black on keyvault
return Key._from_key_bundle(bundle)

@distributed_trace_async
Expand All @@ -296,15 +280,7 @@ async def get_deleted_key(self, name: str, **kwargs: "**Any") -> DeletedKey:
:caption: Get a deleted key
:dedent: 8
"""
<<<<<<< HEAD
<<<<<<< HEAD
bundle = await self._client.get_deleted_key(self.vault_endpoint, name, error_map=_error_map, **kwargs)
=======
bundle = await self._client.get_deleted_key(self.vault_endpoint, name, error_map=error_map, **kwargs)
>>>>>>> switched vault_url to vault_endpoint across key vault
=======
bundle = await self._client.get_deleted_key(self.vault_endpoint, name, error_map=_error_map, **kwargs)
>>>>>>> ran black on keyvault
return DeletedKey._from_deleted_key_bundle(bundle)

@distributed_trace
Expand Down Expand Up @@ -473,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 @@ -501,15 +477,7 @@ async def backup_key(self, name: str, **kwargs: "**Any") -> bytes:
:caption: Get a key backup
:dedent: 8
"""
<<<<<<< HEAD
<<<<<<< HEAD
backup_result = await self._client.backup_key(self.vault_endpoint, name, error_map=_error_map, **kwargs)
=======
backup_result = await self._client.backup_key(self.vault_endpoint, name, error_map=error_map, **kwargs)
>>>>>>> switched vault_url to vault_endpoint across key vault
=======
backup_result = await self._client.backup_key(self.vault_endpoint, name, error_map=_error_map, **kwargs)
>>>>>>> ran black on keyvault
return backup_result.value

@distributed_trace_async
Expand All @@ -535,15 +503,7 @@ async def restore_key(self, backup: bytes, **kwargs: "**Any") -> Key:
:caption: Restore a key backup
:dedent: 8
"""
<<<<<<< HEAD
<<<<<<< HEAD
bundle = await self._client.restore_key(self.vault_endpoint, backup, error_map=_error_map, **kwargs)
=======
bundle = await self._client.restore_key(self.vault_endpoint, backup, error_map=error_map, **kwargs)
>>>>>>> switched vault_url to vault_endpoint across key vault
=======
bundle = await self._client.restore_key(self.vault_endpoint, backup, error_map=_error_map, **kwargs)
>>>>>>> ran black on keyvault
return Key._from_key_bundle(bundle)

@distributed_trace_async
Expand Down
Loading