workspace azmonitor depends on airlock

CHANGELOG.md

@@ -17,11 +17,11 @@
       One way to accomplish this is with the Swagger endpoint (/api/docs).
       ![Force-update a service](./docs/assets/firewall-policy-migrate1.png)
 
-      If this endpoint is not on in your deployment - include `enable_swagger` in your `config.yaml` (see the sample file), or temporarly via the API resource on azure (named `api-YOUR_TRE-ID`) -> Configuration -> `ENABLE_SWAGGER` item.
+      If this endpoint is not working in your deployment - include `enable_swagger` in your `config.yaml` (see the sample file), or temporarly activate it via the API resource on azure (named `api-YOUR_TRE-ID`) -> Configuration -> `ENABLE_SWAGGER` item.
       ![Update API setting](./docs/assets/firewall-policy-migrate2.png)
 
 
-  :warning: Any custom rules you have added manually will be **lost** and you'll need to add it back after the upgrade has been completed.
+  :warning: Any custom rules you have added manually will be **lost** and you'll need to add them back after the upgrade has been completed.
 
 FEATURES:
 * Add Azure Databricks as workspace service [#1857](https://github.com/microsoft/AzureTRE/pull/1857)
@@ -41,6 +41,7 @@ BUG FIXES:
 * Reauth CLI if TRE endpoint has changed [#3137](https://github.com/microsoft/AzureTRE/pull/3137)
 * Added Migration for Airlock requests that were created prior to version 0.5.0 ([#3152](https://github.com/microsoft/AzureTRE/pull/3152))
 * Temporarly use the remote bundle for `check-params` target [#3149](https://github.com/microsoft/AzureTRE/pull/3149)
+* Workspace module dependency to resolve _AnotherOperationInProgress_ errors [#TBD](https://github.com/microsoft/AzureTRE/pull/TBD)
 
 COMPONENTS:
 

e2e_tests/requirements.txt

@@ -5,3 +5,4 @@ pytest-asyncio==0.20.3
 starlette
 pytest-timeout==2.1.0
 pytest-xdist==3.0.2
+backoff==2.2.1

e2e_tests/resources/deployment.py

@@ -1,11 +1,10 @@
 import logging
-
-from httpx import Timeout
+import backoff
+from httpx import TimeoutException
 from e2e_tests.helpers import get_full_endpoint
 from e2e_tests.resources import strings
 
 LOGGER = logging.getLogger(__name__)
-TIMEOUT = Timeout(10, read=30)
 
 
 async def delete_done(client, operation_endpoint, headers):
@@ -26,10 +25,13 @@ async def patch_done(client, operation_endpoint, headers):
     return (True, deployment_status, message, operation_steps) if deployment_status in install_terminal_states else (False, deployment_status, message, operation_steps)
 
 
+@backoff.on_exception(backoff.constant,
+                      TimeoutException,  # catching all timeout types (Connection, Read, etc.)
+                      max_time=90)
 async def check_deployment(client, operation_endpoint, headers):
     full_endpoint = get_full_endpoint(operation_endpoint)
 
-    response = await client.get(full_endpoint, headers=headers, timeout=TIMEOUT)
+    response = await client.get(full_endpoint, headers=headers, timeout=5.0)
     if response.status_code == 200:
         response_json = response.json()
         deployment_status = response_json["operation"]["status"]

templates/workspaces/base/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-workspace-base
-version: 1.0.1
+version: 1.0.2
 description: "A base Azure TRE workspace"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

templates/workspaces/base/terraform/workspace.tf

@@ -80,5 +80,6 @@ module "azure_monitor" {
   enable_local_debugging                   = var.enable_local_debugging
   depends_on = [
     module.network,
+    module.airlock
   ]
 }