Fix destroy ordering: wait_for_backup_container_ready must depend on file_share not vice versa

Copilot · marrobi · web-flow · commit 2834a8346fa0 · 2026-05-26T18:25:49.000Z
Agent-Logs-Url: https://github.com/microsoft/AzureTRE/sessions/9233b422-0f60-414c-af10-9fe74ed1f471 Co-authored-by: marrobi <17089773+marrobi@users.noreply.github.com>
diff --git a/templates/workspaces/base/terraform/storage.tf b/templates/workspaces/base/terraform/storage.tf
@@ -261,7 +261,8 @@ EOT
   }
 
   depends_on = [
-    azurerm_backup_container_storage_account.storage_account
+    azurerm_backup_container_storage_account.storage_account,
+    azurerm_backup_protected_file_share.file_share,
   ]
 }
 
@@ -277,6 +278,5 @@ resource "azurerm_backup_protected_file_share" "file_share" {
     azurerm_backup_container_storage_account.storage_account,
     azapi_resource.shared_storage,
     azurerm_private_endpoint.stgfilepe,
-    terraform_data.wait_for_backup_container_ready
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,8 @@ EOT`
`261`	`261`	`}`
`262`	`262`
`263`	`263`	`depends_on = [`
`264`		`- azurerm_backup_container_storage_account.storage_account`
	`264`	`+ azurerm_backup_container_storage_account.storage_account,`
	`265`	`+ azurerm_backup_protected_file_share.file_share,`
`265`	`266`	`]`
`266`	`267`	`}`
`267`	`268`
`@@ -277,6 +278,5 @@ resource "azurerm_backup_protected_file_share" "file_share" {`
`277`	`278`	`azurerm_backup_container_storage_account.storage_account,`
`278`	`279`	`azapi_resource.shared_storage,`
`279`	`280`	`azurerm_private_endpoint.stgfilepe,`
`280`		`- terraform_data.wait_for_backup_container_ready`
`281`	`281`	`]`
`282`	`282`	`}`