Apply feedback from keys library

Author: mccoyp

sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_parse_id.py

@@ -9,6 +9,7 @@
 def parse_key_vault_secret_id(source_id):
     # type: (str) -> KeyVaultResourceId
     """Parses a secret's full ID into a class with parsed contents as attributes.
+
     :param str source_id: the full original identifier of a secret
     :returns: Returns a parsed secret ID as a :class:`KeyVaultResourceId`
     :rtype: ~azure.keyvault.secrets.KeyVaultResourceId

sdk/keyvault/azure-keyvault-secrets/azure/keyvault/secrets/_shared/__init__.py

@@ -29,11 +29,12 @@
 
 class KeyVaultResourceId():
     """Represents a Key Vault identifier and its parsed contents.
-        :param str source_id: The complete identifier received from Key Vault
-        :param str vault_url: The vault URL
-        :param str name: The name extracted from the ID
-        :param str version: The version extracted from the ID
-        """
+
+    :param str source_id: The complete identifier received from Key Vault
+    :param str vault_url: The vault URL
+    :param str name: The name extracted from the ID
+    :param str version: The version extracted from the ID
+    """
 
     def __init__(
             self,

sdk/keyvault/azure-keyvault-secrets/tests/recordings/test_parse_id.test_parse_secret_id_with_version.yaml

@@ -28,7 +28,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Fri, 06 Nov 2020 01:59:17 GMT
+      - Fri, 06 Nov 2020 23:51:37 GMT
       expires:
       - '-1'
       pragma:
@@ -70,7 +70,7 @@ interactions:
     uri: https://vaultname.vault.azure.net/secrets/secretce671360?api-version=7.1
   response:
     body:
-      string: '{"value":"secret_value","id":"https://vaultname.vault.azure.net/secrets/secretce671360/82b4c68fbf654bff953bd26a4a5f5f1e","attributes":{"enabled":true,"created":1604627958,"updated":1604627958,"recoveryLevel":"Recoverable+Purgeable","recoverableDays":90}}'
+      string: '{"value":"secret_value","id":"https://vaultname.vault.azure.net/secrets/secretce671360/0fb32b11fdbf47eb9973e04a064a5b3f","attributes":{"enabled":true,"created":1604706698,"updated":1604706698,"recoveryLevel":"Recoverable+Purgeable","recoverableDays":90}}'
     headers:
       cache-control:
       - no-cache
@@ -79,7 +79,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Fri, 06 Nov 2020 01:59:17 GMT
+      - Fri, 06 Nov 2020 23:51:38 GMT
       expires:
       - '-1'
       pragma:
@@ -114,7 +114,7 @@ interactions:
     uri: https://vaultname.vault.azure.net/secrets/secretce671360/?api-version=7.1
   response:
     body:
-      string: '{"value":"secret_value","id":"https://vaultname.vault.azure.net/secrets/secretce671360/82b4c68fbf654bff953bd26a4a5f5f1e","attributes":{"enabled":true,"created":1604627958,"updated":1604627958,"recoveryLevel":"Recoverable+Purgeable","recoverableDays":90}}'
+      string: '{"value":"secret_value","id":"https://vaultname.vault.azure.net/secrets/secretce671360/0fb32b11fdbf47eb9973e04a064a5b3f","attributes":{"enabled":true,"created":1604706698,"updated":1604706698,"recoveryLevel":"Recoverable+Purgeable","recoverableDays":90}}'
     headers:
       cache-control:
       - no-cache
@@ -123,7 +123,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Fri, 06 Nov 2020 01:59:17 GMT
+      - Fri, 06 Nov 2020 23:51:38 GMT
       expires:
       - '-1'
       pragma:

sdk/keyvault/azure-keyvault-secrets/tests/test_parse_id.py

@@ -2,21 +2,17 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 # -------------------------------------
-import functools
 from azure.keyvault.secrets import SecretClient, parse_key_vault_secret_id
 from devtools_testutils import ResourceGroupPreparer, KeyVaultPreparer
 
-from _shared.preparer import KeyVaultClientPreparer as _KeyVaultClientPreparer
+from _shared.preparer import KeyVaultClientPreparer
 from _shared.test_case import KeyVaultTestCase
 
-# pre-apply the client_cls positional argument so it needn't be explicitly passed below
-KeyVaultClientPreparer = functools.partial(_KeyVaultClientPreparer, SecretClient)
-
 
 class TestParseId(KeyVaultTestCase):
     @ResourceGroupPreparer(random_name_enabled=True)
     @KeyVaultPreparer()
-    @KeyVaultClientPreparer()
+    @KeyVaultClientPreparer(SecretClient)
     def test_parse_secret_id_with_version(self, client):
         secret_name = self.get_resource_name("secret")
         secret_value = "secret_value"
@@ -32,31 +28,27 @@ def test_parse_secret_id_with_version(self, client):
         print(parsed_secret_id.version)
         print(parsed_secret_id.source_id)
         # [END parse_key_vault_secret_id]
-        self.assertEqual(parsed_secret_id.name, secret_name)
-        self.assertEqual(parsed_secret_id.vault_url, client.vault_url)
-        self.assertEqual(parsed_secret_id.version, secret.properties.version)
-        self.assertEqual(parsed_secret_id.source_id, secret.id)
-
-    def test_parse_secret_id_with_pending_version(self):
-        source_id = "https://keyvault-name.vault.azure.net/secrets/secret-name/pending"
-        parsed_secret_id = parse_key_vault_secret_id(source_id)
-
-        self.assertEqual(parsed_secret_id.name, "secret-name")
-        self.assertEqual(parsed_secret_id.vault_url, "https://keyvault-name.vault.azure.net")
-        self.assertEqual(parsed_secret_id.version, "pending")
-        self.assertEqual(
-            parsed_secret_id.source_id,
-            "https://keyvault-name.vault.azure.net/secrets/secret-name/pending",
-        )
-
-    def test_parse_deleted_secret_id(self):
-        source_id = "https://keyvault-name.vault.azure.net/deletedsecrets/deleted-secret"
-        parsed_secret_id = parse_key_vault_secret_id(source_id)
-
-        self.assertEqual(parsed_secret_id.name, "deleted-secret")
-        self.assertEqual(parsed_secret_id.vault_url, "https://keyvault-name.vault.azure.net")
-        self.assertIsNone(parsed_secret_id.version)
-        self.assertEqual(
-            parsed_secret_id.source_id,
-            "https://keyvault-name.vault.azure.net/deletedsecrets/deleted-secret",
-        )
+        assert parsed_secret_id.name == secret_name
+        assert parsed_secret_id.vault_url == client.vault_url
+        assert parsed_secret_id.version == secret.properties.version
+        assert parsed_secret_id.source_id == secret.id
+
+
+def test_parse_secret_id_with_pending_version():
+    source_id = "https://keyvault-name.vault.azure.net/secrets/secret-name/pending"
+    parsed_secret_id = parse_key_vault_secret_id(source_id)
+
+    assert parsed_secret_id.name == "secret-name"
+    assert parsed_secret_id.vault_url == "https://keyvault-name.vault.azure.net"
+    assert parsed_secret_id.version == "pending"
+    assert parsed_secret_id.source_id == "https://keyvault-name.vault.azure.net/secrets/secret-name/pending"
+
+
+def test_parse_deleted_secret_id():
+    source_id = "https://keyvault-name.vault.azure.net/deletedsecrets/deleted-secret"
+    parsed_secret_id = parse_key_vault_secret_id(source_id)
+
+    assert parsed_secret_id.name == "deleted-secret"
+    assert parsed_secret_id.vault_url == "https://keyvault-name.vault.azure.net"
+    assert parsed_secret_id.version is None
+    assert parsed_secret_id.source_id == "https://keyvault-name.vault.azure.net/deletedsecrets/deleted-secret"