Merge pull request #6 from data-platform-hq/add-storage-mapping

feat: add BYOS support

Author: kharkevich

README.md

@@ -36,6 +36,7 @@ No modules.
 | <a name="input_app_settings"></a> [app\_settings](#input\_app\_settings) | Application setting | `map(string)` | `{}` | no |
 | <a name="input_application_stack"></a> [application\_stack](#input\_application\_stack) | Application stack configuration, run `az webapp list-runtimes --os-type linux` to get the list of supported stacks | `map(string)` | <pre>{<br>  "java_server": "JAVA",<br>  "java_server_version": 11,<br>  "java_version": "java11"<br>}</pre> | no |
 | <a name="input_application_type"></a> [application\_type](#input\_application\_type) | Application type (java, python, etc) | `string` | `"java"` | no |
+| <a name="input_enable_appinsights"></a> [enable\_appinsights](#input\_enable\_appinsights) | Enable application insights | `bool` | `true` | no |
 | <a name="input_env"></a> [env](#input\_env) | Environment | `string` | n/a | yes |
 | <a name="input_identity_ids"></a> [identity\_ids](#input\_identity\_ids) | List of user assigned identity IDs | `list(string)` | `null` | no |
 | <a name="input_ip_restriction"></a> [ip\_restriction](#input\_ip\_restriction) | Firewall settings for the function app | <pre>list(object({<br>    name                      = string<br>    ip_address                = string<br>    service_tag               = string<br>    virtual_network_subnet_id = string<br>    priority                  = string<br>    action                    = string<br>    headers = list(object({<br>      x_azure_fdid      = list(string)<br>      x_fd_health_probe = list(string)<br>      x_forwarded_for   = list(string)<br>      x_forwarded_host  = list(string)<br>    }))<br>  }))</pre> | <pre>[<br>  {<br>    "action": "Allow",<br>    "headers": null,<br>    "ip_address": null,<br>    "name": "allow_azure",<br>    "priority": "100",<br>    "service_tag": "AzureCloud",<br>    "virtual_network_subnet_id": null<br>  }<br>]</pre> | no |
@@ -45,9 +46,11 @@ No modules.
 | <a name="input_project"></a> [project](#input\_project) | Project name | `string` | n/a | yes |
 | <a name="input_resource_group"></a> [resource\_group](#input\_resource\_group) | Resource group name | `string` | n/a | yes |
 | <a name="input_service_plan_id"></a> [service\_plan\_id](#input\_service\_plan\_id) | App Service plan ID | `string` | n/a | yes |
+| <a name="input_storage_account"></a> [storage\_account](#input\_storage\_account) | BYOS storage mount configuration | <pre>list(object({<br>    access_key   = string<br>    account_name = string<br>    name         = string<br>    share_name   = string<br>    type         = string<br>    mount_path   = string<br>  }))</pre> | `[]` | no |
 | <a name="input_subnet_id"></a> [subnet\_id](#input\_subnet\_id) | Subnet ID for the function app | `string` | `null` | no |
 | <a name="input_tags"></a> [tags](#input\_tags) | Tags | `map(string)` | n/a | yes |
 | <a name="input_use_private_net"></a> [use\_private\_net](#input\_use\_private\_net) | Use private network injection | `bool` | `false` | no |
+| <a name="input_websockets_enabled"></a> [websockets\_enabled](#input\_websockets\_enabled) | Enable websockets | `bool` | `false` | no |
 
 ## Outputs
 

main.tf

@@ -1,5 +1,6 @@
 resource "azurerm_application_insights" "this" {
-  name                = "fn-${var.project}-${var.env}-${var.location}-${var.name}"
+  count               = var.enable_appinsights ? 1 : 0
+  name                = "web-${var.project}-${var.env}-${var.location}-${var.name}"
   location            = var.location
   resource_group_name = var.resource_group
   application_type    = var.application_type
@@ -14,7 +15,7 @@ locals {
     LOG4J_FORMAT_MSG_NO_LOOKUPS         = "true"
     WEBSITE_USE_PLACEHOLDER             = "0"
     AZURE_LOG_LEVEL                     = "info"
-    APPINSIGHTS_INSTRUMENTATIONKEY      = azurerm_application_insights.this.instrumentation_key
+    APPINSIGHTS_INSTRUMENTATIONKEY      = var.enable_appinsights ? azurerm_application_insights.this[0].instrumentation_key : ""
   }
   application_stack_struct = {
     docker_image        = null
@@ -50,7 +51,7 @@ resource "azurerm_linux_web_app" "this" {
     always_on          = true
     ftps_state         = "Disabled"
     http2_enabled      = true
-    websockets_enabled = false
+    websockets_enabled = var.websockets_enabled
     use_32_bit_worker  = false
     ip_restriction     = var.ip_restriction
     scm_ip_restriction = var.ip_restriction
@@ -77,6 +78,18 @@ resource "azurerm_linux_web_app" "this" {
       }
     }
   }
+  dynamic "storage_account" {
+    for_each = var.storage_account
+    content {
+      access_key   = storage_account.value.access_key
+      account_name = storage_account.value.account_name
+      name         = storage_account.value.name
+      share_name   = storage_account.value.share_name
+      type         = storage_account.value.type
+      mount_path   = storage_account.value.mount_path
+    }
+  }
+
   lifecycle {
     ignore_changes = [
       tags["hidden-link: /app-insights-conn-string"],

variables.tf

@@ -126,3 +126,28 @@ variable "logs" {
   }
   description = "Logs configuration"
 }
+
+variable "storage_account" {
+  type = list(object({
+    access_key   = string
+    account_name = string
+    name         = string
+    share_name   = string
+    type         = string
+    mount_path   = string
+  }))
+  default     = []
+  description = "BYOS storage mount configuration"
+}
+
+variable "websockets_enabled" {
+  type        = bool
+  description = "Enable websockets"
+  default     = false
+}
+
+variable "enable_appinsights" {
+  type        = bool
+  description = "Enable application insights"
+  default     = true
+}