Allow None key_id, try JWK's .kid

sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/_models.py

@@ -68,9 +68,12 @@ def __init__(self, key_id, attributes=None, **kwargs):
         # type: (str, Optional[_models.KeyAttributes], **Any) -> None
         self._attributes = attributes
         self._id = key_id
-        self._vault_id = parse_key_vault_id(key_id)
         self._managed = kwargs.get("managed", None)
         self._tags = kwargs.get("tags", None)
+        try:
+            self._vault_id = parse_key_vault_id(key_id)
+        except:
+            self._vault_id = None
 
     def __repr__(self):
         # type () -> str
@@ -106,7 +109,8 @@ def name(self):
 
         :rtype: str
         """
-        return self._vault_id.name
+        if self._vault_id:
+            return self._vault_id.name
 
     @property
     def version(self):
@@ -115,7 +119,8 @@ def version(self):
 
         :rtype: str
         """
-        return self._vault_id.version
+        if self._vault_id:
+            return self._vault_id.version
 
     @property
     def enabled(self):
@@ -169,7 +174,8 @@ def vault_url(self):
 
         :rtype: str
         """
-        return self._vault_id.vault_url
+        if self._vault_id:
+            return self._vault_id.vault_url
 
     @property
     def recoverable_days(self):

sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/_client.py

@@ -102,21 +102,27 @@ def __init__(self, key, credential, **kwargs):
 
         if isinstance(key, KeyVaultKey):
             self._key = key
-            self._key_id = parse_key_vault_id(key.id)
+            try:
+                self._key_id = parse_key_vault_id(key.id)
+            except ValueError:
+                if not self._local_only:
+                    raise
+                self._key_id = None
         elif isinstance(key, six.string_types):
             self._key = None
             self._key_id = parse_key_vault_id(key)
             self._keys_get_forbidden = None  # type: Optional[bool]
         else:
             raise ValueError("'key' must be a KeyVaultKey instance or a key ID string including a version")
 
-        if not (self._key_id.version or self._local_only):
+        if not (self._local_only or self._key_id.version):
             raise ValueError("'key' must include a version")
 
         self._local_provider = NoLocalCryptography()
         self._initialized = False
 
-        super(CryptographyClient, self).__init__(vault_url=self._key_id.vault_url, credential=credential, **kwargs)
+        vault_url = "vault_url" if not self._key_id else self._key_id.vault_url
+        super(CryptographyClient, self).__init__(vault_url=vault_url, credential=credential, **kwargs)
 
     @property
     def key_id(self):
@@ -125,7 +131,8 @@ def key_id(self):
 
         :rtype: str
         """
-        return self._key_id.source_id
+        if self._key_id:
+            return self._key_id.source_id
 
     @classmethod
     def from_jwk(cls, jwk):
@@ -138,10 +145,9 @@ def from_jwk(cls, jwk):
         """
         if isinstance(jwk, JsonWebKey):
             key = vars(jwk)
-            key_id = jwk.kid
         else:
             key = jwk
-            key_id = jwk.get("kid")
+        key_id = key.get("kid")
         return cls(KeyVaultKey(key_id, key), object(), _local_only=True)
 
     @distributed_trace

sdk/keyvault/azure-keyvault-keys/azure/keyvault/keys/crypto/aio/_client.py

@@ -57,29 +57,36 @@ def __init__(self, key: "Union[KeyVaultKey, str]", credential: "AsyncTokenCreden
 
         if isinstance(key, KeyVaultKey):
             self._key = key
-            self._key_id = parse_key_vault_id(key.id)
+            try:
+                self._key_id = parse_key_vault_id(key.id)
+            except ValueError:
+                if not self._local_only:
+                    raise
+                self._key_id = None
         elif isinstance(key, str):
             self._key = None
             self._key_id = parse_key_vault_id(key)
             self._keys_get_forbidden = None  # type: Optional[bool]
         else:
             raise ValueError("'key' must be a KeyVaultKey instance or a key ID string including a version")
 
-        if not (self._key_id.version or self._local_only):
+        if not (self._local_only or self._key_id.version):
             raise ValueError("'key' must include a version")
 
         self._local_provider = NoLocalCryptography()
         self._initialized = False
 
-        super().__init__(vault_url=self._key_id.vault_url, credential=credential, **kwargs)
+        vault_url = "vault_url" if not self._key_id else self._key_id.vault_url
+        super().__init__(vault_url=vault_url, credential=credential, **kwargs)
 
     @property
     def key_id(self) -> str:
         """The full identifier of the client's key.
 
         :rtype: str
         """
-        return self._key_id.source_id
+        if self._key_id:
+            return self._key_id.source_id
 
     @classmethod
     def from_jwk(cls, jwk: "Union[JsonWebKey, dict]") -> "CryptographyClient":
@@ -91,10 +98,9 @@ def from_jwk(cls, jwk: "Union[JsonWebKey, dict]") -> "CryptographyClient":
         """
         if isinstance(jwk, JsonWebKey):
             key = vars(jwk)
-            key_id = jwk.kid
         else:
             key = jwk
-            key_id = jwk.get("kid")
+        key_id = key.get("kid")
         return cls(KeyVaultKey(key_id, key), object(), _local_only=True)
 
     @distributed_trace_async