update azure-cli to 2.25.0 (#922)

src/cli/requirements.txt

@@ -11,7 +11,11 @@ azure-storage-blob~=12.8
 azure-applicationinsights==0.1.0
 tenacity==6.3.1
 docstring_parser==0.7.3
-azure-cli-core==2.22.1
+azure-cli-core==2.25.0
+# urllib3[secure] needs to be specifically stated for azure-cli-core
+urllib3[secure]>=1.26.5
+# iDNA needs to be specifically stated for azure-cli-core
+idna<3,>=2.5
 # cryptography needs to be pinned to the version used by azure-cli-core
 cryptography<3.4,>=3.2
 # PyJWT needs to be pinned to the version used by azure-cli-core

src/deployment/deploy.py

@@ -514,7 +514,7 @@ class Client:
             count += 1
 
             try:
-                result = client.deployments.create_or_update(
+                result = client.deployments.begin_create_or_update(
                     self.resource_group, gen_guid(), deployment
                 ).result()
                 if result.properties.provisioning_state != "Succeeded":
@@ -616,7 +616,7 @@ class Client:
         client = get_client_from_cli_profile(
             EventGridManagementClient, subscription_id=self.get_subscription_id()
         )
-        result = client.event_subscriptions.create_or_update(
+        result = client.event_subscriptions.begin_create_or_update(
             src_resource_id, "onefuzz1", event_subscription_info
         ).result()
         if result.provisioning_state != "Succeeded":

src/deployment/requirements.txt

@@ -1,12 +1,13 @@
-azure-cli-core==2.23.0
-azure-cli==2.23.0
+azure-cli-core==2.25.0
+azure-cli==2.25.0
 azure-cosmosdb-table==1.0.6
 azure-graphrbac==0.60.0
-azure-mgmt-eventgrid==3.0.0rc9
-azure-mgmt-resource==12.1.0
-azure-mgmt-storage==17.1.0
+azure-mgmt-eventgrid==9.0.0
+azure-mgmt-resource==18.0.0
+azure-mgmt-storage==18.0.0
 azure-storage-blob==12.5.0
 azure-storage-queue==12.1.3
 pyfunctional==1.4.2
 pyopenssl==19.1.0
 adal~=1.2.5
+idna==2.10