Key Vault: Flattening out KeyProperties from CertificiatePolicy (Azur…

…e#7559) * moved default policy to a getter in CertificatePolicy * flattened out KeyProperties * implemented Charles' comments from previous PR * fixed pylint errors * copied over certificate and certificateproperties from master * ran black on certificates * implemented Charles' comments
YijunXieMS · Oct 9, 2019 · b460fa0 · b460fa0
1 parent 575509d
commit b460fa0
Show file tree

Hide file tree

Showing 32 changed files with 1,078 additions and 1,353 deletions.
diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/__init__.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/__init__.py
@@ -4,13 +4,7 @@
 # ------------------------------------
 from .client import CertificateClient
 from .enums import ActionType, KeyCurveName, KeyType, SecretContentType, KeyUsageType
-from .models import (
-    AdministratorDetails,
-    CertificatePolicy,
-    Contact,
-    KeyProperties,
-    LifetimeAction
-)
+from .models import AdministratorDetails, CertificatePolicy, Contact, LifetimeAction
 
 __all__ = [
     "ActionType",
@@ -20,8 +14,7 @@
     "Contact",
     "KeyCurveName",
     "KeyType",
-    "KeyProperties",
     "KeyUsageType",
     "LifetimeAction",
-    "SecretContentType"
+    "SecretContentType",
 ]
diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_polling.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/_polling.py
@@ -33,7 +33,7 @@ def run(self):
             while not self.finished():
                 self._update_status()
                 time.sleep(self._polling_interval)
-            if self._pending_certificate_op.status.lower() == 'completed':
+            if self._pending_certificate_op.status.lower() == "completed":
                 self._resource = self._get_certificate_command()
             else:
                 self._resource = self._pending_certificate_op
@@ -43,9 +43,9 @@ def run(self):
 
     def finished(self):
         # type: () -> bool
-        if self._pending_certificate_op.issuer_name.lower() == 'unknown':
+        if self._pending_certificate_op.issuer_name.lower() == "unknown":
             return True
-        return self._pending_certificate_op.status.lower() != 'inprogress'
+        return self._pending_certificate_op.status.lower() != "inprogress"
 
     def resource(self):
         # type: () -> Any

diff --git a/...ault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py b/...ault/azure-keyvault-certificates/azure/keyvault/certificates/_shared/async_client_base.py
@@ -28,9 +28,7 @@ class AsyncKeyVaultClientBase:
     """Base class for async Key Vault clients"""
 
     @staticmethod
-    def _create_config(
-        credential: "TokenCredential", api_version: str = None, **kwargs: "**Any"
-    ) -> Configuration:
+    def _create_config(credential: "TokenCredential", api_version: str = None, **kwargs: "**Any") -> Configuration:
         if api_version is None:
             api_version = KeyVaultClient.DEFAULT_API_VERSION
         config = KeyVaultClient.get_configuration_class(api_version, aio=True)(credential, **kwargs)

diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/aio/__init__.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/aio/__init__.py
@@ -4,19 +4,5 @@
 # ------------------------------------
 
 from .client import CertificateClient
-from ..enums import ActionType, KeyCurveName, KeyType, SecretContentType, KeyUsageType
-from ..models import AdministratorDetails, CertificatePolicy, Contact, KeyProperties, LifetimeAction
 
-__all__ = [
-    "ActionType",
-    "AdministratorDetails",
-    "CertificateClient",
-    "CertificatePolicy",
-    "Contact",
-    "KeyCurveName",
-    "KeyType",
-    "KeyProperties",
-    "KeyUsageType",
-    "LifetimeAction",
-    "SecretContentType"
-]
+__all__ = ["CertificateClient"]
diff --git a/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/aio/_polling_async.py b/sdk/keyvault/azure-keyvault-certificates/azure/keyvault/certificates/aio/_polling_async.py
@@ -33,7 +33,7 @@ async def run(self) -> None:
             while not self.finished():
                 await self._update_status()
                 await asyncio.sleep(self._polling_interval)
-            if self._pending_certificate_op.status.lower() == 'completed':
+            if self._pending_certificate_op.status.lower() == "completed":
                 self._resource = await self._get_certificate_command()
             else:
                 self._resource = self._pending_certificate_op
@@ -42,9 +42,9 @@ async def run(self) -> None:
             raise
 
     def finished(self) -> bool:
-        if self._pending_certificate_op.issuer_name.lower() == 'unknown':
+        if self._pending_certificate_op.issuer_name.lower() == "unknown":
             return True
-        return self._pending_certificate_op.status.lower() != 'inprogress'
+        return self._pending_certificate_op.status.lower() != "inprogress"
 
     def resource(self) -> Any:
         return self._resource