Update samples to KV 1.x

README.md

@@ -6,7 +6,7 @@ author: lmazuel
 
 # Deploy Certificates to VMs from customer-managed Key Vault in Python
 
-This sample explains how you can create a VM in Python, with certificates installed automatically 
+This sample explains how you can create a VM in Python, with certificates installed automatically
 from a Key Vault account.
 
 ## Getting Started
@@ -24,7 +24,7 @@ or [the portal](https://azure.microsoft.com/documentation/articles/resource-grou
 
 1.  If you don't already have it, [install Python](https://www.python.org/downloads/).
 
-    This sample (and the SDK) is compatible with Python 2.7, 3.4, 3.5 and 3.6.
+    This sample (and the SDK) is compatible with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
 
 2.  We recommend that you use a [virtual environment](https://docs.python.org/3/tutorial/venv.html)
     to run this example, but it's not required.
@@ -119,7 +119,7 @@ You can also found different example on how to create a Key Vault account:
   - From Python SDK: https://github.com/Azure-Samples/key-vault-python-manage
 
 > In order to execute this sample, your Key Vault account MUST have the "enabled-for-deployment" special permission.
-  The EnabledForDeployment flag explicitly gives Azure (Microsoft.Compute resource provider) permission to use the certificates stored as secrets for this deployment. 
+  The EnabledForDeployment flag explicitly gives Azure (Microsoft.Compute resource provider) permission to use the certificates stored as secrets for this deployment.
 
 > Note that access policy takes an *object_id*, not a client_id as parameter. This samples also provide a quick way to convert a Service Principal client_id to an object_id using the `azure-graphrbac` client.
 
@@ -136,9 +136,14 @@ You can also found different example on how to create a Key Vault account:
 An example of `DEFAULT_POLICY` is described in the sample file:
 ```python
 DEFAULT_POLICY = CertificatePolicy(
-    KeyProperties(True, 'RSA', 2048, True),
-    SecretProperties('application/x-pkcs12'),
-    issuer_parameters=IssuerParameters('Self'),
+    key_properties=KeyProperties(
+        exportable=True,
+        key_type='RSA',
+        key_size=2048,
+        reuse_key=True
+    ),
+    secret_properties=SecretProperties(content_type='application/x-pkcs12'),
+    issuer_parameters=IssuerParameters(name='Self'),
     x509_certificate_properties=X509CertificateProperties(
         subject='CN=CLIGetDefaultPolicy',
         validity_in_months=12,

example.py

@@ -34,9 +34,14 @@
 # - Is pre-configured in the Portal when you choose "Generate" in the Certificates tab
 # - You get when you use the CLI 2.0: az keyvault certificate get-default-policy
 DEFAULT_POLICY = CertificatePolicy(
-    KeyProperties(True, 'RSA', 2048, True),
-    SecretProperties('application/x-pkcs12'),
-    issuer_parameters=IssuerParameters('Self'),
+    key_properties=KeyProperties(
+        exportable=True,
+        key_type='RSA',
+        key_size=2048,
+        reuse_key=True
+    ),
+    secret_properties=SecretProperties(content_type='application/x-pkcs12'),
+    issuer_parameters=IssuerParameters(name='Self'),
     x509_certificate_properties=X509CertificateProperties(
         subject='CN=CLIGetDefaultPolicy',
         validity_in_months=12,
@@ -123,7 +128,7 @@ def run_example():
 
     # Create Key Vault account
     print('\nCreate Key Vault account')
-    vault = kv_mgmt_client.vaults.create_or_update(
+    async_vault_poller = kv_mgmt_client.vaults.create_or_update(
         GROUP_NAME,
         KV_NAME,
         {
@@ -147,6 +152,7 @@ def run_example():
             }
         }
     )
+    vault = async_vault_poller.result()
     print_item(vault)
 
     # # KeyVault recommentation is to wait 20 seconds after account creation for DNS update
@@ -172,7 +178,7 @@ def run_example():
             time.sleep(10)
         except KeyboardInterrupt:
             print("Certificate creation wait cancelled.")
-            raise        
+            raise
     print_item(check)
 
     print('\nGet Key Vault created certificate as a secret')
@@ -275,7 +281,7 @@ def resolve_service_principal(identifier):
         graphrbac_credentials,
         os.environ['AZURE_TENANT_ID']
     )
-    
+
     result = list(graphrbac_client.service_principals.list(filter="servicePrincipalNames/any(c:c eq '{}')".format(identifier)))
     if result:
         return result[0].object_id

requirements.txt

@@ -1,7 +1,7 @@
-azure-mgmt-resource>=1.1.0
-azure-mgmt-compute>=2.1.0
-azure-mgmt-network>=1.4.0
-azure-mgmt-keyvault>=0.40.0
-azure-keyvault>=0.3.7
-azure-graphrbac>=0.33.0
+azure-mgmt-resource>=2.0.0
+azure-mgmt-compute>=4.0.1
+azure-mgmt-network>=2.1.0
+azure-mgmt-keyvault>=1.1.0
+azure-keyvault>=1.1.0
+azure-graphrbac>=0.40.0
 haikunator