Custom domain quickfix (#105)

donovm4 · web-flow · commit defb0e53c51a · 2024-07-25T10:20:09.000-04:00
* initial commit

* web_app_slots custom domains

* functionality for referencing existing thumbprint value for custom binding

* linting fixes, pre-commit
diff --git a/README.md b/README.md
@@ -803,6 +803,7 @@ map(object({
     inherit_tags                 = optional(bool, true)
     tags                         = optional(map(any), {})
     thumbprint_key               = optional(string)
+    thumbprint_value             = optional(string)
     ttl                          = optional(number, 300)
     validation_type              = optional(string, "cname-delegation")
     create_cname_records         = optional(bool, false)
@@ -2035,15 +2036,15 @@ Description: The object principal id of the resource.
 
 ### <a name="output_kind"></a> [kind](#output\_kind)
 
-Description: n/a
+Description: The kind of app service.
 
 ### <a name="output_name"></a> [name](#output\_name)
 
 Description: The name of the resource.
 
 ### <a name="output_os_type"></a> [os\_type](#output\_os\_type)
 
-Description: n/a
+Description: The operating system type of the resource.
 
 ### <a name="output_private_endpoint_locks"></a> [private\_endpoint\_locks](#output\_private\_endpoint\_locks)
 
@@ -2085,6 +2086,10 @@ Description: The locks of the resources.
 
 Description: value
 
+### <a name="output_thumbprints"></a> [thumbprints](#output\_thumbprints)
+
+Description: The thumbprint of the certificate.
+
 ### <a name="output_web_app_active_slot"></a> [web\_app\_active\_slot](#output\_web\_app\_active\_slot)
 
 Description: The active slot.
diff --git a/examples/auto_heal_enabled/README.md b/examples/auto_heal_enabled/README.md
@@ -86,7 +86,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/auto_heal_enabled/main.tf b/examples/auto_heal_enabled/main.tf
@@ -80,7 +80,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/basic_auth/README.md b/examples/basic_auth/README.md
@@ -87,7 +87,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/basic_auth/main.tf b/examples/basic_auth/main.tf
@@ -80,7 +80,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/custom_domain/README.md b/examples/custom_domain/README.md
@@ -79,13 +79,13 @@ resource "azurerm_service_plan" "example" {
 # Use data object to reference an existing Key Vault and stored certificate
 /*
 data "azurerm_key_vault" "existing_keyvault" {
-  name                = "vault3-4-24"
-  resource_group_name = "rg-test"
+  name                = "<keyvault_name>"
+  resource_group_name = "<keyvault_resource_group>"
 }
 # /*
 data "azurerm_key_vault_secret" "stored_certificate" {
   key_vault_id = data.azurerm_key_vault.existing_keyvault.id
-  name         = "donvmccoy"
+  name         = "<certificate_name>"
 }
 */
 
@@ -95,7 +95,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
@@ -176,7 +176,7 @@ module "test" {
       pfx_blob             = data.azurerm_key_vault_secret.stored_certificate.value
 
       app_service_name    = "${module.naming.function_app.name_unique}-custom-domain"
-      hostname            = "${module.naming.function_app.name_unique}-custom-domain.donvmccoy.com"
+      hostname            = "${module.naming.function_app.name_unique}-custom-domain.<zone_name>"
       resource_group_name = azurerm_resource_group.example.name
       ssl_state           = "SniEnabled"
       thumbprint_key      = "production" # Currently the key of the custom domain
@@ -206,7 +206,7 @@ module "test" {
       # pfx_blob             = data.azurerm_key_vault_secret.stored_certificate.value
 
       app_service_slot_key = "qa"
-      hostname = "${module.naming.function_app.name_unique}-qa.donvmccoy.com"
+      hostname = "${module.naming.function_app.name_unique}-qa.<zone_name>"
       ssl_state           = "SniEnabled"
       thumbprint_key      = "production"
     }
@@ -282,6 +282,10 @@ Description: This is the full output for the resource.
 
 Description: This is the URI for the resource.
 
+### <a name="output_thumbprints"></a> [thumbprints](#output\_thumbprints)
+
+Description: This is the thumbprints for the resource.
+
 ## Modules
 
 The following Modules are called:
diff --git a/examples/custom_domain/main.tf b/examples/custom_domain/main.tf
@@ -75,13 +75,13 @@ resource "azurerm_service_plan" "example" {
 # Use data object to reference an existing Key Vault and stored certificate
 /*
 data "azurerm_key_vault" "existing_keyvault" {
-  name                = "vault3-4-24"
-  resource_group_name = "rg-test"
+  name                = "<keyvault_name>"
+  resource_group_name = "<keyvault_resource_group>"
 }
 # /*
 data "azurerm_key_vault_secret" "stored_certificate" {
   key_vault_id = data.azurerm_key_vault.existing_keyvault.id
-  name         = "donvmccoy"
+  name         = "<certificate_name>"
 }
 */
 
@@ -91,7 +91,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
@@ -172,7 +172,7 @@ module "test" {
       pfx_blob             = data.azurerm_key_vault_secret.stored_certificate.value
 
       app_service_name    = "${module.naming.function_app.name_unique}-custom-domain"
-      hostname            = "${module.naming.function_app.name_unique}-custom-domain.donvmccoy.com"
+      hostname            = "${module.naming.function_app.name_unique}-custom-domain.<zone_name>"
       resource_group_name = azurerm_resource_group.example.name
       ssl_state           = "SniEnabled"
       thumbprint_key      = "production" # Currently the key of the custom domain
@@ -202,7 +202,7 @@ module "test" {
       # pfx_blob             = data.azurerm_key_vault_secret.stored_certificate.value
 
       app_service_slot_key = "qa"
-      hostname = "${module.naming.function_app.name_unique}-qa.donvmccoy.com"
+      hostname = "${module.naming.function_app.name_unique}-qa.<zone_name>"
       ssl_state           = "SniEnabled"
       thumbprint_key      = "production"
     }
diff --git a/examples/custom_domain/outputs.tf b/examples/custom_domain/outputs.tf
@@ -13,3 +13,9 @@ output "resource_uri" {
   description = "This is the URI for the resource."
   value       = module.test.resource_uri
 }
+
+output "thumbprints" {
+  description = "This is the thumbprints for the resource."
+  sensitive   = true
+  value       = module.test.thumbprints
+}
diff --git a/examples/default/README.md b/examples/default/README.md
@@ -86,7 +86,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/default/main.tf b/examples/default/main.tf
@@ -80,7 +80,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/deployment_slot/README.md b/examples/deployment_slot/README.md
@@ -86,7 +86,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/deployment_slot/main.tf b/examples/deployment_slot/main.tf
@@ -80,7 +80,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/deployment_slot_with_interfaces/README.md b/examples/deployment_slot_with_interfaces/README.md
@@ -118,7 +118,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/deployment_slot_with_interfaces/main.tf b/examples/deployment_slot_with_interfaces/main.tf
@@ -112,7 +112,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/interfaces/README.md b/examples/interfaces/README.md
@@ -131,7 +131,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/interfaces/main.tf b/examples/interfaces/main.tf
@@ -125,7 +125,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/ip_restriction/README.md b/examples/ip_restriction/README.md
@@ -85,7 +85,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/ip_restriction/main.tf b/examples/ip_restriction/main.tf
@@ -79,7 +79,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/linux_function_app/README.md b/examples/linux_function_app/README.md
@@ -82,7 +82,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/linux_function_app/main.tf b/examples/linux_function_app/main.tf
@@ -76,7 +76,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/linux_web_app/README.md b/examples/linux_web_app/README.md
@@ -66,7 +66,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/linux_web_app/main.tf b/examples/linux_web_app/main.tf
@@ -60,7 +60,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/storage_uses_managed_identity/README.md b/examples/storage_uses_managed_identity/README.md
@@ -81,7 +81,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/storage_uses_managed_identity/main.tf b/examples/storage_uses_managed_identity/main.tf
@@ -75,7 +75,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/windows_function_app/README.md b/examples/windows_function_app/README.md
@@ -83,7 +83,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/windows_function_app/main.tf b/examples/windows_function_app/main.tf
@@ -77,7 +77,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/windows_web_app/README.md b/examples/windows_web_app/README.md
@@ -65,7 +65,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/examples/windows_web_app/main.tf b/examples/windows_web_app/main.tf
@@ -59,7 +59,7 @@ module "test" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.7.4"
+  # version = "0.8.1"
 
   enable_telemetry = var.enable_telemetry
 
diff --git a/main.custom_domians.tf b/main.custom_domians.tf
@@ -53,18 +53,24 @@ resource "azurerm_app_service_custom_hostname_binding" "this" {
   hostname            = each.value.hostname
   resource_group_name = each.value.resource_group_name != null ? each.value.resource_group_name : var.resource_group_name
   ssl_state           = each.value.ssl_state
-  thumbprint          = azurerm_app_service_certificate.this[each.value.thumbprint_key].thumbprint
+  thumbprint          = each.value.thumbprint_key != null ? azurerm_app_service_certificate.this[each.value.thumbprint_key].thumbprint : each.value.thumbprint_value
 
   depends_on = [azurerm_windows_function_app.this, azurerm_windows_function_app_slot.this, azurerm_linux_function_app.this, azurerm_linux_function_app_slot.this, azurerm_dns_txt_record.this, azurerm_dns_cname_record.this]
 }
 
 resource "azurerm_app_service_slot_custom_hostname_binding" "slot" {
   for_each = { for binding, domains in var.custom_domains : binding => domains if domains.slot_as_target }
 
-  app_service_slot_id = var.os_type == "Windows" ? azurerm_windows_function_app_slot.this[each.value.app_service_slot_key].id : azurerm_linux_function_app_slot.this[each.value.app_service_slot_key].id
+  app_service_slot_id = var.kind == "functionapp" ? (var.os_type == "Windows" ? azurerm_windows_function_app_slot.this[each.value.app_service_slot_key].id : azurerm_linux_function_app_slot.this[each.value.app_service_slot_key].id) : (var.os_type == "Windows" ? azurerm_windows_web_app_slot.this[each.value.app_service_slot_key].id : azurerm_linux_web_app_slot.this[each.value.app_service_slot_key].id)
   hostname            = each.value.hostname
   ssl_state           = each.value.ssl_state
-  thumbprint          = azurerm_app_service_certificate.this[each.value.thumbprint_key].thumbprint
+  thumbprint          = each.value.thumbprint_key != null ? azurerm_app_service_certificate.this[each.value.thumbprint_key].thumbprint : each.value.thumbprint_value
 
-  depends_on = [azurerm_windows_function_app.this, azurerm_windows_function_app_slot.this, azurerm_linux_function_app.this, azurerm_linux_function_app_slot.this, azurerm_dns_txt_record.this, azurerm_dns_cname_record.this]
+  depends_on = [
+    azurerm_windows_function_app.this, azurerm_windows_function_app_slot.this,
+    azurerm_windows_web_app.this, azurerm_windows_web_app_slot.this,
+    azurerm_linux_function_app.this, azurerm_linux_function_app_slot.this,
+    azurerm_linux_web_app.this, azurerm_linux_web_app_slot.this,
+    azurerm_dns_txt_record.this, azurerm_dns_cname_record.this
+  ]
 }
diff --git a/outputs.tf b/outputs.tf
diff --git a/variables.tf b/variables.tf
