feat: fixes for auto heal settings (#185)

* Fixes for Auto Scaling Settings (#184)

* Fix status code range definition

* Fix missing defaults for auto_heal_setting request trigger

* Update requests trigger to optional map to match other triggers

* Fix slow_request dynamics and add dynamic requests for #183

* Update variable name take_taken to time_taken to match with the implementation and underlying azurerm module

* linting fixes; minor bug fixes; version references;

* linitng fixes 2

---------

Co-authored-by: David Suarez <1847875+dave92082@users.noreply.github.com>

Author: donovm4

README.md

@@ -587,7 +587,7 @@ Description:
     - `slow_request` - (Optional) The slow request trigger to activate the action.
       - `count` - (Required) The number of slow requests to trigger the action.
       - `interval` - (Required) The interval to trigger the action.
-      - `take_taken` - (Required) The time taken to trigger the action.
+      - `time_taken` - (Required) The time taken to trigger the action.
       - `path` - (Optional) The path to trigger the action.
       > NOTE: The `path` property in the `slow_request` block is deprecated and will be removed in 4.0 of provider. Please use `slow_request_with_path` to set a slow request trigger with `path` specified.
     - `status_code` - (Optional) The status code trigger to activate the action.
@@ -599,10 +599,7 @@ Description:
       - `win32_status_code` - (Optional) The Win32 status code to trigger the action.
 
   ```terraform
-  site_config = {
-    auto_heal_enabled = true # `auto_heal_enabled` deprecated in azurerm 4.x
-  }
-  auto_heal_setting = { # auto_heal_setting should only be specified if auto_heal_enabled is set to `true`
+  auto_heal_setting = {
     setting_1 = {
       action = {
         action_type                    = "Recycle"
@@ -648,26 +645,26 @@ map(object({
     }))
     trigger = optional(object({
       private_memory_kb = optional(number)
-      requests = optional(object({
+      requests = optional(map(object({
         count    = number
         interval = string
-      }))
+      })), {})
       slow_request = optional(map(object({
         count      = number
         interval   = string
-        take_taken = string
+        time_taken = string
         path       = optional(string)
       })), {})
       slow_request_with_path = optional(map(object({
         count      = number
         interval   = string
-        take_taken = string
+        time_taken = string
         path       = optional(string)
       })), {})
       status_code = optional(map(object({
         count             = number
         interval          = string
-        status_code_range = number
+        status_code_range = string
         path              = optional(string)
         sub_status        = optional(number)
         win32_status_code = optional(number)
@@ -1093,26 +1090,26 @@ map(object({
       }))
       trigger = optional(object({
         private_memory_kb = optional(number)
-        requests = optional(object({
+        requests = optional(map(object({
           count    = number
           interval = string
-        }))
+        })), {})
         slow_request = optional(map(object({
           count      = number
           interval   = string
-          take_taken = string
+          time_taken = string
           path       = optional(string)
         })), {})
         slow_request_with_path = optional(map(object({
           count      = number
           interval   = string
-          take_taken = string
+          time_taken = string
           path       = optional(string)
         })), {})
         status_code = optional(map(object({
           count             = number
           interval          = string
-          status_code_range = number
+          status_code_range = string
           path              = optional(string)
           sub_status        = optional(number)
           win32_status_code = optional(number)
@@ -1788,12 +1785,12 @@ Type:
 
 ```hcl
 object({
-    always_on                                     = optional(bool, true)
-    linux_fx_version                              = optional(string)
-    api_definition_url                            = optional(string)
-    api_management_api_id                         = optional(string)
-    app_command_line                              = optional(string)
-    auto_heal_enabled                             = optional(bool)
+    always_on             = optional(bool, true)
+    linux_fx_version      = optional(string)
+    api_definition_url    = optional(string)
+    api_management_api_id = optional(string)
+    app_command_line      = optional(string)
+    # auto_heal_enabled                             = optional(bool)
     dotnet_framework_version                      = optional(string, "v4.0")
     auto_swap_slot_name                           = optional(string)
     app_scale_limit                               = optional(number)

examples/auto_heal_enabled/README.md

@@ -40,11 +40,19 @@ resource "azurerm_service_plan" "example" {
   }
 }
 
+resource "azurerm_log_analytics_workspace" "example" {
+  location            = azurerm_resource_group.example.location
+  name                = "${module.naming.log_analytics_workspace.name}-auto-heal"
+  resource_group_name = azurerm_resource_group.example.name
+  retention_in_days   = 30
+  sku                 = "PerGB2018"
+}
+
 module "avm_res_web_site" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.15.2"
+  # version = "0.16.0"
 
   enable_telemetry = var.enable_telemetry
 
@@ -57,19 +65,26 @@ module "avm_res_web_site" {
   os_type                  = azurerm_service_plan.example.os_type
   service_plan_resource_id = azurerm_service_plan.example.id
 
+  application_insights = {
+    workspace_resource_id = azurerm_log_analytics_workspace.example.id
+  }
+
   site_config = {
 
   }
-  auto_heal_setting = { # auto_heal_setting should only be specified if auto_heal_enabled is set to `true`
+
+  auto_heal_setting = {
     setting_1 = {
       action = {
         action_type                    = "Recycle"
         minimum_process_execution_time = "00:01:00"
       }
       trigger = {
         requests = {
-          count    = 100
-          interval = "00:00:30"
+          request = {
+            count    = 100
+            interval = "00:00:30"
+          }
         }
         status_code = {
           status_5000 = {
@@ -108,6 +123,7 @@ The following requirements are needed by this module:
 
 The following resources are used by this module:
 
+- [azurerm_log_analytics_workspace.example](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/log_analytics_workspace) (resource)
 - [azurerm_resource_group.example](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/resource_group) (resource)
 - [azurerm_service_plan.example](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/service_plan) (resource)
 - [random_integer.region_index](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/integer) (resource)

examples/auto_heal_enabled/main.tf

@@ -34,11 +34,19 @@ resource "azurerm_service_plan" "example" {
   }
 }
 
+resource "azurerm_log_analytics_workspace" "example" {
+  location            = azurerm_resource_group.example.location
+  name                = "${module.naming.log_analytics_workspace.name}-auto-heal"
+  resource_group_name = azurerm_resource_group.example.name
+  retention_in_days   = 30
+  sku                 = "PerGB2018"
+}
+
 module "avm_res_web_site" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.15.2"
+  # version = "0.16.0"
 
   enable_telemetry = var.enable_telemetry
 
@@ -51,19 +59,26 @@ module "avm_res_web_site" {
   os_type                  = azurerm_service_plan.example.os_type
   service_plan_resource_id = azurerm_service_plan.example.id
 
+  application_insights = {
+    workspace_resource_id = azurerm_log_analytics_workspace.example.id
+  }
+
   site_config = {
 
   }
-  auto_heal_setting = { # auto_heal_setting should only be specified if auto_heal_enabled is set to `true`
+
+  auto_heal_setting = {
     setting_1 = {
       action = {
         action_type                    = "Recycle"
         minimum_process_execution_time = "00:01:00"
       }
       trigger = {
         requests = {
-          count    = 100
-          interval = "00:00:30"
+          request = {
+            count    = 100
+            interval = "00:00:30"
+          }
         }
         status_code = {
           status_5000 = {

examples/auto_heal_enabled/terraform.tf

@@ -1,25 +1,25 @@
-terraform {
-  required_version = "~> 1.9"
+terraform {
+  required_version = "~> 1.9"
   required_providers {
-    azurerm = {
-      source  = "hashicorp/azurerm"
-      version = "~> 4.0"
-    }
-    random = {
-      source  = "hashicorp/random"
-      version = ">= 3.5.0, < 4.0.0"
-    }
-  }
-}
-
-# tflint-ignore: terraform_module_provider_declaration, terraform_output_separate, terraform_variable_separate
-provider "azurerm" {
-  features {
-    resource_group {
-      prevent_deletion_if_contains_resources = false
-    }
-  }
-
-  subscription_id = "<subscription-id>"
-
-}
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~> 4.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.5.0, < 4.0.0"
+    }
+  }
+}
+
+# tflint-ignore: terraform_module_provider_declaration, terraform_output_separate, terraform_variable_separate
+provider "azurerm" {
+  features {
+    resource_group {
+      prevent_deletion_if_contains_resources = false
+    }
+  }
+
+  subscription_id = "<subscription_id>"
+
+}

examples/basic_auth/README.md

@@ -58,7 +58,7 @@ module "avm_res_web_site" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.15.2"
+  # version = "0.16.0"
 
   enable_telemetry = var.enable_telemetry
 

examples/basic_auth/main.tf

@@ -51,7 +51,7 @@ module "avm_res_web_site" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.15.2"
+  # version = "0.16.0"
 
   enable_telemetry = var.enable_telemetry
 

examples/custom_container/README.md

@@ -67,7 +67,7 @@ module "avm_res_web_site" {
   source = "../../"
 
   #   source             = "Azure/avm-res-web-site/azurerm"
-  #   version = "0.15.2"
+  #   version = "0.16.0"
 
   enable_telemetry = var.enable_telemetry
 
@@ -100,7 +100,7 @@ module "avm_res_web_site" {
 
   tags = {
     module  = "Azure/avm-res-web-site/azurerm"
-    version = "0.15.2"
+    version = "0.16.0"
   }
 
 }

examples/custom_container/main.tf

@@ -61,7 +61,7 @@ module "avm_res_web_site" {
   source = "../../"
 
   #   source             = "Azure/avm-res-web-site/azurerm"
-  #   version = "0.15.2"
+  #   version = "0.16.0"
 
   enable_telemetry = var.enable_telemetry
 
@@ -94,7 +94,7 @@ module "avm_res_web_site" {
 
   tags = {
     module  = "Azure/avm-res-web-site/azurerm"
-    version = "0.15.2"
+    version = "0.16.0"
   }
 
 }

examples/custom_domain/README.md

@@ -70,7 +70,7 @@ module "avm_res_web_site" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.15.2"
+  # version = "0.16.0"
 
   enable_telemetry = var.enable_telemetry
 

examples/custom_domain/main.tf

@@ -66,7 +66,7 @@ module "avm_res_web_site" {
   source = "../../"
 
   # source             = "Azure/avm-res-web-site/azurerm"
-  # version = "0.15.2"
+  # version = "0.16.0"
 
   enable_telemetry = var.enable_telemetry