Fixed CI issues

Author: Nicola Camillucci

sdk/keyvault/azure-keyvault-administration/README.md

@@ -219,8 +219,7 @@ role_definition = client.set_role_definition(scope=scope, role_name=role_name, p
 ```python
 new_permissions = [
     KeyVaultPermission(
-        data_actions=[KeyVaultDataAction.READ_HSM_KEY],
-        not_data_actions=[KeyVaultDataAction.CREATE_HSM_KEY]
+        data_actions=[KeyVaultDataAction.READ_HSM_KEY], not_data_actions=[KeyVaultDataAction.CREATE_HSM_KEY]
     )
 ]
 unique_definition_name = role_definition.name

sdk/keyvault/azure-keyvault-administration/samples/ekm_operations.py

@@ -3,6 +3,8 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 # ------------------------------------
+import os
+import base64
 
 # ----------------------------------------------------------------------------------------------------------
 # Prerequisites:
@@ -38,22 +40,22 @@
 # Instantiate an EKM client that will be used to call the service.
 # Here we use the DefaultAzureCredential, but any azure-identity credential can be used.
 # [START create_a_ekm_client]
-import os
-import base64
 from azure.identity import DefaultAzureCredential
-from azure.keyvault.administration import KeyVaultEkmClient, KeyVaultEkmConnection
+from azure.keyvault.administration import KeyVaultEkmClient
 
 MANAGED_HSM_URL = os.environ["MANAGED_HSM_URL"]
-EKM_PROXY_HOST = os.environ["EKM_PROXY_HOST"]
-CA_CERTIFICATE = os.environ["CA_CERTIFICATE"]
-CA_CERTIFICATES = [CA_CERTIFICATE]
 credential = DefaultAzureCredential()
 client = KeyVaultEkmClient(vault_url=MANAGED_HSM_URL, credential=credential)
 # [END create_a_ekm_client]
 
 # First, let's create an EKM connection
 print("\n.. Create EKM connection")
 # [START create_ekm_connection]
+from azure.keyvault.administration import KeyVaultEkmConnection
+
+EKM_PROXY_HOST = os.environ["EKM_PROXY_HOST"]
+CA_CERTIFICATE = os.environ["CA_CERTIFICATE"]
+CA_CERTIFICATES = [CA_CERTIFICATE]
 ekm_connection = KeyVaultEkmConnection(
     host=EKM_PROXY_HOST,
     server_ca_certificates=[base64.b64decode(cert) for cert in CA_CERTIFICATES],
@@ -70,9 +72,7 @@
 print("Retrieved EKM connection with:")
 print(f"\tHost: {retrieved_ekm_connection.host}")
 print(f"\tPath prefix: {retrieved_ekm_connection.path_prefix}")
-print(
-    f"\tServer subject common name: {retrieved_ekm_connection.server_subject_common_name}"
-)
+print(f"\tServer subject common name: {retrieved_ekm_connection.server_subject_common_name}")
 # [END get_ekm_connection]
 
 # Get the EKM certificate

sdk/keyvault/azure-keyvault-administration/samples/ekm_operations_async.py

@@ -3,6 +3,13 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 # ------------------------------------
+import os
+import base64
+import asyncio
+
+from azure.identity.aio import DefaultAzureCredential
+from azure.keyvault.administration import KeyVaultEkmConnection
+from azure.keyvault.administration.aio import KeyVaultEkmClient
 
 # ----------------------------------------------------------------------------------------------------------
 # Prerequisites:
@@ -37,89 +44,63 @@
 
 # Instantiate an EKM client that will be used to call the service.
 # Here we use the DefaultAzureCredential, but any azure-identity credential can be used.
-# [START create_a_ekm_client]
-import os
-import base64
-import asyncio
-from azure.identity import DefaultAzureCredential
-from azure.keyvault.administration import KeyVaultEkmConnection
-from azure.keyvault.administration.aio import KeyVaultEkmClient
 
 
 async def run_sample():
     MANAGED_HSM_URL = os.environ["MANAGED_HSM_URL"]
-    EKM_PROXY_HOST = os.environ["EKM_PROXY_HOST"]
-    CA_CERTIFICATE = os.environ["CA_CERTIFICATE"]
-    CA_CERTIFICATES = [CA_CERTIFICATE]
     credential = DefaultAzureCredential()
     client = KeyVaultEkmClient(vault_url=MANAGED_HSM_URL, credential=credential)
-    # [END create_a_ekm_client]
 
     # First, let's create an EKM connection
     print("\n.. Create EKM connection")
-    # [START create_ekm_connection]
+    EKM_PROXY_HOST = os.environ["EKM_PROXY_HOST"]
+    CA_CERTIFICATE = os.environ["CA_CERTIFICATE"]
+    CA_CERTIFICATES = [CA_CERTIFICATE]
     ekm_connection = KeyVaultEkmConnection(
         host=EKM_PROXY_HOST,
         server_ca_certificates=[base64.b64decode(cert) for cert in CA_CERTIFICATES],
         path_prefix="/api/v1",
     )
-    created_ekm_connection = await client.create_ekm_connection(
-        connection=ekm_connection
-    )
+    created_ekm_connection = await client.create_ekm_connection(connection=ekm_connection)
     print(f"EKM connection created with host: {created_ekm_connection.host}")
-    # [END create_ekm_connection]
 
     # Let's get the EKM connection we just created
     print("\n.. Get EKM connection")
-    # [START get_ekm_connection]
     retrieved_ekm_connection = await client.get_ekm_connection()
     print("Retrieved EKM connection with:")
     print(f"\tHost: {retrieved_ekm_connection.host}")
     print(f"\tPath prefix: {retrieved_ekm_connection.path_prefix}")
-    print(
-        f"\tServer subject common name: {retrieved_ekm_connection.server_subject_common_name}"
-    )
-    # [END get_ekm_connection]
+    print(f"\tServer subject common name: {retrieved_ekm_connection.server_subject_common_name}")
 
     # Get the EKM certificate
     print("\n.. Get EKM certificate")
-    # [START get_ekm_certificate]
     ekm_certificate = await client.get_ekm_certificate()
-    print(
-        f"EKM certificate retrieved with subject: {ekm_certificate.subject_common_name}"
-    )
-    # [END get_ekm_certificate]
+    print(f"EKM certificate retrieved with subject: {ekm_certificate.subject_common_name}")
 
     # Check the EKM connection status
     print("\n.. Check EKM connection")
-    # [START check_ekm_connection]
     connection_status = await client.check_ekm_connection()
     print("EKM connection status:")
     print(f"\tAPI Version: {connection_status.api_version}")
     print(f"\tProxy Vendor: {connection_status.proxy_vendor}")
     print(f"\tProxy Name: {connection_status.proxy_name}")
     print(f"\tEKM Vendor: {connection_status.ekm_vendor}")
     print(f"\tEKM Product: {connection_status.ekm_product}")
-    # [END check_ekm_connection]
 
     # Update the EKM connection
     print("\n.. Update EKM connection")
-    # [START update_ekm_connection]
     updated_ekm_connection = KeyVaultEkmConnection(
         host="ekm-proxy-updated.contoso.com",
         server_ca_certificates=[base64.b64decode(cert) for cert in CA_CERTIFICATES],
         path_prefix="/api/v2",
     )
     result = await client.update_ekm_connection(connection=updated_ekm_connection)
     print(f"EKM connection updated with host: {result.host}")
-    # [END update_ekm_connection]
 
     # Finally, let's delete the EKM connection
     print("\n.. Delete EKM connection")
-    # [START delete_ekm_connection]
     deleted_ekm_connection = await client.delete_ekm_connection()
     print("EKM connection deleted successfully")
-    # [END delete_ekm_connection]
 
     await client.close()
     await credential.close()