KV client and auth file

sdk/core/azure-common/HISTORY.rst

@@ -3,6 +3,11 @@
 Release History
 ===============
 
+1.1.22 (2019-06-06)
++++++++++++++++++++
+
+- Fix KeyVaultClient support for get_client_from_auth_file
+
 1.1.21 (2019-05-21)
 +++++++++++++++++++
 

sdk/core/azure-common/azure/common/_version.py

@@ -4,4 +4,4 @@
 # license information.
 #--------------------------------------------------------------------------
 
-VERSION = "1.1.21"
+VERSION = "1.1.22"

sdk/core/azure-common/azure/common/client_factory.py

@@ -22,10 +22,10 @@
 
 
 def _instantiate_client(client_class, **kwargs):
-    """Instantiate a client from kwargs, removing the subscription_id/tenant_id argument if unsupported.
+    """Instantiate a client from kwargs, removing the subscription_id/tenant_id/base_url argument if unsupported.
     """
     args = get_arg_spec(client_class.__init__).args
-    for key in ['subscription_id', 'tenant_id']:
+    for key in ['subscription_id', 'tenant_id', 'base_url']:
         if key not in kwargs:
             continue
         if key not in args:
@@ -144,6 +144,7 @@ def get_client_from_json_dict(client_class, config_dict, **kwargs):
     :return: An instantiated client
     """
     is_graphrbac = client_class.__name__ == 'GraphRbacManagementClient'
+    is_keyvault = client_class.__name__ == 'KeyVaultClient'
     parameters = {
         'subscription_id': config_dict.get('subscriptionId'),
         'base_url': config_dict.get('resourceManagerEndpointUrl'),
@@ -156,6 +157,8 @@ def get_client_from_json_dict(client_class, config_dict, **kwargs):
         # Get the right resource for Credentials
         if is_graphrbac:
             resource = config_dict['activeDirectoryGraphResourceId']
+        elif is_keyvault:
+            resource = "https://vault.azure.net"
         else:
             if "activeDirectoryResourceId" not in config_dict and 'resourceManagerEndpointUrl' not in config_dict:
                 raise ValueError("Need activeDirectoryResourceId or resourceManagerEndpointUrl key")

sdk/core/azure-common/tests/test_client_factory.py

@@ -148,6 +148,13 @@ def __init__(self, credentials, tenant_id, base_url):
                 self.tenant_id = tenant_id
                 self.base_url = base_url
 
+        class KeyVaultClient(object):
+            def __init__(self, credentials):
+                if credentials is None:
+                    raise ValueError("Parameter 'credentials' must not be None.")
+
+                self.credentials = credentials
+
         for encoding in ['utf-8', 'utf-8-sig', 'ascii']:
 
             temp_auth_file = tempfile.NamedTemporaryFile(delete=False)
@@ -195,6 +202,13 @@ def __init__(self, credentials, tenant_id, base_url):
                 'password'
             )
 
+            client = get_client_from_auth_file(KeyVaultClient, temp_auth_file.name)
+            assert client.credentials._args == (
+                "https://vault.azure.net",
+                'a2ab11af-01aa-4759-8345-7803287dbd39',
+                'password'
+            )
+
             os.unlink(temp_auth_file.name)