From dd4d99549d75f7e1bc0ea1d74dc7e9eaffa90f75 Mon Sep 17 00:00:00 2001
From: zjhe <lonegunmanb@hotmail.com>
Date: Sat, 5 Oct 2024 08:38:28 +0800
Subject: [PATCH] fix example

---
 .../main.tf                                     | 11 ++++++++++-
 .../workspace.tf                                | 17 ++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/quickstart/301-machine-learning-hub-spoke-secure/main.tf b/quickstart/301-machine-learning-hub-spoke-secure/main.tf
index 9530d16d..c93b3c85 100644
--- a/quickstart/301-machine-learning-hub-spoke-secure/main.tf
+++ b/quickstart/301-machine-learning-hub-spoke-secure/main.tf
@@ -14,7 +14,16 @@ terraform {
 }
 
 provider "azurerm" {
-  features {}
+  features {
+    key_vault {
+      recover_soft_deleted_key_vaults    = false
+      purge_soft_delete_on_destroy       = false
+      purge_soft_deleted_keys_on_destroy = false
+    }
+    resource_group {
+      prevent_deletion_if_contains_resources = false
+    }
+  }
 }
 
 data "azurerm_client_config" "current" {}
diff --git a/quickstart/301-machine-learning-hub-spoke-secure/workspace.tf b/quickstart/301-machine-learning-hub-spoke-secure/workspace.tf
index 1b205537..e4d07ed8 100644
--- a/quickstart/301-machine-learning-hub-spoke-secure/workspace.tf
+++ b/quickstart/301-machine-learning-hub-spoke-secure/workspace.tf
@@ -8,7 +8,7 @@ resource "azurerm_application_insights" "default" {
 }
 
 resource "azurerm_key_vault" "default" {
-  name                     = "kv-${var.name}-${var.environment}"
+  name                     = "kv-${var.name}-${var.environment}-${random_string.suffix.result}"
   location                 = azurerm_resource_group.default.location
   resource_group_name      = azurerm_resource_group.default.name
   tenant_id                = data.azurerm_client_config.current.tenant_id
@@ -94,6 +94,9 @@ resource "azurerm_private_endpoint" "kv_ple" {
     subresource_names              = ["vault"]
     is_manual_connection           = false
   }
+  depends_on = [
+    azurerm_windows_virtual_machine.dsvm
+  ]
 }
 
 resource "azurerm_private_endpoint" "st_ple_blob" {
@@ -113,6 +116,9 @@ resource "azurerm_private_endpoint" "st_ple_blob" {
     subresource_names              = ["blob"]
     is_manual_connection           = false
   }
+  depends_on = [
+    azurerm_windows_virtual_machine.dsvm
+  ]
 }
 
 resource "azurerm_private_endpoint" "storage_ple_file" {
@@ -132,6 +138,9 @@ resource "azurerm_private_endpoint" "storage_ple_file" {
     subresource_names              = ["file"]
     is_manual_connection           = false
   }
+  depends_on = [
+    azurerm_windows_virtual_machine.dsvm
+  ]
 }
 
 resource "azurerm_private_endpoint" "cr_ple" {
@@ -151,6 +160,9 @@ resource "azurerm_private_endpoint" "cr_ple" {
     subresource_names              = ["registry"]
     is_manual_connection           = false
   }
+  depends_on = [
+    azurerm_windows_virtual_machine.dsvm
+  ]
 }
 
 resource "azurerm_private_endpoint" "mlw_ple" {
@@ -170,6 +182,9 @@ resource "azurerm_private_endpoint" "mlw_ple" {
     subresource_names              = ["amlworkspace"]
     is_manual_connection           = false
   }
+  depends_on = [
+    azurerm_windows_virtual_machine.dsvm
+  ]
 }
 
 # Compute cluster for image building required since the workspace is behind a vnet.