Merge pull request #3053 from schaabs/dp-multi-api

[KeyVault] Data-plane updates to support multi api
Azure · Aug 7, 2018 · bfcd947 · bfcd947
2 parents 0d98e5d + 65cb175
commit bfcd947
Show file tree

Hide file tree

Showing 346 changed files with 18,531 additions and 6,353 deletions.
diff --git a/azure-keyvault/azure/keyvault/__init__.py b/azure-keyvault/azure/keyvault/__init__.py
@@ -9,20 +9,20 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .custom import http_bearer_challenge_cache as HttpBearerChallengeCache
-from .custom.http_bearer_challenge import HttpBearerChallenge
-from .custom.http_challenge import HttpChallenge
-from .custom.key_vault_client import CustomKeyVaultClient as KeyVaultClient
-from .custom.key_vault_id import (KeyVaultId,
-                                  KeyId,
-                                  SecretId,
-                                  CertificateId,
-                                  CertificateIssuerId,
-                                  CertificateOperationId,
-                                  StorageAccountId,
-                                  StorageSasDefinitionId)
-from .custom.key_vault_authentication import KeyVaultAuthentication, KeyVaultAuthBase, AccessToken
-from .custom.http_message_security import generate_pop_key
+from . import http_bearer_challenge_cache as HttpBearerChallengeCache
+from .http_challenge import HttpChallenge
+from .http_bearer_challenge import HttpBearerChallenge
+from .key_vault_authentication import KeyVaultAuthentication, KeyVaultAuthBase, AccessToken
+from .http_message_security import generate_pop_key
+from .key_vault_id import (KeyVaultId,
+                           KeyId,
+                           SecretId,
+                           CertificateId,
+                           CertificateIssuerId,
+                           CertificateOperationId,
+                           StorageAccountId,
+                           StorageSasDefinitionId)
+from .key_vault_client import KeyVaultClient
 from .version import VERSION
 
 __all__ = ['KeyVaultClient',

diff --git a/...eyvault/azure/keyvault/custom/internal.py → azure-keyvault/azure/keyvault/_internal.py b/...eyvault/azure/keyvault/custom/internal.py → azure-keyvault/azure/keyvault/_internal.py
@@ -15,7 +15,7 @@
 from cryptography.hazmat.primitives.asymmetric import padding as asym_padding
 from cryptography.hazmat.primitives import hashes, constant_time, padding, hmac
 
-from ..models import JsonWebKey
+from azure.keyvault.models import JsonWebKey
 
 def _a128cbc_hs256_encrypt(key, iv, plaintext, authdata):
     if not key or not len(key) >= 32:

diff --git a/azure-keyvault/azure/keyvault/custom/__init__.py b/azure-keyvault/azure/keyvault/custom/__init__.py
diff --git a/azure-keyvault/azure/keyvault/custom/key_vault_client.py b/azure-keyvault/azure/keyvault/custom/key_vault_client.py
diff --git a/.../keyvault/custom/http_bearer_challenge.py → ...t/azure/keyvault/http_bearer_challenge.py b/.../keyvault/custom/http_bearer_challenge.py → ...t/azure/keyvault/http_bearer_challenge.py
diff --git a/...m/http_bearer_challenge_cache/__init__.py → ...t/http_bearer_challenge_cache/__init__.py b/...m/http_bearer_challenge_cache/__init__.py → ...t/http_bearer_challenge_cache/__init__.py
diff --git a/...t/azure/keyvault/custom/http_challenge.py → ...keyvault/azure/keyvault/http_challenge.py b/...t/azure/keyvault/custom/http_challenge.py → ...keyvault/azure/keyvault/http_challenge.py
diff --git a/.../keyvault/custom/http_message_security.py → ...t/azure/keyvault/http_message_security.py b/.../keyvault/custom/http_message_security.py → ...t/azure/keyvault/http_message_security.py
@@ -6,7 +6,7 @@
 import json
 import time
 import os
-from .internal import _a128cbc_hs256_encrypt, _a128cbc_hs256_decrypt, _JwsHeader, _JwsObject, \
+from ._internal import _a128cbc_hs256_encrypt, _a128cbc_hs256_decrypt, _JwsHeader, _JwsObject, \
     _JweHeader, _JweObject, _str_to_b64url, _bstr_to_b64url, _b64_to_bstr, _RsaKey
 
 

diff --git a/...yvault/custom/key_vault_authentication.py → ...zure/keyvault/key_vault_authentication.py b/...yvault/custom/key_vault_authentication.py → ...zure/keyvault/key_vault_authentication.py
@@ -3,18 +3,18 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 #---------------------------------------------------------------------------------------------
 
-import threading
-import requests
 import inspect
+import threading
 from collections import namedtuple
+
+import requests
+from azure.keyvault import http_bearer_challenge_cache as ChallengeCache
+from azure.keyvault.http_challenge import HttpChallenge
+from azure.keyvault.http_message_security import HttpMessageSecurity
+from azure.keyvault._internal import _RsaKey
+from msrest.authentication import OAuthTokenAuthentication
 from requests.auth import AuthBase
 from requests.cookies import extract_cookies_to_jar
-from .http_challenge import HttpChallenge
-from . import http_bearer_challenge_cache as ChallengeCache
-from msrest.authentication import OAuthTokenAuthentication
-from .http_message_security import HttpMessageSecurity
-from .internal import _RsaKey
-
 
 AccessToken = namedtuple('AccessToken', ['scheme', 'token', 'key'])
 AccessToken.__new__.__defaults__ = ('Bearer', None, None)