made some changes to clean up deployment

quickstart/101-azfw-with-fwpolicy/provider.tf

@@ -8,9 +8,5 @@ terraform {
 }
 
 provider "azurerm" {
-  features {
-    resource_group {
-      prevent_deletion_if_contains_resources = false // Set to True for Production
-    }
-  }
+  features {}
 }

quickstart/101-azfw-with-fwpolicy/variables.tf

@@ -1,14 +1,14 @@
 // Create Variables for Location and Tags
 variable "resource_group_location" {
-  type    = string
+  type        = string
   description = "Location for all resources."
-  default = "eastus"
+  default     = "eastus"
 }
 
 // Create Firewall Variables
 variable "firewall_sku_tier" {
-  type    = string
+  type        = string
   description = "Firewall SKU."
-  default = "Premium" # Valid values are Standard and Premium
+  default     = "Premium" # Valid values are Standard and Premium
 }
 

quickstart/201-azfw-with-secure-hub/main.tf

@@ -34,7 +34,7 @@ resource "azurerm_virtual_hub_connection" "azfw_vwan_hub_connection" {
     associated_route_table_id = azurerm_virtual_hub_route_table.vhub_rt.id
     propagated_route_table {
       route_table_ids = [azurerm_virtual_hub_route_table.vhub_rt.id]
-      labels = ["VNet"]
+      labels          = ["VNet"]
     }
   }
 }
@@ -226,7 +226,7 @@ resource "azurerm_windows_virtual_machine" "vm_jump" {
   name                  = "jump-vm"
   resource_group_name   = azurerm_resource_group.rg.name
   location              = azurerm_resource_group.rg.location
-  size                  = var.virtual_network_name
+  size                  = var.virtual_machine_size
   admin_username        = var.admin_username
   admin_password        = random_password.password.result
   network_interface_ids = [azurerm_network_interface.vm_jump_nic.id]
@@ -284,10 +284,10 @@ resource "azurerm_virtual_hub_route_table" "vhub_rt" {
 }
 
 resource "random_password" "password" {
-  length           = 20
-  min_lower       = 1
-  min_upper       = 1
-  min_numeric     = 1
-  min_special     = 1
-  special          = true
+  length      = 20
+  min_lower   = 1
+  min_upper   = 1
+  min_numeric = 1
+  min_special = 1
+  special     = true
 }

quickstart/201-azfw-with-secure-hub/outputs.tf

@@ -3,16 +3,16 @@ output "resource_group_name" {
 }
 
 output "virtual_hub_name" {
-  value = azurerm_secure_hub.secure_hub.name
+  value = azurerm_virtual_hub.azfw_vwan_hub.name
 }
 
 output "jump_admin_password" {
   sensitive = true
-  value = azurerm_secure_hub.vm_jump.admin_password
+  value     = azurerm_windows_virtual_machine.vm_jump.admin_password
 }
 
 output "workload_admin_password" {
   sensitive = true
-  value = azurerm_secure_hub.vm_workload.admin_password
+  value     = azurerm_windows_virtual_machine.vm_workload.admin_password
 }
 

quickstart/201-azfw-with-secure-hub/variables.tf

@@ -1,21 +1,21 @@
 // Create Variables for Location and Tags
 variable "resource_group_location" {
-  type = string
+  type        = string
   description = "Location for all resources."
-  default = "eastus"
+  default     = "eastus"
 }
 // Create Firewall Variables
 variable "firewall_sku_name" {
-  type = string
+  type        = string
   description = "SKU name for the firewall."
-  default = "Premium" # Valid values are Standard and Premium
+  default     = "Premium" # Valid values are Standard and Premium
 }
 
 // Create Virtual Machine Sku Size Variables
 variable "virtual_machine_size" {
-  type = string
+  type        = string
   description = "Size of the virtual machine."
-  default = "Standard_D2_v3"
+  default     = "Standard_D2_v3"
 }
 
 // Create Admin Username and Password