fix: resolve diagnostic settings inconsistent plan error for function apps

modules/azure/api_management_api_simple/main.tf

@@ -113,7 +113,7 @@ resource "azurerm_api_management_api_diagnostic" "api_diagnostic" {
 
 # This temporary output is used to retrieve the XML content of the API policy.
 output "api_policy_xml_content" {
-  value = azurerm_api_management_api_policy.api_policy.xml_content
+  value       = azurerm_api_management_api_policy.api_policy.xml_content
   description = "The XML content of the API policy."
 }
 

modules/azure/frontdoor_standard/main.tf

@@ -24,17 +24,17 @@ resource "azurerm_cdn_frontdoor_profile" "fd_profile" {
 
 # Endpoint
 resource "azurerm_cdn_frontdoor_endpoint" "fd_endpoint" {
-  name                    = var.name
+  name                     = var.name
   cdn_frontdoor_profile_id = azurerm_cdn_frontdoor_profile.fd_profile.id
 }
 
 # Custom domains
 resource "azurerm_cdn_frontdoor_custom_domain" "fd_custom_domains" {
-  for_each            = { for custom_domain in var.custom_domains: custom_domain.name => custom_domain }
-  
-  name                = each.key
+  for_each = { for custom_domain in var.custom_domains : custom_domain.name => custom_domain }
+
+  name                     = each.key
   cdn_frontdoor_profile_id = azurerm_cdn_frontdoor_profile.fd_profile.id
-  host_name           = each.value.host_name
+  host_name                = each.value.host_name
 
   tls {
     certificate_type = "ManagedCertificate"
@@ -43,9 +43,9 @@ resource "azurerm_cdn_frontdoor_custom_domain" "fd_custom_domains" {
 
 # Origin groups
 resource "azurerm_cdn_frontdoor_origin_group" "fd_origin_groups" {
-  for_each            = { for group in var.origin_groups : group.name => group }
+  for_each = { for group in var.origin_groups : group.name => group }
 
-  name                = each.key
+  name                     = each.key
   cdn_frontdoor_profile_id = azurerm_cdn_frontdoor_profile.fd_profile.id
 
   session_affinity_enabled = false
@@ -57,28 +57,28 @@ resource "azurerm_cdn_frontdoor_origin_group" "fd_origin_groups" {
     request_type        = each.value.health_probe.request_type
   }
 
-  load_balancing { }
+  load_balancing {}
 }
 
 # Origins
 resource "azurerm_cdn_frontdoor_origin" "fd_origins" {
   for_each = {
     for group in var.origin_groups :
-        group.name => group.origins[0] # assumes 1 origin per origin group (can be expanded)
+    group.name => group.origins[0] # assumes 1 origin per origin group (can be expanded)
   }
 
   name                          = each.key
   cdn_frontdoor_origin_group_id = azurerm_cdn_frontdoor_origin_group.fd_origin_groups[each.key].id
-  
+
   certificate_name_check_enabled = false
 
-  host_name                     = each.value.host_name
-  http_port                     = each.value.http_port
-  https_port                    = each.value.https_port
-  origin_host_header            = each.value.origin_host_header
-  priority                      = each.value.priority
-  weight                        = each.value.weight
-  enabled                       = each.value.enabled
+  host_name          = each.value.host_name
+  http_port          = each.value.http_port
+  https_port         = each.value.https_port
+  origin_host_header = each.value.origin_host_header
+  priority           = each.value.priority
+  weight             = each.value.weight
+  enabled            = each.value.enabled
 }
 
 # Redirect Rule Set
@@ -118,11 +118,11 @@ resource "azurerm_cdn_frontdoor_route" "fd_redirect_routes" {
   cdn_frontdoor_rule_set_ids      = [azurerm_cdn_frontdoor_rule_set.fd_rs_redirect.id]
   cdn_frontdoor_custom_domain_ids = [azurerm_cdn_frontdoor_custom_domain.fd_custom_domains[each.value.custom_domain_name].id]
 
-  enabled                         = each.value.enabled
-  patterns_to_match               = each.value.patterns_to_match
-  supported_protocols             = each.value.supported_protocols
-  https_redirect_enabled          = false
-  link_to_default_domain          = false
+  enabled                = each.value.enabled
+  patterns_to_match      = each.value.patterns_to_match
+  supported_protocols    = each.value.supported_protocols
+  https_redirect_enabled = false
+  link_to_default_domain = false
 }
 
 # Routes (forwarding)
@@ -136,25 +136,25 @@ resource "azurerm_cdn_frontdoor_route" "fd_forwarding_routes" {
   cdn_frontdoor_origin_group_id   = azurerm_cdn_frontdoor_origin_group.fd_origin_groups[each.value.origin_group_name].id
   cdn_frontdoor_origin_ids        = [azurerm_cdn_frontdoor_origin.fd_origins[each.value.origin_group_name].id]
   cdn_frontdoor_custom_domain_ids = [azurerm_cdn_frontdoor_custom_domain.fd_custom_domains[each.value.custom_domain_name].id]
-                                  
-  enabled                         = each.value.enabled
-  patterns_to_match               = each.value.patterns_to_match
-  supported_protocols             = each.value.supported_protocols
-  https_redirect_enabled          = false
-  forwarding_protocol             = "HttpsOnly"
-  link_to_default_domain          = false
+
+  enabled                = each.value.enabled
+  patterns_to_match      = each.value.patterns_to_match
+  supported_protocols    = each.value.supported_protocols
+  https_redirect_enabled = false
+  forwarding_protocol    = "HttpsOnly"
+  link_to_default_domain = false
 }
 
 data "azurerm_cdn_frontdoor_firewall_policy" "fd_firewall_policy" {
-  count = var.security_policy == null ? 0 : 1  
+  count               = var.security_policy == null ? 0 : 1
   name                = var.security_policy.firewall_policy_name
   resource_group_name = var.resource_group_name
 }
 
 # Security policy
 resource "azurerm_cdn_frontdoor_security_policy" "fd_security_policy" {
   count                    = var.security_policy == null ? 0 : 1
-  name                     = "${var.security_policy.firewall_policy_name}-securityPolicy" 
+  name                     = "${var.security_policy.firewall_policy_name}-securityPolicy"
   cdn_frontdoor_profile_id = azurerm_cdn_frontdoor_profile.fd_profile.id
 
   security_policies {

modules/azure/frontdoor_standard/variables.tf

@@ -65,7 +65,7 @@ variable "forwarding_routes" {
 
 variable "origin_groups" {
   type = list(object({
-    name         = string
+    name = string
     health_probe = optional(object({
       protocol            = string
       interval_in_seconds = number

modules/azure/function_app_linux/main.tf

@@ -99,39 +99,18 @@ resource "azurerm_app_service_virtual_network_swift_connection" "vnet_integratio
 
 # Logging and analytics
 
-data "azurerm_monitor_diagnostic_categories" "diagnostic_categories" {
-  count       = var.log_analytics_workspace_id == null ? 0 : 1
-  resource_id = azurerm_linux_function_app.function_app.id
-}
-
 resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   count                      = var.log_analytics_workspace_id == null ? 0 : 1
   name                       = "diag-${var.name}"
   target_resource_id         = azurerm_linux_function_app.function_app.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
-  dynamic "enabled_log" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].log_category_types
-
-    content {
-      category = enabled_log.value
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  enabled_log {
+    category_group = "allLogs"
   }
 
-  dynamic "metric" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].metrics
-
-    content {
-      category = metric.value
-      enabled  = true
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  metric {
+    category = "AllMetrics"
+    enabled  = true
   }
 }

modules/azure/function_app_linux_managed_identity/main.tf

@@ -96,7 +96,7 @@ resource "azurerm_linux_function_app" "function_app" {
     }
   }
 
-  auth_settings_v2 {  
+  auth_settings_v2 {
     auth_enabled           = true
     require_authentication = var.authentication_settings.require_authentication == null ? false : var.authentication_settings.require_authentication
     unauthenticated_action = var.authentication_settings.unauthenticated_action == null ? null : var.authentication_settings.unauthenticated_action
@@ -254,7 +254,7 @@ resource "azuread_group_member" "registered_app_member" {
 }
 
 resource "azuread_application_password" "password" {
-  count                 = local.should_create_app ? 1 : 0
+  count          = local.should_create_app ? 1 : 0
   application_id = azuread_application.application[0].id
 }
 
@@ -270,39 +270,18 @@ resource "azurerm_app_service_virtual_network_swift_connection" "vnet_integratio
 
 # Logging and analytics
 
-data "azurerm_monitor_diagnostic_categories" "diagnostic_categories" {
-  count       = var.log_analytics_workspace_id == null ? 0 : 1
-  resource_id = azurerm_linux_function_app.function_app.id
-}
-
 resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   count                      = var.log_analytics_workspace_id == null ? 0 : 1
   name                       = "diag-${var.name}"
   target_resource_id         = azurerm_linux_function_app.function_app.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
-  dynamic "enabled_log" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].log_category_types
-
-    content {
-      category = enabled_log.value
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  enabled_log {
+    category_group = "allLogs"
   }
 
-  dynamic "metric" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].metrics
-
-    content {
-      category = metric.value
-      enabled  = true
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  metric {
+    category = "AllMetrics"
+    enabled  = true
   }
 }

modules/azure/function_app_windows/main.tf

@@ -111,39 +111,18 @@ resource "azurerm_app_service_virtual_network_swift_connection" "vnet_integratio
 
 # Logging and analytics
 
-data "azurerm_monitor_diagnostic_categories" "diagnostic_categories" {
-  count       = var.log_analytics_workspace_id == null ? 0 : 1
-  resource_id = azurerm_windows_function_app.function_app.id
-}
-
 resource "azurerm_monitor_diagnostic_setting" "diagnostic_setting" {
   count                      = var.log_analytics_workspace_id == null ? 0 : 1
   name                       = "diag-${var.name}"
   target_resource_id         = azurerm_windows_function_app.function_app.id
   log_analytics_workspace_id = var.log_analytics_workspace_id
 
-  dynamic "enabled_log" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].log_category_types
-
-    content {
-      category = enabled_log.value
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  enabled_log {
+    category_group = "allLogs"
   }
 
-  dynamic "metric" {
-    for_each = data.azurerm_monitor_diagnostic_categories.diagnostic_categories[0].metrics
-
-    content {
-      category = metric.value
-      enabled  = true
-
-      retention_policy {
-        enabled = false
-      }
-    }
+  metric {
+    category = "AllMetrics"
+    enabled  = true
   }
 }

modules/azure/logic_app_standard/main.tf

@@ -285,6 +285,6 @@ resource "azapi_update_resource" "setup_auth_settings" {
 }
 
 resource "azuread_application_password" "password" {
-  count                 = var.managed_identity_provider != null ? 1 : 0
+  count          = var.managed_identity_provider != null ? 1 : 0
   application_id = azuread_application.application[0].id
 }

modules/azure/mysql_flexible_server/main.tf

@@ -49,7 +49,7 @@ resource "azurerm_mysql_flexible_server" "mysql_flexible_server" {
   }
 
   lifecycle {
-    ignore_changes = [zone]
+    ignore_changes = [zone, version]
   }
 }
 

modules/cloudflare/dns_records/main.tf

@@ -17,7 +17,7 @@ data "cloudflare_zone" "zone" {
   name = var.zone_name
 }
 
- resource "cloudflare_record" "record" {
+resource "cloudflare_record" "record" {
   for_each        = { for idx, rec in var.records : rec.name => rec }
   zone_id         = data.cloudflare_zone.zone.id
   name            = each.value.name