[KV-keys]Name change in SKR (Azure#21609)

Author: Yalin Li

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

@@ -130,7 +130,7 @@ def create_key(self, name, key_type, **kwargs):
 
         policy = kwargs.pop("release_policy", None)
         if policy is not None:
-            policy = self._models.KeyReleasePolicy(data=policy.data, content_type=policy.content_type)
+            policy = self._models.KeyReleasePolicy(data=policy.encoded_policy, content_type=policy.content_type)
         parameters = self._models.KeyCreateParameters(
             kty=key_type,
             key_size=kwargs.pop("size", None),
@@ -559,7 +559,7 @@ def update_key_properties(self, name, version=None, **kwargs):
 
         policy = kwargs.pop("release_policy", None)
         if policy is not None:
-            policy = self._models.KeyReleasePolicy(content_type=policy.content_type, data=policy.data)
+            policy = self._models.KeyReleasePolicy(content_type=policy.content_type, data=policy.encoded_policy)
         parameters = self._models.KeyUpdateParameters(
             key_ops=kwargs.pop("key_operations", None),
             key_attributes=attributes,
@@ -676,7 +676,7 @@ def import_key(self, name, key, **kwargs):
 
         policy = kwargs.pop("release_policy", None)
         if policy is not None:
-            policy = self._models.KeyReleasePolicy(content_type=policy.content_type, data=policy.data)
+            policy = self._models.KeyReleasePolicy(content_type=policy.content_type, data=policy.encoded_policy)
         parameters = self._models.KeyImportParameters(
             key=key._to_generated_model(),
             key_attributes=attributes,
@@ -695,15 +695,15 @@ def import_key(self, name, key, **kwargs):
         return KeyVaultKey._from_key_bundle(bundle)
 
     @distributed_trace
-    def release_key(self, name, target, version=None, **kwargs):
+    def release_key(self, name, target_attestation_token, version=None, **kwargs):
         # type: (str, str, Optional[str], **Any) -> ReleaseKeyResult
         """Releases a key.
 
         The release key operation is applicable to all key types. The target key must be marked
         exportable. This operation requires the keys/release permission.
 
         :param str name: The name of the key to get.
-        :param str target: The attestation assertion for the target of the key release.
+        :param str target_attestation_token: The attestation assertion for the target of the key release.
         :param str version: (optional) A specific version of the key to release. If unspecified, the latest version is
             released.
 
@@ -720,7 +720,7 @@ def release_key(self, name, target, version=None, **kwargs):
             key_name=name,
             key_version=version or "",
             parameters=self._models.KeyReleaseParameters(
-                target=target, nonce=kwargs.pop("nonce", None), enc=kwargs.pop("algorithm", None)
+                target=target_attestation_token, nonce=kwargs.pop("nonce", None), enc=kwargs.pop("algorithm", None)
             ),
             **kwargs
         )

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

@@ -264,7 +264,7 @@ class KeyReleasePolicy(object):
 
     def __init__(self, data, **kwargs):
         # type: (bytes, **Any) -> None
-        self.data = data
+        self.encoded_policy = data
         self.content_type = kwargs.get("content_type", None)
 
 

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

@@ -129,7 +129,7 @@ async def create_key(self, name: str, key_type: "Union[str, KeyType]", **kwargs:
 
         policy = kwargs.pop("release_policy", None)
         if policy is not None:
-            policy = self._models.KeyReleasePolicy(data=policy.data, content_type=policy.content_type)
+            policy = self._models.KeyReleasePolicy(data=policy.encoded_policy, content_type=policy.content_type)
         parameters = self._models.KeyCreateParameters(
             kty=key_type,
             key_size=kwargs.pop("size", None),
@@ -540,7 +540,7 @@ async def update_key_properties(self, name: str, version: "Optional[str]" = None
 
         policy = kwargs.pop("release_policy", None)
         if policy is not None:
-            policy = self._models.KeyReleasePolicy(content_type=policy.content_type, data=policy.data)
+            policy = self._models.KeyReleasePolicy(content_type=policy.content_type, data=policy.encoded_policy)
         parameters = self._models.KeyUpdateParameters(
             key_ops=kwargs.pop("key_operations", None),
             key_attributes=attributes,
@@ -654,7 +654,7 @@ async def import_key(self, name: str, key: JsonWebKey, **kwargs: "Any") -> KeyVa
 
         policy = kwargs.pop("release_policy", None)
         if policy is not None:
-            policy = self._models.KeyReleasePolicy(content_type=policy.content_type, data=policy.data)
+            policy = self._models.KeyReleasePolicy(content_type=policy.content_type, data=policy.encoded_policy)
         parameters = self._models.KeyImportParameters(
             key=key._to_generated_model(),
             key_attributes=attributes,
@@ -674,15 +674,15 @@ async def import_key(self, name: str, key: JsonWebKey, **kwargs: "Any") -> KeyVa
 
     @distributed_trace_async
     async def release_key(
-        self, name: str, target: str, version: "Optional[str]" = None, **kwargs: "Any"
+        self, name: str, target_attestation_token: str, version: "Optional[str]" = None, **kwargs: "Any"
     ) -> ReleaseKeyResult:
         """Releases a key.
 
         The release key operation is applicable to all key types. The target key must be marked
         exportable. This operation requires the keys/release permission.
 
         :param str name: The name of the key to get.
-        :param str target: The attestation assertion for the target of the key release.
+        :param str target_attestation_token: The attestation assertion for the target of the key release.
         :param str version: (optional) A specific version of the key to release. If unspecified, the latest version is
             released.
 
@@ -699,7 +699,7 @@ async def release_key(
             key_name=name,
             key_version=version or "",
             parameters=self._models.KeyReleaseParameters(
-                target=target, nonce=kwargs.pop("nonce", None), enc=kwargs.pop("algorithm", None)
+                target=target_attestation_token, nonce=kwargs.pop("nonce", None), enc=kwargs.pop("algorithm", None)
             ),
             **kwargs
         )

sdk/keyvault/azure-keyvault-keys/tests/test_key_client.py

@@ -141,7 +141,7 @@ def _update_key_properties(self, client, key, release_policy=None):
         assert key.properties.updated_on != key_bundle.properties.updated_on
         assert sorted(key_ops) == sorted(key_bundle.key_operations)
         if release_policy:
-            assert key.properties.release_policy.data != key_bundle.properties.release_policy.data
+            assert key.properties.release_policy.encoded_policy != key_bundle.properties.release_policy.encoded_policy
         return key_bundle
 
     def _import_test_key(self, client, name, hardware_protected=False, **kwargs):
@@ -500,7 +500,7 @@ def test_key_release(self, client, **kwargs):
             client, rsa_key_name, hardware_protected=True, exportable=True, release_policy=release_policy
         )
         assert key.properties.release_policy
-        assert key.properties.release_policy.data
+        assert key.properties.release_policy.encoded_policy
         assert key.properties.exportable
 
         release_result = client.release_key(rsa_key_name, attestation)
@@ -518,7 +518,7 @@ def test_imported_key_release(self, client, **kwargs):
             client, imported_key_name, hardware_protected=True, exportable=True, release_policy=release_policy
         )
         assert key.properties.release_policy
-        assert key.properties.release_policy.data
+        assert key.properties.release_policy.encoded_policy
         assert key.properties.exportable
 
         release_result = client.release_key(imported_key_name, attestation)
@@ -533,7 +533,7 @@ def test_update_release_policy(self, client, **kwargs):
         key = self._create_rsa_key(
             client, key_name, hardware_protected=True, exportable=True, release_policy=release_policy
         )
-        assert key.properties.release_policy.data
+        assert key.properties.release_policy.encoded_policy
 
         new_release_policy_json = {
             "anyOf": [

sdk/keyvault/azure-keyvault-keys/tests/test_keys_async.py

@@ -128,7 +128,7 @@ async def _update_key_properties(self, client, key, release_policy=None):
         assert key.properties.updated_on != key_bundle.properties.updated_on
         assert sorted(key_ops) == sorted(key_bundle.key_operations)
         if release_policy:
-            assert key.properties.release_policy.data != key_bundle.properties.release_policy.data
+            assert key.properties.release_policy.encoded_policy != key_bundle.properties.release_policy.encoded_policy
         return key_bundle
 
     async def _validate_key_list(self, keys, expected):
@@ -497,7 +497,7 @@ async def test_key_release(self, client, **kwargs):
             client, rsa_key_name, hardware_protected=True, exportable=True, release_policy=release_policy
         )
         assert key.properties.release_policy
-        assert key.properties.release_policy.data
+        assert key.properties.release_policy.encoded_policy
         assert key.properties.exportable
 
         release_result = await client.release_key(rsa_key_name, attestation)
@@ -515,7 +515,7 @@ async def test_imported_key_release(self, client, **kwargs):
             client, imported_key_name, hardware_protected=True, exportable=True, release_policy=release_policy
         )
         assert key.properties.release_policy
-        assert key.properties.release_policy.data
+        assert key.properties.release_policy.encoded_policy
         assert key.properties.exportable
 
         release_result = await client.release_key(imported_key_name, attestation)
@@ -530,7 +530,7 @@ async def test_update_release_policy(self, client, **kwargs):
         key = await self._create_rsa_key(
             client, key_name, hardware_protected=True, exportable=True, release_policy=release_policy
         )
-        assert key.properties.release_policy.data
+        assert key.properties.release_policy.encoded_policy
 
         new_release_policy_json = {
             "anyOf": [