removed the script as not need and update the backup provider to allo…

…w purging of backup items. Testing ingoing.
microsoft · Feb 18, 2025 · 4aea32e · 4aea32e
1 parent 12f48f8
commit 4aea32e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 135 deletions.
diff --git a/templates/workspaces/base/cleanup_vault.sh b/templates/workspaces/base/cleanup_vault.sh
diff --git a/templates/workspaces/base/porter.yaml b/templates/workspaces/base/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-workspace-base
-version: 2.0.10
+version: 2.0.11
 description: "A base Azure TRE workspace"
 dockerfile: Dockerfile.tmpl
 registry: azuretre
@@ -332,30 +332,6 @@ upgrade:
         register-aad-application: '${ bundle.parameters.register_aad_application }'
 
 uninstall:
-  - az:
-      description: "Set Azure Cloud Environment"
-      arguments:
-        - cloud
-        - set
-      flags:
-        name: ${ bundle.parameters.azure_environment }
-  - az:
-      description: "Azure Login"
-      arguments:
-        - login
-      flags:
-        service-principal: ""
-        username: '${ bundle.credentials.azure_client_id }'
-        password: '${ bundle.credentials.azure_client_secret }'
-        tenant: '${ bundle.credentials.azure_tenant_id }'
-        allow-no-subscriptions: ""
-  - exec:
-      description: "Running Recovery Services Vault Cleanup"
-      command: ./cleanup_vault.sh
-      flags:
-        resource-group: '${ bundle.parameters.workspace_resource_name_suffix }'
-        vault-name: '${ bundle.parameters.backup_vault_name }'
-
   - terraform:
       description: "Tear down workspace"
       vars:

diff --git a/templates/workspaces/base/terraform/backup/providers.tf b/templates/workspaces/base/terraform/backup/providers.tf
@@ -11,3 +11,12 @@ terraform {
     }
   }
 }
+
+
+provider "azurerm" {
+  features {
+     recovery_services_vault {
+       purge_protected_items_from_vault_on_destroy = true
+     }
+  }
+}