Converted Heng Lu sample

quickstart/101-attestation-provider/main.tf

@@ -21,7 +21,7 @@ resource "tls_private_key" "signing_cert" {
 resource "tls_self_signed_cert" "attestation" {
   count = local.create_signing_cert ? 1 : 0
 
-  private_key_pem       = tls_private_key.signing_cert[0].private_key_pem
+  private_key_pem = tls_private_key.signing_cert[0].private_key_pem
   validity_period_hours = 12
   allowed_uses = [
     "cert_signing",
@@ -40,13 +40,4 @@ resource "azurerm_attestation_provider" "corp_attestation" {
   name                            = "${var.attestation_provider_name}${random_string.attestation_suffix.result}"
   resource_group_name             = azurerm_resource_group.rg.name
   policy_signing_certificate_data = try(tls_self_signed_cert.attestation[0].cert_pem, file(var.cert_path))
-  #https://github.com/hashicorp/terraform-provider-azurerm/issues/21998#issuecomment-1573312297
-  lifecycle {
-    ignore_changes = [
-      "open_enclave_policy_base64",
-      "sev_snp_policy_base64",
-      "sgx_enclave_policy_base64",
-      "tpm_policy_base64",
-    ]
-  }
 }

quickstart/101-attestation-provider/providers.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~>3.0"
+      version = "~>2.0"
     }
     random = {
       source  = "hashicorp/random"

quickstart/101-authn-managed-identity/providers.tf

@@ -8,7 +8,7 @@ terraform {
     }
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~>3.0"
+      version = "~>2.0"
     }
     random = {
       source  = "hashicorp/random"

quickstart/101-devtest-labs/providers.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~>3.0"
+      version = "~>2.0"
     }
     random = {
       source  = "hashicorp/random"

quickstart/101-frontdoor-managed-ssl-certificate-with-multiple-custom-domains/README.md

@@ -0,0 +1,42 @@
+# Azure CDN Frontdoor
+This template deploys an Azure CDN Frontdoor with a Frontdoor managed TLS/SSL certificate Custom Domain.
+
+## Terraform resource types
+
+- [random_pet](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/pet)
+- [azurerm_resource_group](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/resource_group)
+- [azurerm_cdn_frontdoor_profile](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/cdn_frontdoor_profile)
+- [random_string](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string)
+- [azurerm_dns_zone](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/dns_zone)
+- [azurerm_cdn_frontdoor_firewall_policy](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/cdn_frontdoor_firewall_policy)
+- [azurerm_cdn_frontdoor_security_policy](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/cdn_frontdoor_security_policy)
+- [azurerm_cdn_frontdoor_endpoint](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/cdn_frontdoor_endpoint)
+- [azurerm_cdn_frontdoor_origin_group](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/cdn_frontdoor_origin_group)
+- [azurerm_cdn_frontdoor_origin](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/cdn_frontdoor_origin)
+- [azurerm_cdn_frontdoor_rule_set](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/cdn_frontdoor_rule_set)
+- [azurerm_cdn_frontdoor_rule](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/cdn_frontdoor_rule)
+- [azurerm_cdn_frontdoor_route](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/cdn_frontdoor_route)
+- [azurerm_cdn_frontdoor_custom_domain](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/cdn_frontdoor_custom_domain)
+- [azurerm_cdn_frontdoor_custom_domain_association](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/cdn_frontdoor_custom_domain_association)
+- [azurerm_dns_txt_record](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/dns_txt_record)
+- [azurerm_dns_cname_record](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/dns_cname_record)
+
+## Variables
+
+| Name | Description | Default value |
+|-|-|-|
+| `resource_group_name_prefix` | Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription. | rg |
+| `resource_group_location` | Location of the resource group. | eastus |
+| `cdn_frontdoor_profile_name` | Name of the CDN Frontdoor profile resource. | "" |
+| `dns_zone_name` | Name of the DNS zone resource. | "" |
+| `cdn_frontdoor_firewall_policy_name` | Name of the CDN Frontdoor firewall policy resource. | "" |
+| `cdn_frontdoor_security_policy_name` | Name of the CDN Frontdoor security policy resource. | "" |
+| `cdn_frontdoor_endpoint_name` | Name of the CDN Frontdoor endpoint resource. | "" |
+| `cdn_frontdoor_origin_group_name` | Name of the CDN Frontdoor origin group resource. | "" |
+| `cdn_frontdoor_origin_name` | Name of the CDN Frontdoor origin resource. | "" |
+| `cdn_frontdoor_rule_set_name` | Name of the CDN Frontdoor rule set resource. | "" |
+| `cdn_frontdoor_rule_name` | Name of the CDN Frontdoor rule resource. | "" |
+| `cdn_frontdoor_route_name` | Name of the CDN Frontdoor route resource. | "" |
+| `cdn_frontdoor_custom_domain_name` | Name of the CDN Frontdoor custom domain resource. | "" |
+
+## Example

quickstart/101-frontdoor-managed-ssl-certificate-with-multiple-custom-domains/main.tf

@@ -0,0 +1,394 @@
+resource "random_pet" "rg_name" {
+  prefix = var.resource_group_name_prefix
+}
+
+resource "azurerm_resource_group" "rg" {
+  location = var.resource_group_location
+  name     = random_pet.rg_name.id
+}
+
+resource "random_string" "azurerm_cdn_frontdoor_profile_name" {
+  length  = 13
+  lower   = true
+  numeric = false
+  special = false
+  upper   = false
+}
+
+resource "azurerm_cdn_frontdoor_profile" "example" {
+  name                = coalesce(var.cdn_frontdoor_profile_name, "profile-${random_string.azurerm_cdn_frontdoor_profile_name.result}")
+  resource_group_name = azurerm_resource_group.rg.name
+  sku_name            = "Premium_AzureFrontDoor"
+
+  response_timeout_seconds = 120
+
+  tags = {
+    environment = "example"
+  }
+}
+
+resource "random_string" "azurerm_dns_zone_name" {
+  length  = 13
+  lower   = true
+  numeric = false
+  special = false
+  upper   = false
+}
+
+resource "azurerm_dns_zone" "example" {
+  name                = coalesce(var.dns_zone_name, "zone-${random_string.azurerm_dns_zone_name.result}")
+  resource_group_name = azurerm_resource_group.rg.name
+}
+
+resource "random_string" "azurerm_cdn_frontdoor_firewall_policy_name" {
+  length  = 13
+  lower   = true
+  numeric = false
+  special = false
+  upper   = false
+}
+
+resource "azurerm_cdn_frontdoor_firewall_policy" "example" {
+  name                              = coalesce(var.cdn_frontdoor_firewall_policy_name, "firewall-${random_string.azurerm_cdn_frontdoor_firewall_policy_name.result}")
+  resource_group_name               = azurerm_resource_group.rg.name
+  sku_name                          = azurerm_cdn_frontdoor_profile.example.sku_name
+  enabled                           = true
+  mode                              = "Prevention"
+  redirect_url                      = "https://www.example.com"
+  custom_block_response_status_code = 403
+  custom_block_response_body        = "PGh0bWw+CjxoZWFkZXI+PHRpdGxlPkhlbGxvPC90aXRsZT48L2hlYWRlcj4KPGJvZHk+CkhlbGxvIHdvcmxkCjwvYm9keT4KPC9odG1sPg=="
+
+  custom_rule {
+    name                           = "Rule1"
+    enabled                        = true
+    priority                       = 1
+    rate_limit_duration_in_minutes = 1
+    rate_limit_threshold           = 10
+    type                           = "MatchRule"
+    action                         = "Block"
+
+    match_condition {
+      match_variable     = "RemoteAddr"
+      operator           = "IPMatch"
+      negation_condition = false
+      match_values       = ["10.0.2.0/24", "10.0.1.0/24"]
+    }
+  }
+
+  managed_rule {
+    type    = "DefaultRuleSet"
+    version = "preview-0.1"
+    action  = "Block"
+
+    override {
+      rule_group_name = "PHP"
+
+      rule {
+        rule_id = "933111"
+        enabled = false
+        action  = "Block"
+      }
+    }
+  }
+
+  managed_rule {
+    type    = "BotProtection"
+    version = "preview-0.1"
+    action  = "Block"
+  }
+}
+
+resource "random_string" "azurerm_cdn_frontdoor_security_policy_name" {
+  length  = 13
+  lower   = true
+  numeric = false
+  special = false
+  upper   = false
+}
+
+resource "azurerm_cdn_frontdoor_security_policy" "example" {
+  name                     = coalesce(var.cdn_frontdoor_security_policy_name, "security-${random_string.azurerm_cdn_frontdoor_security_policy_name.result}")
+  cdn_frontdoor_profile_id = azurerm_cdn_frontdoor_profile.example.id
+
+  security_policies {
+    firewall {
+      cdn_frontdoor_firewall_policy_id = azurerm_cdn_frontdoor_firewall_policy.example.id
+
+      association {
+        domain {
+          cdn_frontdoor_domain_id = azurerm_cdn_frontdoor_custom_domain.contoso.id
+        }
+
+        domain {
+          cdn_frontdoor_domain_id = azurerm_cdn_frontdoor_custom_domain.fabrikam.id
+        }
+
+        patterns_to_match = ["/*"]
+      }
+    }
+  }
+}
+
+resource "random_string" "azurerm_cdn_frontdoor_endpoint_name" {
+  length  = 13
+  lower   = true
+  numeric = false
+  special = false
+  upper   = false
+}
+
+resource "azurerm_cdn_frontdoor_endpoint" "example" {
+  name                     = coalesce(var.cdn_frontdoor_endpoint_name, "endpoint-${random_string.azurerm_cdn_frontdoor_endpoint_name.result}")
+  cdn_frontdoor_profile_id = azurerm_cdn_frontdoor_profile.example.id
+  enabled                  = true
+}
+
+resource "random_string" "azurerm_cdn_frontdoor_origin_group_name" {
+  length  = 13
+  lower   = true
+  numeric = false
+  special = false
+  upper   = false
+}
+
+resource "azurerm_cdn_frontdoor_origin_group" "example" {
+  name                     = coalesce(var.cdn_frontdoor_origin_group_name, "origin-group-${random_string.azurerm_cdn_frontdoor_origin_group_name.result}")
+  cdn_frontdoor_profile_id = azurerm_cdn_frontdoor_profile.example.id
+  session_affinity_enabled = true
+
+  restore_traffic_time_to_healed_or_new_endpoint_in_minutes = 10
+
+  health_probe {
+    interval_in_seconds = 100
+    path                = "/"
+    protocol            = "Http"
+    request_type        = "HEAD"
+  }
+
+  load_balancing {
+    additional_latency_in_milliseconds = 0
+    sample_size                        = 16
+    successful_samples_required        = 3
+  }
+}
+
+resource "random_string" "azurerm_cdn_frontdoor_origin_name" {
+  length  = 13
+  lower   = true
+  numeric = false
+  special = false
+  upper   = false
+}
+
+resource "azurerm_cdn_frontdoor_origin" "example" {
+  name                          = coalesce(var.cdn_frontdoor_origin_name, "origin-${random_string.azurerm_cdn_frontdoor_origin_name.result}")
+  cdn_frontdoor_origin_group_id = azurerm_cdn_frontdoor_origin_group.example.id
+  enabled                       = true
+
+  certificate_name_check_enabled = false
+  host_name                      = join(".", ["contoso", azurerm_dns_zone.example.name])
+  priority                       = 1
+  weight                         = 1
+}
+
+resource "random_string" "azurerm_cdn_frontdoor_rule_set_name" {
+  length  = 13
+  lower   = true
+  numeric = false
+  special = false
+  upper   = false
+}
+
+resource "azurerm_cdn_frontdoor_rule_set" "example" {
+  name                     = coalesce(var.cdn_frontdoor_rule_set_name, "rule-set-${random_string.azurerm_cdn_frontdoor_rule_set_name.result}")
+  cdn_frontdoor_profile_id = azurerm_cdn_frontdoor_profile.example.id
+}
+
+resource "random_string" "azurerm_cdn_frontdoor_rule_name" {
+  length  = 13
+  lower   = true
+  numeric = false
+  special = false
+  upper   = false
+}
+
+resource "azurerm_cdn_frontdoor_rule" "example" {
+  depends_on = [azurerm_cdn_frontdoor_origin_group.example, azurerm_cdn_frontdoor_origin.example]
+
+  name                      = coalesce(var.cdn_frontdoor_rule_name, "rule-${random_string.azurerm_cdn_frontdoor_rule_name.result}")
+  cdn_frontdoor_rule_set_id = azurerm_cdn_frontdoor_rule_set.example.id
+  order                     = 1
+  behavior_on_match         = "Continue"
+
+  actions {
+    route_configuration_override_action {
+      cdn_frontdoor_origin_group_id = azurerm_cdn_frontdoor_origin_group.example.id
+      forwarding_protocol           = "HttpsOnly"
+      query_string_caching_behavior = "IncludeSpecifiedQueryStrings"
+      query_string_parameters       = ["foo", "clientIp={client_ip}"]
+      compression_enabled           = true
+      cache_behavior                = "OverrideIfOriginMissing"
+      cache_duration                = "365.23:59:59"
+    }
+
+    url_redirect_action {
+      redirect_type        = "PermanentRedirect"
+      redirect_protocol    = "MatchRequest"
+      query_string         = "clientIp={client_ip}"
+      destination_path     = "/exampleredirection"
+      destination_hostname = "example.com"
+      destination_fragment = "UrlRedirect"
+    }
+  }
+
+  conditions {
+    host_name_condition {
+      operator         = "Equal"
+      negate_condition = false
+      match_values     = ["www.example.com", "images.example.com", "video.example.com"]
+      transforms       = ["Lowercase", "Trim"]
+    }
+
+    is_device_condition {
+      operator         = "Equal"
+      negate_condition = false
+      match_values     = ["Mobile"]
+    }
+
+    post_args_condition {
+      post_args_name = "customerName"
+      operator       = "BeginsWith"
+      match_values   = ["J", "K"]
+      transforms     = ["Uppercase"]
+    }
+
+    request_method_condition {
+      operator         = "Equal"
+      negate_condition = false
+      match_values     = ["DELETE"]
+    }
+
+    url_filename_condition {
+      operator         = "Equal"
+      negate_condition = false
+      match_values     = ["media.mp4"]
+      transforms       = ["Lowercase", "RemoveNulls", "Trim"]
+    }
+  }
+}
+
+resource "random_string" "azurerm_cdn_frontdoor_route_name" {
+  length  = 13
+  lower   = true
+  numeric = false
+  special = false
+  upper   = false
+}
+
+resource "azurerm_cdn_frontdoor_route" "example" {
+  name                          = coalesce(var.cdn_frontdoor_route_name, "route-${random_string.azurerm_cdn_frontdoor_route_name.result}")
+  cdn_frontdoor_endpoint_id     = azurerm_cdn_frontdoor_endpoint.example.id
+  cdn_frontdoor_origin_group_id = azurerm_cdn_frontdoor_origin_group.example.id
+  cdn_frontdoor_origin_ids      = [azurerm_cdn_frontdoor_origin.example.id]
+  enabled                       = true
+
+  forwarding_protocol        = "MatchRequest"
+  https_redirect_enabled     = true
+  patterns_to_match          = ["/*"]
+  supported_protocols        = ["Http", "Https"]
+  cdn_frontdoor_rule_set_ids = [azurerm_cdn_frontdoor_rule_set.example.id]
+
+  cdn_frontdoor_custom_domain_ids = [azurerm_cdn_frontdoor_custom_domain.contoso.id, azurerm_cdn_frontdoor_custom_domain.fabrikam.id]
+  link_to_default_domain          = false
+
+  cache {
+    compression_enabled           = true
+    content_types_to_compress     = ["text/html", "text/javascript", "text/xml"]
+    query_strings                 = ["account", "settings"]
+    query_string_caching_behavior = "IgnoreSpecifiedQueryStrings"
+  }
+}
+
+resource "random_string" "azurerm_cdn_frontdoor_custom_domain_name" {
+  length  = 13
+  lower   = true
+  numeric = false
+  special = false
+  upper   = false
+}
+
+resource "azurerm_cdn_frontdoor_custom_domain" "contoso" {
+  name                     = coalesce(var.cdn_frontdoor_custom_domain_name, "custom-domain-${random_string.azurerm_cdn_frontdoor_custom_domain_name.result}")
+  cdn_frontdoor_profile_id = azurerm_cdn_frontdoor_profile.example.id
+  dns_zone_id              = azurerm_dns_zone.example.id
+  host_name                = join(".", ["contoso", azurerm_dns_zone.example.name])
+
+  tls {
+    certificate_type    = "ManagedCertificate"
+    minimum_tls_version = "TLS12"
+  }
+}
+
+resource "azurerm_cdn_frontdoor_custom_domain" "fabrikam" {
+  name                     = coalesce(var.cdn_frontdoor_custom_domain_name, "custom-domain-${random_string.azurerm_cdn_frontdoor_custom_domain_name.result}")
+  cdn_frontdoor_profile_id = azurerm_cdn_frontdoor_profile.example.id
+  dns_zone_id              = azurerm_dns_zone.example.id
+  host_name                = join(".", ["fabrikam", azurerm_dns_zone.example.name])
+
+  tls {
+    certificate_type    = "ManagedCertificate"
+    minimum_tls_version = "TLS12"
+  }
+}
+
+resource "azurerm_cdn_frontdoor_custom_domain_association" "contoso" {
+  cdn_frontdoor_custom_domain_id = azurerm_cdn_frontdoor_custom_domain.contoso.id
+  cdn_frontdoor_route_ids        = [azurerm_cdn_frontdoor_route.example.id]
+}
+
+resource "azurerm_cdn_frontdoor_custom_domain_association" "fabrikam" {
+  cdn_frontdoor_custom_domain_id = azurerm_cdn_frontdoor_custom_domain.fabrikam.id
+  cdn_frontdoor_route_ids        = [azurerm_cdn_frontdoor_route.example.id]
+}
+
+resource "azurerm_dns_txt_record" "contoso" {
+  name                = join(".", ["_dnsauth", "contoso"])
+  zone_name           = azurerm_dns_zone.example.name
+  resource_group_name = azurerm_resource_group.rg.name
+  ttl                 = 3600
+
+  record {
+    value = azurerm_cdn_frontdoor_custom_domain.contoso.validation_token
+  }
+}
+
+resource "azurerm_dns_txt_record" "fabrikam" {
+  name                = join(".", ["_dnsauth", "fabrikam"])
+  zone_name           = azurerm_dns_zone.example.name
+  resource_group_name = azurerm_resource_group.rg.name
+  ttl                 = 3600
+
+  record {
+    value = azurerm_cdn_frontdoor_custom_domain.fabrikam.validation_token
+  }
+}
+
+resource "azurerm_dns_cname_record" "contoso" {
+  depends_on = [azurerm_cdn_frontdoor_route.example, azurerm_cdn_frontdoor_security_policy.example]
+
+  name                = "contoso"
+  zone_name           = azurerm_dns_zone.example.name
+  resource_group_name = azurerm_resource_group.rg.name
+  ttl                 = 3600
+  record              = azurerm_cdn_frontdoor_endpoint.example.host_name
+}
+
+resource "azurerm_dns_cname_record" "fabrikam" {
+  depends_on = [azurerm_cdn_frontdoor_route.example, azurerm_cdn_frontdoor_security_policy.example]
+
+  name                = "fabrikam"
+  zone_name           = azurerm_dns_zone.example.name
+  resource_group_name = azurerm_resource_group.rg.name
+  ttl                 = 3600
+  record              = azurerm_cdn_frontdoor_endpoint.example.host_name
+}

quickstart/101-frontdoor-managed-ssl-certificate-with-multiple-custom-domains/outputs.tf

@@ -0,0 +1,47 @@
+output "resource_group_name" {
+  value = azurerm_resource_group.rg.name
+}
+
+output "cdn_frontdoor_profile_name" {
+  value = azurerm_cdn_frontdoor_profile.example.name
+}
+
+output "dns_zone_name" {
+  value = azurerm_dns_zone.example.name
+}
+
+output "cdn_frontdoor_firewall_policy_name" {
+  value = azurerm_cdn_frontdoor_firewall_policy.example.name
+}
+
+output "cdn_frontdoor_security_policy_name" {
+  value = azurerm_cdn_frontdoor_security_policy.example.name
+}
+
+output "cdn_frontdoor_endpoint_name" {
+  value = azurerm_cdn_frontdoor_endpoint.example.name
+}
+
+output "cdn_frontdoor_origin_group_name" {
+  value = azurerm_cdn_frontdoor_origin_group.example.name
+}
+
+output "cdn_frontdoor_origin_name" {
+  value = azurerm_cdn_frontdoor_origin.example.name
+}
+
+output "cdn_frontdoor_rule_set_name" {
+  value = azurerm_cdn_frontdoor_rule_set.example.name
+}
+
+output "cdn_frontdoor_rule_name" {
+  value = azurerm_cdn_frontdoor_rule.example.name
+}
+
+output "cdn_frontdoor_route_name" {
+  value = azurerm_cdn_frontdoor_route.example.name
+}
+
+output "cdn_frontdoor_custom_domain_name" {
+  value = azurerm_cdn_frontdoor_custom_domain.contoso.name
+}

quickstart/101-frontdoor-managed-ssl-certificate-with-multiple-custom-domains/providers.tf

@@ -0,0 +1,18 @@
+terraform {
+  required_version = ">=1.0"
+
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~>3.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "~>3.0"
+    }
+  }
+}
+
+provider "azurerm" {
+  features {}
+}

quickstart/101-frontdoor-managed-ssl-certificate-with-multiple-custom-domains/variables.tf

@@ -0,0 +1,77 @@
+variable "resource_group_name_prefix" {
+  type        = string
+  default     = "rg"
+  description = "Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription."
+}
+
+variable "resource_group_location" {
+  type        = string
+  default     = "eastus"
+  description = "Location of the resource group."
+}
+
+variable "cdn_frontdoor_profile_name" {
+  type        = string
+  description = "The name of the CDN Frontdoor profile resource. The value will be randomly generated if blank."
+  default     = ""
+}
+
+variable "dns_zone_name" {
+  type        = string
+  description = "The name of the DNS zone resource. The value will be randomly generated if blank."
+  default     = ""
+}
+
+variable "cdn_frontdoor_firewall_policy_name" {
+  type        = string
+  description = "The name of the CDN Frontdoor firewall policy resource. The value will be randomly generated if blank."
+  default     = ""
+}
+
+variable "cdn_frontdoor_security_policy_name" {
+  type        = string
+  description = "The name of the CDN Frontdoor security policy resource. The value will be randomly generated if blank."
+  default     = ""
+}
+
+variable "cdn_frontdoor_endpoint_name" {
+  type        = string
+  description = "The name of the CDN Frontdoor endpoint resource. The value will be randomly generated if blank."
+  default     = ""
+}
+
+variable "cdn_frontdoor_origin_group_name" {
+  type        = string
+  description = "The name of the CDN Frontdoor origin group resource. The value will be randomly generated if blank."
+  default     = ""
+}
+
+variable "cdn_frontdoor_origin_name" {
+  type        = string
+  description = "The name of the CDN Frontdoor origin resource. The value will be randomly generated if blank."
+  default     = ""
+}
+
+variable "cdn_frontdoor_rule_set_name" {
+  type        = string
+  description = "The name of the CDN Frontdoor rule set resource. The value will be randomly generated if blank."
+  default     = ""
+}
+
+variable "cdn_frontdoor_rule_name" {
+  type        = string
+  description = "The name of the CDN Frontdoor rule resource. The value will be randomly generated if blank."
+  default     = ""
+}
+
+variable "cdn_frontdoor_route_name" {
+  type        = string
+  description = "The name of the CDN Frontdoor route resource. The value will be randomly generated if blank."
+  default     = ""
+}
+
+variable "cdn_frontdoor_custom_domain_name" {
+  type        = string
+  description = "The name of the CDN Frontdoor custom domain resource. The value will be randomly generated if blank."
+  default     = ""
+}

quickstart/101-vm-with-infrastructure/providers.tf

@@ -8,7 +8,7 @@ terraform {
     }
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~>3.0"
+      version = "~>2.0"
     }
     random = {
       source  = "hashicorp/random"

quickstart/201-vmss-jumpbox/main.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~>3.0"
+      version = "~>2.0"
     }
   }
 }
@@ -17,15 +17,6 @@ provider "azurerm" {
   }
 }
 
-resource "random_password" "password" {
-  count  = var.admin_password == null ? 1 : 0
-  length = 20
-}
-
-locals {
-  admin_password = try(random_password.password[0].result, var.admin_password)
-}
-
 resource "azurerm_resource_group" "vmss" {
   name     = var.resource_group_name
   location = var.location
@@ -36,7 +27,7 @@ resource "random_string" "fqdn" {
   length  = 6
   special = false
   upper   = false
-  numeric = false
+  number  = false
 }
 
 resource "azurerm_virtual_network" "vmss" {
@@ -82,12 +73,14 @@ resource "azurerm_lb_backend_address_pool" "bpepool" {
 }
 
 resource "azurerm_lb_probe" "vmss" {
+  resource_group_name = azurerm_resource_group.vmss.name
   loadbalancer_id     = azurerm_lb.vmss.id
   name                = "ssh-running-probe"
   port                = var.application_port
 }
 
 resource "azurerm_lb_rule" "lbnatrule" {
+  resource_group_name            = azurerm_resource_group.vmss.name
   loadbalancer_id                = azurerm_lb.vmss.id
   name                           = "http"
   protocol                       = "Tcp"
@@ -134,7 +127,7 @@ resource "azurerm_virtual_machine_scale_set" "vmss" {
   os_profile {
     computer_name_prefix = "vmlab"
     admin_username       = var.admin_user
-    admin_password       = local.admin_password
+    admin_password       = var.admin_password
     custom_data          = file("web.conf")
   }
 
@@ -205,7 +198,7 @@ resource "azurerm_virtual_machine" "jumpbox" {
   os_profile {
     computer_name  = "jumpbox"
     admin_username = var.admin_user
-    admin_password = local.admin_password
+    admin_password = var.admin_password
   }
 
   os_profile_linux_config {

quickstart/201-vmss-jumpbox/output.tf

@@ -1,11 +1,11 @@
 output "vmss_public_ip_fqdn" {
-  value = azurerm_public_ip.vmss.fqdn
+   value = azurerm_public_ip.vmss.fqdn
 }
 
 output "jumpbox_public_ip_fqdn" {
-  value = azurerm_public_ip.jumpbox.fqdn
+   value = azurerm_public_ip.jumpbox.fqdn
 }
 
 output "jumpbox_public_ip" {
-  value = azurerm_public_ip.jumpbox.ip_address
+   value = azurerm_public_ip.jumpbox.ip_address
 }

quickstart/201-vmss-jumpbox/variables.tf

@@ -28,6 +28,6 @@ variable "admin_user" {
 
 variable "admin_password" {
   description = "Default password for admin account"
-  default     = null
+  default     = "ChangeMe123!"
   sensitive   = true
 }

quickstart/301-hub-spoke/hub-nva.tf

@@ -1,205 +1,199 @@
 locals {
-  prefix-hub-nva         = "hub-nva"
+    prefix-hub-nva         = "hub-nva"
-  hub-nva-location       = "eastus"
+    hub-nva-location       = "eastus"
-  hub-nva-resource-group = "hub-nva-rg"
+    hub-nva-resource-group = "hub-nva-rg"
-}
-
-resource "random_string" "suffix" {
-  length  = 5
-  special = false
-  upper   = false
 }
 
 resource "azurerm_resource_group" "hub-nva-rg" {
-  name     = "${local.prefix-hub-nva}-rg-${random_string.suffix.result}"
+    name     = "${local.prefix-hub-nva}-rg"
-  location = local.hub-nva-location
+    location = local.hub-nva-location
 
-  tags = {
+    tags = {
     environment = local.prefix-hub-nva
-  }
+    }
 }
 
 resource "azurerm_network_interface" "hub-nva-nic" {
-  name                 = "${local.prefix-hub-nva}-nic"
+    name                 = "${local.prefix-hub-nva}-nic"
-  location             = azurerm_resource_group.hub-nva-rg.location
+    location             = azurerm_resource_group.hub-nva-rg.location
-  resource_group_name  = azurerm_resource_group.hub-nva-rg.name
+    resource_group_name  = azurerm_resource_group.hub-nva-rg.name
-  enable_ip_forwarding = true
+    enable_ip_forwarding = true
 
-  ip_configuration {
+    ip_configuration {
     name                          = local.prefix-hub-nva
     subnet_id                     = azurerm_subnet.hub-dmz.id
     private_ip_address_allocation = "Static"
     private_ip_address            = "10.0.0.36"
-  }
+    }
 
-  tags = {
+    tags = {
     environment = local.prefix-hub-nva
-  }
+    }
 }
 
 resource "azurerm_virtual_machine" "hub-nva-vm" {
-  name                  = "${local.prefix-hub-nva}-vm"
+    name                  = "${local.prefix-hub-nva}-vm"
-  location              = azurerm_resource_group.hub-nva-rg.location
+    location              = azurerm_resource_group.hub-nva-rg.location
-  resource_group_name   = azurerm_resource_group.hub-nva-rg.name
+    resource_group_name   = azurerm_resource_group.hub-nva-rg.name
-  network_interface_ids = [azurerm_network_interface.hub-nva-nic.id]
+    network_interface_ids = [azurerm_network_interface.hub-nva-nic.id]
-  vm_size               = var.vmsize
+    vm_size               = var.vmsize
 
-  storage_image_reference {
+    storage_image_reference {
     publisher = "Canonical"
     offer     = "UbuntuServer"
     sku       = "16.04-LTS"
     version   = "latest"
-  }
+    }
 
-  storage_os_disk {
+    storage_os_disk {
     name              = "myosdisk1"
     caching           = "ReadWrite"
     create_option     = "FromImage"
     managed_disk_type = "Standard_LRS"
-  }
+    }
 
-  os_profile {
+    os_profile {
     computer_name  = "${local.prefix-hub-nva}-vm"
     admin_username = var.username
-    admin_password = local.password
+    admin_password = var.password
-  }
+    }
 
-  os_profile_linux_config {
+    os_profile_linux_config {
     disable_password_authentication = false
-  }
+    }
 
-  tags = {
+    tags = {
     environment = local.prefix-hub-nva
-  }
+    }
 }
 
 resource "azurerm_virtual_machine_extension" "enable-routes" {
-  name                 = "enable-iptables-routes"
+    name                 = "enable-iptables-routes"
-  virtual_machine_id   = azurerm_virtual_machine.hub-nva-vm.id
+    virtual_machine_id   = azurerm_virtual_machine.hub-nva-vm.id
-  publisher            = "Microsoft.Azure.Extensions"
+    publisher            = "Microsoft.Azure.Extensions"
-  type                 = "CustomScript"
+    type                 = "CustomScript"
-  type_handler_version = "2.0"
+    type_handler_version = "2.0"
 
 
-  settings = <<SETTINGS
+    settings = <<SETTINGS
     {
         "fileUris": [
-        "https://raw.githubusercontent.com/lonegunmanb/reference-architectures/refs/heads/master/scripts/linux/enable-ip-forwarding.sh"
+        "https://raw.githubusercontent.com/mspnp/reference-architectures/master/scripts/linux/enable-ip-forwarding.sh"
         ],
         "commandToExecute": "bash enable-ip-forwarding.sh"
     }
 SETTINGS
 
-  tags = {
+    tags = {
     environment = local.prefix-hub-nva
-  }
+    }
 }
 
 resource "azurerm_route_table" "hub-gateway-rt" {
-  name                          = "hub-gateway-rt"
+    name                          = "hub-gateway-rt"
-  location                      = azurerm_resource_group.hub-nva-rg.location
+    location                      = azurerm_resource_group.hub-nva-rg.location
-  resource_group_name           = azurerm_resource_group.hub-nva-rg.name
+    resource_group_name           = azurerm_resource_group.hub-nva-rg.name
-  disable_bgp_route_propagation = false
+    disable_bgp_route_propagation = false
 
-  route {
+    route {
     name           = "toHub"
     address_prefix = "10.0.0.0/16"
     next_hop_type  = "VnetLocal"
-  }
+    }
 
-  route {
+    route {
     name                   = "toSpoke1"
     address_prefix         = "10.1.0.0/16"
     next_hop_type          = "VirtualAppliance"
     next_hop_in_ip_address = "10.0.0.36"
-  }
+    }
 
-  route {
+    route {
     name                   = "toSpoke2"
     address_prefix         = "10.2.0.0/16"
     next_hop_type          = "VirtualAppliance"
     next_hop_in_ip_address = "10.0.0.36"
-  }
+    }
 
-  tags = {
+    tags = {
     environment = local.prefix-hub-nva
-  }
+    }
 }
 
 resource "azurerm_subnet_route_table_association" "hub-gateway-rt-hub-vnet-gateway-subnet" {
-  subnet_id      = azurerm_subnet.hub-gateway-subnet.id
+    subnet_id      = azurerm_subnet.hub-gateway-subnet.id
-  route_table_id = azurerm_route_table.hub-gateway-rt.id
+    route_table_id = azurerm_route_table.hub-gateway-rt.id
-  depends_on     = [azurerm_subnet.hub-gateway-subnet]
+    depends_on = [azurerm_subnet.hub-gateway-subnet]
 }
 
 resource "azurerm_route_table" "spoke1-rt" {
-  name                          = "spoke1-rt"
+    name                          = "spoke1-rt"
-  location                      = azurerm_resource_group.hub-nva-rg.location
+    location                      = azurerm_resource_group.hub-nva-rg.location
-  resource_group_name           = azurerm_resource_group.hub-nva-rg.name
+    resource_group_name           = azurerm_resource_group.hub-nva-rg.name
-  disable_bgp_route_propagation = false
+    disable_bgp_route_propagation = false
 
-  route {
+    route {
     name                   = "toSpoke2"
     address_prefix         = "10.2.0.0/16"
     next_hop_type          = "VirtualAppliance"
     next_hop_in_ip_address = "10.0.0.36"
-  }
+    }
 
-  route {
+    route {
     name           = "default"
     address_prefix = "0.0.0.0/0"
-    next_hop_type  = "VnetLocal"
+    next_hop_type  = "vnetlocal"
-  }
+    }
 
-  tags = {
+    tags = {
     environment = local.prefix-hub-nva
-  }
+    }
 }
 
 resource "azurerm_subnet_route_table_association" "spoke1-rt-spoke1-vnet-mgmt" {
-  subnet_id      = azurerm_subnet.spoke1-mgmt.id
+    subnet_id      = azurerm_subnet.spoke1-mgmt.id
-  route_table_id = azurerm_route_table.spoke1-rt.id
+    route_table_id = azurerm_route_table.spoke1-rt.id
-  depends_on     = [azurerm_subnet.spoke1-mgmt]
+    depends_on = [azurerm_subnet.spoke1-mgmt]
 }
 
 resource "azurerm_subnet_route_table_association" "spoke1-rt-spoke1-vnet-workload" {
-  subnet_id      = azurerm_subnet.spoke1-workload.id
+    subnet_id      = azurerm_subnet.spoke1-workload.id
-  route_table_id = azurerm_route_table.spoke1-rt.id
+    route_table_id = azurerm_route_table.spoke1-rt.id
-  depends_on     = [azurerm_subnet.spoke1-workload]
+    depends_on = [azurerm_subnet.spoke1-workload]
 }
 
 resource "azurerm_route_table" "spoke2-rt" {
-  name                          = "spoke2-rt"
+    name                          = "spoke2-rt"
-  location                      = azurerm_resource_group.hub-nva-rg.location
+    location                      = azurerm_resource_group.hub-nva-rg.location
-  resource_group_name           = azurerm_resource_group.hub-nva-rg.name
+    resource_group_name           = azurerm_resource_group.hub-nva-rg.name
-  disable_bgp_route_propagation = false
+    disable_bgp_route_propagation = false
 
-  route {
+    route {
     name                   = "toSpoke1"
     address_prefix         = "10.1.0.0/16"
     next_hop_in_ip_address = "10.0.0.36"
     next_hop_type          = "VirtualAppliance"
-  }
+    }
 
-  route {
+    route {
     name           = "default"
     address_prefix = "0.0.0.0/0"
-    next_hop_type  = "VnetLocal"
+    next_hop_type  = "vnetlocal"
-  }
+    }
 
-  tags = {
+    tags = {
     environment = local.prefix-hub-nva
-  }
+    }
 }
 
 resource "azurerm_subnet_route_table_association" "spoke2-rt-spoke2-vnet-mgmt" {
-  subnet_id      = azurerm_subnet.spoke2-mgmt.id
+    subnet_id      = azurerm_subnet.spoke2-mgmt.id
-  route_table_id = azurerm_route_table.spoke2-rt.id
+    route_table_id = azurerm_route_table.spoke2-rt.id
-  depends_on     = [azurerm_subnet.spoke2-mgmt]
+    depends_on = [azurerm_subnet.spoke2-mgmt]
 }
 
 resource "azurerm_subnet_route_table_association" "spoke2-rt-spoke2-vnet-workload" {
-  subnet_id      = azurerm_subnet.spoke2-workload.id
+    subnet_id      = azurerm_subnet.spoke2-workload.id
-  route_table_id = azurerm_route_table.spoke2-rt.id
+    route_table_id = azurerm_route_table.spoke2-rt.id
-  depends_on     = [azurerm_subnet.spoke2-workload]
+    depends_on = [azurerm_subnet.spoke2-workload]
 }

quickstart/301-hub-spoke/hub-vnet.tf

@@ -1,153 +1,153 @@
 locals {
-  prefix-hub         = "hub"
+    prefix-hub         = "hub"
-  hub-location       = "eastus"
+    hub-location       = "eastus"
-  hub-resource-group = "hub-vnet-rg-${random_string.suffix.result}"
+    hub-resource-group = "hub-vnet-rg"
-  shared-key         = "4-v3ry-53cr37-1p53c-5h4r3d-k3y"
+    shared-key         = "4-v3ry-53cr37-1p53c-5h4r3d-k3y"
 }
 
 resource "azurerm_resource_group" "hub-vnet-rg" {
-  name     = local.hub-resource-group
+    name     = local.hub-resource-group
-  location = local.hub-location
+    location = local.hub-location
 }
 
 resource "azurerm_virtual_network" "hub-vnet" {
-  name                = "${local.prefix-hub}-vnet"
+    name                = "${local.prefix-hub}-vnet"
-  location            = azurerm_resource_group.hub-vnet-rg.location
+    location            = azurerm_resource_group.hub-vnet-rg.location
-  resource_group_name = azurerm_resource_group.hub-vnet-rg.name
+    resource_group_name = azurerm_resource_group.hub-vnet-rg.name
-  address_space       = ["10.0.0.0/16"]
+    address_space       = ["10.0.0.0/16"]
 
-  tags = {
+    tags = {
     environment = "hub-spoke"
-  }
+    }
 }
 
 resource "azurerm_subnet" "hub-gateway-subnet" {
-  name                 = "GatewaySubnet"
+    name                 = "GatewaySubnet"
-  resource_group_name  = azurerm_resource_group.hub-vnet-rg.name
+    resource_group_name  = azurerm_resource_group.hub-vnet-rg.name
-  virtual_network_name = azurerm_virtual_network.hub-vnet.name
+    virtual_network_name = azurerm_virtual_network.hub-vnet.name
-  address_prefixes     = ["10.0.255.224/27"]
+    address_prefixes     = ["10.0.255.224/27"]
 }
 
 resource "azurerm_subnet" "hub-mgmt" {
-  name                 = "mgmt"
+    name                 = "mgmt"
-  resource_group_name  = azurerm_resource_group.hub-vnet-rg.name
+    resource_group_name  = azurerm_resource_group.hub-vnet-rg.name
-  virtual_network_name = azurerm_virtual_network.hub-vnet.name
+    virtual_network_name = azurerm_virtual_network.hub-vnet.name
-  address_prefixes     = ["10.0.0.64/27"]
+    address_prefixes       = ["10.0.0.64/27"]
 }
 
 resource "azurerm_subnet" "hub-dmz" {
-  name                 = "dmz"
+    name                 = "dmz"
-  resource_group_name  = azurerm_resource_group.hub-vnet-rg.name
+    resource_group_name  = azurerm_resource_group.hub-vnet-rg.name
-  virtual_network_name = azurerm_virtual_network.hub-vnet.name
+    virtual_network_name = azurerm_virtual_network.hub-vnet.name
-  address_prefixes     = ["10.0.0.32/27"]
+    address_prefixes       = ["10.0.0.32/27"]
 }
 
 resource "azurerm_network_interface" "hub-nic" {
-  name                 = "${local.prefix-hub}-nic"
+    name                 = "${local.prefix-hub}-nic"
-  location             = azurerm_resource_group.hub-vnet-rg.location
+    location             = azurerm_resource_group.hub-vnet-rg.location
-  resource_group_name  = azurerm_resource_group.hub-vnet-rg.name
+    resource_group_name  = azurerm_resource_group.hub-vnet-rg.name
-  enable_ip_forwarding = true
+    enable_ip_forwarding = true
 
-  ip_configuration {
+    ip_configuration {
     name                          = local.prefix-hub
     subnet_id                     = azurerm_subnet.hub-mgmt.id
     private_ip_address_allocation = "Dynamic"
-  }
+    }
 
-  tags = {
+    tags = {
     environment = local.prefix-hub
-  }
+    }
 }
 
 #Virtual Machine
 resource "azurerm_virtual_machine" "hub-vm" {
-  name                  = "${local.prefix-hub}-vm"
+    name                  = "${local.prefix-hub}-vm"
-  location              = azurerm_resource_group.hub-vnet-rg.location
+    location              = azurerm_resource_group.hub-vnet-rg.location
-  resource_group_name   = azurerm_resource_group.hub-vnet-rg.name
+    resource_group_name   = azurerm_resource_group.hub-vnet-rg.name
-  network_interface_ids = [azurerm_network_interface.hub-nic.id]
+    network_interface_ids = [azurerm_network_interface.hub-nic.id]
-  vm_size               = var.vmsize
+    vm_size               = var.vmsize
 
-  storage_image_reference {
+    storage_image_reference {
     publisher = "Canonical"
     offer     = "UbuntuServer"
     sku       = "16.04-LTS"
     version   = "latest"
-  }
+    }
 
-  storage_os_disk {
+    storage_os_disk {
     name              = "myosdisk1"
     caching           = "ReadWrite"
     create_option     = "FromImage"
     managed_disk_type = "Standard_LRS"
-  }
+    }
 
-  os_profile {
+    os_profile {
     computer_name  = "${local.prefix-hub}-vm"
     admin_username = var.username
-    admin_password = local.password
+    admin_password = var.password
-  }
+    }
 
-  os_profile_linux_config {
+    os_profile_linux_config {
     disable_password_authentication = false
-  }
+    }
 
-  tags = {
+    tags = {
     environment = local.prefix-hub
-  }
+    }
 }
 
 # Virtual Network Gateway
 resource "azurerm_public_ip" "hub-vpn-gateway1-pip" {
-  name                = "hub-vpn-gateway1-pip"
+    name                = "hub-vpn-gateway1-pip"
-  location            = azurerm_resource_group.hub-vnet-rg.location
+    location            = azurerm_resource_group.hub-vnet-rg.location
-  resource_group_name = azurerm_resource_group.hub-vnet-rg.name
+    resource_group_name = azurerm_resource_group.hub-vnet-rg.name
 
-  allocation_method = "Dynamic"
+    allocation_method = "Dynamic"
 }
 
 resource "azurerm_virtual_network_gateway" "hub-vnet-gateway" {
-  name                = "hub-vpn-gateway1"
+    name                = "hub-vpn-gateway1"
-  location            = azurerm_resource_group.hub-vnet-rg.location
+    location            = azurerm_resource_group.hub-vnet-rg.location
-  resource_group_name = azurerm_resource_group.hub-vnet-rg.name
+    resource_group_name = azurerm_resource_group.hub-vnet-rg.name
 
-  type     = "Vpn"
+    type     = "Vpn"
-  vpn_type = "RouteBased"
+    vpn_type = "RouteBased"
 
-  active_active = false
+    active_active = false
-  enable_bgp    = false
+    enable_bgp    = false
-  sku           = "VpnGw1"
+    sku           = "VpnGw1"
 
-  ip_configuration {
+    ip_configuration {
     name                          = "vnetGatewayConfig"
     public_ip_address_id          = azurerm_public_ip.hub-vpn-gateway1-pip.id
     private_ip_address_allocation = "Dynamic"
     subnet_id                     = azurerm_subnet.hub-gateway-subnet.id
-  }
+    }
-  depends_on = [azurerm_public_ip.hub-vpn-gateway1-pip]
+    depends_on = [azurerm_public_ip.hub-vpn-gateway1-pip]
 }
 
 resource "azurerm_virtual_network_gateway_connection" "hub-onprem-conn" {
-  name                = "hub-onprem-conn"
+    name                = "hub-onprem-conn"
-  location            = azurerm_resource_group.hub-vnet-rg.location
+    location            = azurerm_resource_group.hub-vnet-rg.location
-  resource_group_name = azurerm_resource_group.hub-vnet-rg.name
+    resource_group_name = azurerm_resource_group.hub-vnet-rg.name
 
-  type           = "Vnet2Vnet"
+    type           = "Vnet2Vnet"
-  routing_weight = 1
+    routing_weight = 1
 
-  virtual_network_gateway_id      = azurerm_virtual_network_gateway.hub-vnet-gateway.id
+    virtual_network_gateway_id      = azurerm_virtual_network_gateway.hub-vnet-gateway.id
-  peer_virtual_network_gateway_id = azurerm_virtual_network_gateway.onprem-vpn-gateway.id
+    peer_virtual_network_gateway_id = azurerm_virtual_network_gateway.onprem-vpn-gateway.id
 
-  shared_key = local.shared-key
+    shared_key = local.shared-key
 }
 
 resource "azurerm_virtual_network_gateway_connection" "onprem-hub-conn" {
-  name                            = "onprem-hub-conn"
+    name                = "onprem-hub-conn"
-  location                        = azurerm_resource_group.onprem-vnet-rg.location
+    location            = azurerm_resource_group.onprem-vnet-rg.location
-  resource_group_name             = azurerm_resource_group.onprem-vnet-rg.name
+    resource_group_name = azurerm_resource_group.onprem-vnet-rg.name
-  type                            = "Vnet2Vnet"
+    type                            = "Vnet2Vnet"
-  routing_weight                  = 1
+    routing_weight = 1
-  virtual_network_gateway_id      = azurerm_virtual_network_gateway.onprem-vpn-gateway.id
+    virtual_network_gateway_id      = azurerm_virtual_network_gateway.onprem-vpn-gateway.id
-  peer_virtual_network_gateway_id = azurerm_virtual_network_gateway.hub-vnet-gateway.id
+    peer_virtual_network_gateway_id = azurerm_virtual_network_gateway.hub-vnet-gateway.id
 
-  shared_key = local.shared-key
+    shared_key = local.shared-key
 }

quickstart/301-hub-spoke/main.tf

@@ -5,24 +5,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.0"
+      version = "~>2.0"
     }
   }
 }
 
 provider "azurerm" {
-  features {
+  features {}
-    resource_group {
-      prevent_deletion_if_contains_resources = false
-    }
-  }
 }
-
-resource "random_password" "password" {
-  count  = var.password == null ? 1 : 0
-  length = 20
-}
-
-locals {
-  password = try(random_password.password[0].result, var.password)
-}

quickstart/301-hub-spoke/on-prem.tf

@@ -1,154 +1,154 @@
 locals {
-  onprem-location       = "eastus"
+    onprem-location       = "eastus"
-  onprem-resource-group = "onprem-vnet-rg-${random_string.suffix.result}"
+    onprem-resource-group = "onprem-vnet-rg"
-  prefix-onprem         = "onprem"
+    prefix-onprem         = "onprem"
 }
 
 resource "azurerm_resource_group" "onprem-vnet-rg" {
-  name     = local.onprem-resource-group
+    name     = local.onprem-resource-group
-  location = local.onprem-location
+    location = local.onprem-location
 }
 
 resource "azurerm_virtual_network" "onprem-vnet" {
-  name                = "onprem-vnet"
+    name                = "onprem-vnet"
-  location            = azurerm_resource_group.onprem-vnet-rg.location
+    location            = azurerm_resource_group.onprem-vnet-rg.location
-  resource_group_name = azurerm_resource_group.onprem-vnet-rg.name
+    resource_group_name = azurerm_resource_group.onprem-vnet-rg.name
-  address_space       = ["192.168.0.0/16"]
+    address_space       = ["192.168.0.0/16"]
 
-  tags = {
+    tags = {
     environment = local.prefix-onprem
-  }
+    }
 }
 
 resource "azurerm_subnet" "onprem-gateway-subnet" {
-  name                 = "GatewaySubnet"
+    name                 = "GatewaySubnet"
-  resource_group_name  = azurerm_resource_group.onprem-vnet-rg.name
+    resource_group_name  = azurerm_resource_group.onprem-vnet-rg.name
-  virtual_network_name = azurerm_virtual_network.onprem-vnet.name
+    virtual_network_name = azurerm_virtual_network.onprem-vnet.name
-  address_prefixes     = ["192.168.255.224/27"]
+    address_prefixes     = ["192.168.255.224/27"]
 }
 
 resource "azurerm_subnet" "onprem-mgmt" {
-  name                 = "mgmt"
+    name                 = "mgmt"
-  resource_group_name  = azurerm_resource_group.onprem-vnet-rg.name
+    resource_group_name  = azurerm_resource_group.onprem-vnet-rg.name
-  virtual_network_name = azurerm_virtual_network.onprem-vnet.name
+    virtual_network_name = azurerm_virtual_network.onprem-vnet.name
-  address_prefixes     = ["192.168.1.128/25"]
+    address_prefixes     = ["192.168.1.128/25"]
 }
 
 resource "azurerm_public_ip" "onprem-pip" {
-  name                = "${local.prefix-onprem}-pip"
+    name                         = "${local.prefix-onprem}-pip"
-  location            = azurerm_resource_group.onprem-vnet-rg.location
+    location            = azurerm_resource_group.onprem-vnet-rg.location
-  resource_group_name = azurerm_resource_group.onprem-vnet-rg.name
+    resource_group_name = azurerm_resource_group.onprem-vnet-rg.name
-  allocation_method   = "Dynamic"
+    allocation_method   = "Dynamic"
 
-  tags = {
+    tags = {
-    environment = local.prefix-onprem
+        environment = local.prefix-onprem
-  }
+    }
 }
 
 resource "azurerm_network_interface" "onprem-nic" {
-  name                 = "${local.prefix-onprem}-nic"
+    name                 = "${local.prefix-onprem}-nic"
-  location             = azurerm_resource_group.onprem-vnet-rg.location
+    location             = azurerm_resource_group.onprem-vnet-rg.location
-  resource_group_name  = azurerm_resource_group.onprem-vnet-rg.name
+    resource_group_name  = azurerm_resource_group.onprem-vnet-rg.name
-  enable_ip_forwarding = true
+    enable_ip_forwarding = true
 
-  ip_configuration {
+    ip_configuration {
     name                          = local.prefix-onprem
     subnet_id                     = azurerm_subnet.onprem-mgmt.id
     private_ip_address_allocation = "Dynamic"
     public_ip_address_id          = azurerm_public_ip.onprem-pip.id
-  }
+    }
 }
 
 # Create Network Security Group and rule
 resource "azurerm_network_security_group" "onprem-nsg" {
-  name                = "${local.prefix-onprem}-nsg"
+    name                = "${local.prefix-onprem}-nsg"
-  location            = azurerm_resource_group.onprem-vnet-rg.location
+    location            = azurerm_resource_group.onprem-vnet-rg.location
-  resource_group_name = azurerm_resource_group.onprem-vnet-rg.name
+    resource_group_name = azurerm_resource_group.onprem-vnet-rg.name
 
-  security_rule {
+    security_rule {
-    name                       = "SSH"
+        name                       = "SSH"
-    priority                   = 1001
+        priority                   = 1001
-    direction                  = "Inbound"
+        direction                  = "Inbound"
-    access                     = "Allow"
+        access                     = "Allow"
-    protocol                   = "Tcp"
+        protocol                   = "Tcp"
-    source_port_range          = "*"
+        source_port_range          = "*"
-    destination_port_range     = "22"
+        destination_port_range     = "22"
-    source_address_prefix      = "*"
+        source_address_prefix      = "*"
-    destination_address_prefix = "*"
+        destination_address_prefix = "*"
-  }
+    }
 
-  tags = {
+    tags = {
-    environment = "onprem"
+        environment = "onprem"
-  }
+    }
 }
 
 resource "azurerm_subnet_network_security_group_association" "mgmt-nsg-association" {
-  subnet_id                 = azurerm_subnet.onprem-mgmt.id
+    subnet_id                 = azurerm_subnet.onprem-mgmt.id
-  network_security_group_id = azurerm_network_security_group.onprem-nsg.id
+    network_security_group_id = azurerm_network_security_group.onprem-nsg.id
 }
 
 resource "azurerm_virtual_machine" "onprem-vm" {
-  name                  = "${local.prefix-onprem}-vm"
+    name                  = "${local.prefix-onprem}-vm"
-  location              = azurerm_resource_group.onprem-vnet-rg.location
+    location              = azurerm_resource_group.onprem-vnet-rg.location
-  resource_group_name   = azurerm_resource_group.onprem-vnet-rg.name
+    resource_group_name   = azurerm_resource_group.onprem-vnet-rg.name
-  network_interface_ids = [azurerm_network_interface.onprem-nic.id]
+    network_interface_ids = [azurerm_network_interface.onprem-nic.id]
-  vm_size               = var.vmsize
+    vm_size               = var.vmsize
 
-  storage_image_reference {
+    storage_image_reference {
     publisher = "Canonical"
     offer     = "UbuntuServer"
     sku       = "16.04-LTS"
     version   = "latest"
-  }
+    }
 
-  storage_os_disk {
+    storage_os_disk {
     name              = "myosdisk1"
     caching           = "ReadWrite"
     create_option     = "FromImage"
     managed_disk_type = "Standard_LRS"
-  }
+    }
 
-  os_profile {
+    os_profile {
     computer_name  = "${local.prefix-onprem}-vm"
     admin_username = var.username
-    admin_password = local.password
+    admin_password = var.password
-  }
+    }
 
-  os_profile_linux_config {
+    os_profile_linux_config {
     disable_password_authentication = false
-  }
+    }
 
-  tags = {
+    tags = {
     environment = local.prefix-onprem
-  }
+    }
 }
 
 resource "azurerm_public_ip" "onprem-vpn-gateway1-pip" {
-  name                = "${local.prefix-onprem}-vpn-gateway1-pip"
+    name                = "${local.prefix-onprem}-vpn-gateway1-pip"
-  location            = azurerm_resource_group.onprem-vnet-rg.location
+    location            = azurerm_resource_group.onprem-vnet-rg.location
-  resource_group_name = azurerm_resource_group.onprem-vnet-rg.name
+    resource_group_name = azurerm_resource_group.onprem-vnet-rg.name
 
-  allocation_method = "Dynamic"
+    allocation_method = "Dynamic"
 }
 
 resource "azurerm_virtual_network_gateway" "onprem-vpn-gateway" {
-  name                = "onprem-vpn-gateway1"
+    name                = "onprem-vpn-gateway1"
-  location            = azurerm_resource_group.onprem-vnet-rg.location
+    location            = azurerm_resource_group.onprem-vnet-rg.location
-  resource_group_name = azurerm_resource_group.onprem-vnet-rg.name
+    resource_group_name = azurerm_resource_group.onprem-vnet-rg.name
 
-  type     = "Vpn"
+    type     = "Vpn"
-  vpn_type = "RouteBased"
+    vpn_type = "RouteBased"
 
-  active_active = false
+    active_active = false
-  enable_bgp    = false
+    enable_bgp    = false
-  sku           = "VpnGw1"
+    sku           = "VpnGw1"
 
-  ip_configuration {
+    ip_configuration {
     name                          = "vnetGatewayConfig"
     public_ip_address_id          = azurerm_public_ip.onprem-vpn-gateway1-pip.id
     private_ip_address_allocation = "Dynamic"
     subnet_id                     = azurerm_subnet.onprem-gateway-subnet.id
-  }
+    }
-  depends_on = [azurerm_public_ip.onprem-vpn-gateway1-pip]
+    depends_on = [azurerm_public_ip.onprem-vpn-gateway1-pip]
 
 }

quickstart/301-hub-spoke/spoke1.tf

@@ -1,109 +1,109 @@
 locals {
-  spoke1-location       = "eastus"
+    spoke1-location       = "eastus"
-  spoke1-resource-group = "spoke1-vnet-rg-${random_string.suffix.result}"
+    spoke1-resource-group = "spoke1-vnet-rg"
-  prefix-spoke1         = "spoke1"
+    prefix-spoke1         = "spoke1"
 }
 
 resource "azurerm_resource_group" "spoke1-vnet-rg" {
-  name     = local.spoke1-resource-group
+    name     = local.spoke1-resource-group
-  location = local.spoke1-location
+    location = local.spoke1-location
 }
 
 resource "azurerm_virtual_network" "spoke1-vnet" {
-  name                = "spoke1-vnet"
+    name                = "spoke1-vnet"
-  location            = azurerm_resource_group.spoke1-vnet-rg.location
+    location            = azurerm_resource_group.spoke1-vnet-rg.location
-  resource_group_name = azurerm_resource_group.spoke1-vnet-rg.name
+    resource_group_name = azurerm_resource_group.spoke1-vnet-rg.name
-  address_space       = ["10.1.0.0/16"]
+    address_space       = ["10.1.0.0/16"]
 
-  tags = {
+    tags = {
     environment = local.prefix-spoke1
-  }
+    }
 }
 
 resource "azurerm_subnet" "spoke1-mgmt" {
-  name                 = "mgmt"
+    name                 = "mgmt"
-  resource_group_name  = azurerm_resource_group.spoke1-vnet-rg.name
+    resource_group_name  = azurerm_resource_group.spoke1-vnet-rg.name
-  virtual_network_name = azurerm_virtual_network.spoke1-vnet.name
+    virtual_network_name = azurerm_virtual_network.spoke1-vnet.name
-  address_prefixes     = ["10.1.0.64/27"]
+    address_prefixes     = ["10.1.0.64/27"]
 }
 
 resource "azurerm_subnet" "spoke1-workload" {
-  name                 = "workload"
+    name                 = "workload"
-  resource_group_name  = azurerm_resource_group.spoke1-vnet-rg.name
+    resource_group_name  = azurerm_resource_group.spoke1-vnet-rg.name
-  virtual_network_name = azurerm_virtual_network.spoke1-vnet.name
+    virtual_network_name = azurerm_virtual_network.spoke1-vnet.name
-  address_prefixes     = ["10.1.1.0/24"]
+    address_prefixes     = ["10.1.1.0/24"]
 }
 
 resource "azurerm_virtual_network_peering" "spoke1-hub-peer" {
-  name                      = "spoke1-hub-peer"
+    name                      = "spoke1-hub-peer"
-  resource_group_name       = azurerm_resource_group.spoke1-vnet-rg.name
+    resource_group_name       = azurerm_resource_group.spoke1-vnet-rg.name
-  virtual_network_name      = azurerm_virtual_network.spoke1-vnet.name
+    virtual_network_name      = azurerm_virtual_network.spoke1-vnet.name
-  remote_virtual_network_id = azurerm_virtual_network.hub-vnet.id
+    remote_virtual_network_id = azurerm_virtual_network.hub-vnet.id
 
-  allow_virtual_network_access = true
+    allow_virtual_network_access = true
-  allow_forwarded_traffic      = true
+    allow_forwarded_traffic = true
-  allow_gateway_transit        = false
+    allow_gateway_transit   = false
-  use_remote_gateways          = true
+    use_remote_gateways     = true
-  depends_on                   = [azurerm_virtual_network.spoke1-vnet, azurerm_virtual_network.hub-vnet, azurerm_virtual_network_gateway.hub-vnet-gateway]
+    depends_on = [azurerm_virtual_network.spoke1-vnet, azurerm_virtual_network.hub-vnet , azurerm_virtual_network_gateway.hub-vnet-gateway]
 }
 
 resource "azurerm_network_interface" "spoke1-nic" {
-  name                 = "${local.prefix-spoke1}-nic"
+    name                 = "${local.prefix-spoke1}-nic"
-  location             = azurerm_resource_group.spoke1-vnet-rg.location
+    location             = azurerm_resource_group.spoke1-vnet-rg.location
-  resource_group_name  = azurerm_resource_group.spoke1-vnet-rg.name
+    resource_group_name  = azurerm_resource_group.spoke1-vnet-rg.name
-  enable_ip_forwarding = true
+    enable_ip_forwarding = true
 
-  ip_configuration {
+    ip_configuration {
     name                          = local.prefix-spoke1
     subnet_id                     = azurerm_subnet.spoke1-mgmt.id
     private_ip_address_allocation = "Dynamic"
-  }
+    }
 }
 
 resource "azurerm_virtual_machine" "spoke1-vm" {
-  name                  = "${local.prefix-spoke1}-vm"
+    name                  = "${local.prefix-spoke1}-vm"
-  location              = azurerm_resource_group.spoke1-vnet-rg.location
+    location              = azurerm_resource_group.spoke1-vnet-rg.location
-  resource_group_name   = azurerm_resource_group.spoke1-vnet-rg.name
+    resource_group_name   = azurerm_resource_group.spoke1-vnet-rg.name
-  network_interface_ids = [azurerm_network_interface.spoke1-nic.id]
+    network_interface_ids = [azurerm_network_interface.spoke1-nic.id]
-  vm_size               = var.vmsize
+    vm_size               = var.vmsize
 
-  storage_image_reference {
+    storage_image_reference {
     publisher = "Canonical"
     offer     = "UbuntuServer"
     sku       = "16.04-LTS"
     version   = "latest"
-  }
+    }
 
-  storage_os_disk {
+    storage_os_disk {
     name              = "myosdisk1"
     caching           = "ReadWrite"
     create_option     = "FromImage"
     managed_disk_type = "Standard_LRS"
-  }
+    }
 
-  os_profile {
+    os_profile {
     computer_name  = "${local.prefix-spoke1}-vm"
     admin_username = var.username
-    admin_password = local.password
+    admin_password = var.password
-  }
+    }
 
-  os_profile_linux_config {
+    os_profile_linux_config {
     disable_password_authentication = false
-  }
+    }
 
-  tags = {
+    tags = {
     environment = local.prefix-spoke1
-  }
+    }
 }
 
 resource "azurerm_virtual_network_peering" "hub-spoke1-peer" {
-  name                         = "hub-spoke1-peer"
+    name                      = "hub-spoke1-peer"
-  resource_group_name          = azurerm_resource_group.hub-vnet-rg.name
+    resource_group_name       = azurerm_resource_group.hub-vnet-rg.name
-  virtual_network_name         = azurerm_virtual_network.hub-vnet.name
+    virtual_network_name      = azurerm_virtual_network.hub-vnet.name
-  remote_virtual_network_id    = azurerm_virtual_network.spoke1-vnet.id
+    remote_virtual_network_id = azurerm_virtual_network.spoke1-vnet.id
-  allow_virtual_network_access = true
+    allow_virtual_network_access = true
-  allow_forwarded_traffic      = true
+    allow_forwarded_traffic   = true
-  allow_gateway_transit        = true
+    allow_gateway_transit     = true
-  use_remote_gateways          = false
+    use_remote_gateways       = false
-  depends_on                   = [azurerm_virtual_network.spoke1-vnet, azurerm_virtual_network.hub-vnet, azurerm_virtual_network_gateway.hub-vnet-gateway]
+    depends_on = [azurerm_virtual_network.spoke1-vnet, azurerm_virtual_network.hub-vnet, azurerm_virtual_network_gateway.hub-vnet-gateway]
 }

quickstart/301-hub-spoke/spoke2.tf

@@ -1,113 +1,113 @@
 locals {
-  spoke2-location       = "eastus"
+    spoke2-location       = "eastus"
-  spoke2-resource-group = "spoke2-vnet-rg-${random_string.suffix.result}"
+    spoke2-resource-group = "spoke2-vnet-rg"
-  prefix-spoke2         = "spoke2"
+    prefix-spoke2         = "spoke2"
 }
 
 resource "azurerm_resource_group" "spoke2-vnet-rg" {
-  name     = local.spoke2-resource-group
+    name     = local.spoke2-resource-group
-  location = local.spoke2-location
+    location = local.spoke2-location
 }
 
 resource "azurerm_virtual_network" "spoke2-vnet" {
-  name                = "${local.prefix-spoke2}-vnet"
+    name                = "${local.prefix-spoke2}-vnet"
-  location            = azurerm_resource_group.spoke2-vnet-rg.location
+    location            = azurerm_resource_group.spoke2-vnet-rg.location
-  resource_group_name = azurerm_resource_group.spoke2-vnet-rg.name
+    resource_group_name = azurerm_resource_group.spoke2-vnet-rg.name
-  address_space       = ["10.2.0.0/16"]
+    address_space       = ["10.2.0.0/16"]
 
-  tags = {
+    tags = {
     environment = local.prefix-spoke2
-  }
+    }
 }
 
 resource "azurerm_subnet" "spoke2-mgmt" {
-  name                 = "mgmt"
+    name                 = "mgmt"
-  resource_group_name  = azurerm_resource_group.spoke2-vnet-rg.name
+    resource_group_name  = azurerm_resource_group.spoke2-vnet-rg.name
-  virtual_network_name = azurerm_virtual_network.spoke2-vnet.name
+    virtual_network_name = azurerm_virtual_network.spoke2-vnet.name
-  address_prefixes     = ["10.2.0.64/27"]
+    address_prefixes     = ["10.2.0.64/27"]
 }
 
 resource "azurerm_subnet" "spoke2-workload" {
-  name                 = "workload"
+    name                 = "workload"
-  resource_group_name  = azurerm_resource_group.spoke2-vnet-rg.name
+    resource_group_name  = azurerm_resource_group.spoke2-vnet-rg.name
-  virtual_network_name = azurerm_virtual_network.spoke2-vnet.name
+    virtual_network_name = azurerm_virtual_network.spoke2-vnet.name
-  address_prefixes     = ["10.2.1.0/24"]
+    address_prefixes     = ["10.2.1.0/24"]
 }
 
 resource "azurerm_virtual_network_peering" "spoke2-hub-peer" {
-  name                      = "${local.prefix-spoke2}-hub-peer"
+    name                      = "${local.prefix-spoke2}-hub-peer"
-  resource_group_name       = azurerm_resource_group.spoke2-vnet-rg.name
+    resource_group_name       = azurerm_resource_group.spoke2-vnet-rg.name
-  virtual_network_name      = azurerm_virtual_network.spoke2-vnet.name
+    virtual_network_name      = azurerm_virtual_network.spoke2-vnet.name
-  remote_virtual_network_id = azurerm_virtual_network.hub-vnet.id
+    remote_virtual_network_id = azurerm_virtual_network.hub-vnet.id
 
-  allow_virtual_network_access = true
+    allow_virtual_network_access = true
-  allow_forwarded_traffic      = true
+    allow_forwarded_traffic = true
-  allow_gateway_transit        = false
+    allow_gateway_transit   = false
-  use_remote_gateways          = true
+    use_remote_gateways     = true
-  depends_on                   = [azurerm_virtual_network.spoke2-vnet, azurerm_virtual_network.hub-vnet, azurerm_virtual_network_gateway.hub-vnet-gateway]
+    depends_on = [azurerm_virtual_network.spoke2-vnet, azurerm_virtual_network.hub-vnet, azurerm_virtual_network_gateway.hub-vnet-gateway]
 }
 
 resource "azurerm_network_interface" "spoke2-nic" {
-  name                 = "${local.prefix-spoke2}-nic"
+    name                 = "${local.prefix-spoke2}-nic"
-  location             = azurerm_resource_group.spoke2-vnet-rg.location
+    location             = azurerm_resource_group.spoke2-vnet-rg.location
-  resource_group_name  = azurerm_resource_group.spoke2-vnet-rg.name
+    resource_group_name  = azurerm_resource_group.spoke2-vnet-rg.name
-  enable_ip_forwarding = true
+    enable_ip_forwarding = true
 
-  ip_configuration {
+    ip_configuration {
     name                          = local.prefix-spoke2
     subnet_id                     = azurerm_subnet.spoke2-mgmt.id
     private_ip_address_allocation = "Dynamic"
-  }
+    }
 
-  tags = {
+    tags = {
     environment = local.prefix-spoke2
-  }
+    }
 }
 
 resource "azurerm_virtual_machine" "spoke2-vm" {
-  name                  = "${local.prefix-spoke2}-vm"
+    name                  = "${local.prefix-spoke2}-vm"
-  location              = azurerm_resource_group.spoke2-vnet-rg.location
+    location              = azurerm_resource_group.spoke2-vnet-rg.location
-  resource_group_name   = azurerm_resource_group.spoke2-vnet-rg.name
+    resource_group_name   = azurerm_resource_group.spoke2-vnet-rg.name
-  network_interface_ids = [azurerm_network_interface.spoke2-nic.id]
+    network_interface_ids = [azurerm_network_interface.spoke2-nic.id]
-  vm_size               = var.vmsize
+    vm_size               = var.vmsize
 
-  storage_image_reference {
+    storage_image_reference {
     publisher = "Canonical"
     offer     = "UbuntuServer"
     sku       = "16.04-LTS"
     version   = "latest"
-  }
+    }
 
-  storage_os_disk {
+    storage_os_disk {
     name              = "myosdisk1"
     caching           = "ReadWrite"
     create_option     = "FromImage"
     managed_disk_type = "Standard_LRS"
-  }
+    }
 
-  os_profile {
+    os_profile {
     computer_name  = "${local.prefix-spoke2}-vm"
     admin_username = var.username
-    admin_password = local.password
+    admin_password = var.password
-  }
+    }
 
-  os_profile_linux_config {
+    os_profile_linux_config {
     disable_password_authentication = false
-  }
+    }
 
-  tags = {
+    tags = {
     environment = local.prefix-spoke2
-  }
+    }
 }
 
 resource "azurerm_virtual_network_peering" "hub-spoke2-peer" {
-  name                         = "hub-spoke2-peer"
+    name                      = "hub-spoke2-peer"
-  resource_group_name          = azurerm_resource_group.hub-vnet-rg.name
+    resource_group_name       = azurerm_resource_group.hub-vnet-rg.name
-  virtual_network_name         = azurerm_virtual_network.hub-vnet.name
+    virtual_network_name      = azurerm_virtual_network.hub-vnet.name
-  remote_virtual_network_id    = azurerm_virtual_network.spoke2-vnet.id
+    remote_virtual_network_id = azurerm_virtual_network.spoke2-vnet.id
-  allow_virtual_network_access = true
+    allow_virtual_network_access = true
-  allow_forwarded_traffic      = true
+    allow_forwarded_traffic   = true
-  allow_gateway_transit        = true
+    allow_gateway_transit     = true
-  use_remote_gateways          = false
+    use_remote_gateways       = false
-  depends_on                   = [azurerm_virtual_network.spoke2-vnet, azurerm_virtual_network.hub-vnet, azurerm_virtual_network_gateway.hub-vnet-gateway]
+    depends_on = [azurerm_virtual_network.spoke2-vnet, azurerm_virtual_network.hub-vnet, azurerm_virtual_network_gateway.hub-vnet-gateway]
 }

quickstart/301-hub-spoke/variables.tf

@@ -1,20 +1,18 @@
 variable "location" {
-  description = "Location of the network"
+    description = "Location of the network"
-  default     = "eastus"
+    default     = "eastus"
 }
 
 variable "username" {
-  description = "Username for Virtual Machines"
+    description = "Username for Virtual Machines"
-  default     = "azureuser"
+    default     = "azureuser"
 }
 
 variable "password" {
-  description = "Password for Virtual Machines"
+    description = "Password for Virtual Machines"
-  sensitive   = true
-  default     = null
 }
 
 variable "vmsize" {
-  description = "Size of the VMs"
+    description = "Size of the VMs"
-  default     = "Standard_DS1_v2"
+    default     = "Standard_DS1_v2"
 }

quickstart/301-machine-learning-hub-spoke-secure/azure-firewall.tf

@@ -3,7 +3,7 @@ resource "random_string" "fw_diag_prefix" {
   length  = 8
   upper   = false
   special = false
-  numeric = false
+  number  = false
 }
 resource "azurerm_ip_group" "ip_group_hub" {
   name                = "hub-ipgroup"
@@ -47,8 +47,6 @@ resource "azurerm_firewall" "azure_firewall_instance" {
   name                = "afw-${var.name}-${var.environment}"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.hub_rg.name
-  sku_name            = "AZFW_VNet"
-  sku_tier            = "Standard"
   firewall_policy_id  = azurerm_firewall_policy.base_policy.id
 
   ip_configuration {
@@ -107,11 +105,6 @@ resource "azurerm_monitor_diagnostic_setting" "azure_firewall_instance" {
     }
   }
 
-  lifecycle {
-    ignore_changes = [
-      log
-    ]
-  }
 }
 
 resource "azurerm_firewall_policy_rule_collection_group" "azure_firewall_rules_collection" {

quickstart/301-machine-learning-hub-spoke-secure/compute.tf

@@ -3,7 +3,7 @@ resource "random_string" "ci_prefix" {
   length  = 8
   upper   = false
   special = false
-  numeric = false
+  number  = false
 }
 
 # Compute instance

quickstart/301-machine-learning-hub-spoke-secure/dsvm.tf

@@ -10,15 +10,6 @@ resource "azurerm_network_interface" "dsvm" {
   }
 }
 
-resource "random_password" "dsvm_host_password" {
-  count  = var.dsvm_host_password == null ? 1 : 0
-  length = 20
-}
-
-locals {
-  dsvm_host_password = try(random_password.dsvm_host_password[0].result, var.dsvm_host_password)
-}
-
 resource "azurerm_windows_virtual_machine" "dsvm" {
   name                = var.dsvm_name
   location            = azurerm_resource_group.default.location
@@ -46,18 +37,12 @@ resource "azurerm_windows_virtual_machine" "dsvm" {
   }
   computer_name  = var.dsvm_name
   admin_username = var.dsvm_admin_username
-  admin_password = local.dsvm_host_password
+  admin_password = var.dsvm_host_password
 
   provision_vm_agent = true
-  vm_agent_platform_updates_enabled = false
 
   timeouts {
     create = "60m"
     delete = "2h"
   }
-  lifecycle {
-    ignore_changes = [ 
-      vm_agent_platform_updates_enabled,
-    ]
-  }
 }

quickstart/301-machine-learning-hub-spoke-secure/main.tf

@@ -4,43 +4,29 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.0"
+      version = "=2.78.0"
     }
 
     azureml = {
-      source = "registry.terraform.io/orobix/azureml"
+      source = "registry.terraform.io/Telemaco019/azureml"
     }
   }
 }
 
 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" {}
 
-resource "random_string" "suffix" {
-  length  = 4
-  upper   = false
-  special = false
-}
-
 resource "azurerm_resource_group" "default" {
-  name     = "rg-${var.name}-${var.environment}-${random_string.suffix.result}"
+  name     = "rg-${var.name}-${var.environment}"
   location = var.location
 }
 
 #Hub Resource Group
 resource "azurerm_resource_group" "hub_rg" {
-  name     = "rg-hub-${var.name}-${var.environment}-${random_string.suffix.result}"
+  name     = "rg-hub-${var.name}-${var.environment}"
   location = var.location
+
 }

quickstart/301-machine-learning-hub-spoke-secure/variables.tf

@@ -1,7 +1,6 @@
 variable "name" {
   type        = string
   description = "Name of the deployment"
-  default     = "301mlhss"
 }
 
 variable "environment" {
@@ -91,5 +90,4 @@ variable "dsvm_host_password" {
   type        = string
   description = "Password for the admin username of the Data Science VM"
   sensitive   = true
-  default     = null
 }

quickstart/301-machine-learning-hub-spoke-secure/workspace.tf

@@ -1,6 +1,6 @@
 # Dependent resources for Azure Machine Learning
 resource "azurerm_application_insights" "default" {
-  name                = "appi-${var.name}-${var.environment}-${random_string.suffix.result}"
+  name                = "appi-${var.name}-${var.environment}"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
   workspace_id        = azurerm_log_analytics_workspace.default.id
@@ -8,7 +8,7 @@ resource "azurerm_application_insights" "default" {
 }
 
 resource "azurerm_key_vault" "default" {
-  name                     = "kv-${var.name}-${var.environment}-${random_string.suffix.result}"
+  name                     = "kv-${var.name}-${var.environment}"
   location                 = azurerm_resource_group.default.location
   resource_group_name      = azurerm_resource_group.default.name
   tenant_id                = data.azurerm_client_config.current.tenant_id
@@ -22,7 +22,7 @@ resource "azurerm_key_vault" "default" {
 }
 
 resource "azurerm_storage_account" "default" {
-  name                            = "st${var.name}${var.environment}${random_string.suffix.result}"
+  name                            = "st${var.name}${var.environment}"
   location                        = azurerm_resource_group.default.location
   resource_group_name             = azurerm_resource_group.default.name
   account_tier                    = "Standard"
@@ -36,7 +36,7 @@ resource "azurerm_storage_account" "default" {
 }
 
 resource "azurerm_container_registry" "default" {
-  name                = "cr${var.name}${var.environment}${random_string.suffix.result}"
+  name                = "cr${var.name}${var.environment}"
   location            = azurerm_resource_group.default.location
   resource_group_name = azurerm_resource_group.default.name
   sku                 = "Premium"
@@ -50,7 +50,7 @@ resource "azurerm_container_registry" "default" {
 
 # Machine Learning workspace
 resource "azurerm_machine_learning_workspace" "default" {
-  name                    = "mlw-${var.name}-${var.environment}-${random_string.suffix.result}"
+  name                    = "mlw-${var.name}-${var.environment}"
   location                = azurerm_resource_group.default.location
   resource_group_name     = azurerm_resource_group.default.name
   application_insights_id = azurerm_application_insights.default.id
@@ -76,13 +76,6 @@ resource "azurerm_machine_learning_workspace" "default" {
 
 }
 
-resource "time_sleep" "one_min" {
-  create_duration = "1m"
-  depends_on = [
-    azurerm_windows_virtual_machine.dsvm
-  ]
-}
-
 # Private endpoints
 resource "azurerm_private_endpoint" "kv_ple" {
   name                = "ple-${var.name}-${var.environment}-kv"
@@ -101,9 +94,6 @@ resource "azurerm_private_endpoint" "kv_ple" {
     subresource_names              = ["vault"]
     is_manual_connection           = false
   }
-  depends_on = [
-    time_sleep.one_min
-  ]
 }
 
 resource "azurerm_private_endpoint" "st_ple_blob" {
@@ -123,9 +113,6 @@ resource "azurerm_private_endpoint" "st_ple_blob" {
     subresource_names              = ["blob"]
     is_manual_connection           = false
   }
-  depends_on = [
-    time_sleep.one_min
-  ]
 }
 
 resource "azurerm_private_endpoint" "storage_ple_file" {
@@ -145,9 +132,6 @@ resource "azurerm_private_endpoint" "storage_ple_file" {
     subresource_names              = ["file"]
     is_manual_connection           = false
   }
-  depends_on = [
-    time_sleep.one_min
-  ]
 }
 
 resource "azurerm_private_endpoint" "cr_ple" {
@@ -167,9 +151,6 @@ resource "azurerm_private_endpoint" "cr_ple" {
     subresource_names              = ["registry"]
     is_manual_connection           = false
   }
-  depends_on = [
-    time_sleep.one_min
-  ]
 }
 
 resource "azurerm_private_endpoint" "mlw_ple" {
@@ -189,9 +170,6 @@ resource "azurerm_private_endpoint" "mlw_ple" {
     subresource_names              = ["amlworkspace"]
     is_manual_connection           = false
   }
-  depends_on = [
-    time_sleep.one_min
-  ]
 }
 
 # Compute cluster for image building required since the workspace is behind a vnet.