From 16ba63fd7b93012899961d5442d46b0a03455868 Mon Sep 17 00:00:00 2001 From: Szymon Rozek Date: Mon, 19 Feb 2024 15:15:11 +0100 Subject: [PATCH 1/6] add usage of dotnet version in linux app --- modules/azure/function_app_linux_managed_identity/main.tf | 7 +++++++ .../azure/function_app_linux_managed_identity/variables.tf | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/modules/azure/function_app_linux_managed_identity/main.tf b/modules/azure/function_app_linux_managed_identity/main.tf index 3913ab0b..d05644aa 100644 --- a/modules/azure/function_app_linux_managed_identity/main.tf +++ b/modules/azure/function_app_linux_managed_identity/main.tf @@ -53,6 +53,13 @@ resource "azurerm_linux_function_app" "function_app" { MICROSOFT_PROVIDER_AUTHENTICATION_SECRET = "${local.should_create_app ? azuread_application_password.password[0].value : var.managed_identity_provider.existing.client_secret}" }) + dynamic "application_stack" { + for_each = var.dotnet_version != "" ? [var.dotnet_version] : [] + content { + dotnet_version = application_stack.value + } + } + site_config { always_on = var.always_on vnet_route_all_enabled = var.route_all_outbound_traffic diff --git a/modules/azure/function_app_linux_managed_identity/variables.tf b/modules/azure/function_app_linux_managed_identity/variables.tf index 6c66886d..fd14386b 100644 --- a/modules/azure/function_app_linux_managed_identity/variables.tf +++ b/modules/azure/function_app_linux_managed_identity/variables.tf @@ -13,6 +13,12 @@ variable "name" { description = "Specifies the name of the function app." } +variable "dotnet_version" { + type = string + description = "Specifies the version of dotnet." + default = "" +} + variable "managed_identity_provider" { type = object({ existing = optional(object({ From 6947a8fce1c7a8ddacb3b8586dbb270de5264a8b Mon Sep 17 00:00:00 2001 From: Szymon Rozek Date: Mon, 19 Feb 2024 15:26:04 +0100 Subject: [PATCH 2/6] add in proper place --- .../function_app_linux_managed_identity/main.tf | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/modules/azure/function_app_linux_managed_identity/main.tf b/modules/azure/function_app_linux_managed_identity/main.tf index d05644aa..17782070 100644 --- a/modules/azure/function_app_linux_managed_identity/main.tf +++ b/modules/azure/function_app_linux_managed_identity/main.tf @@ -52,19 +52,18 @@ resource "azurerm_linux_function_app" "function_app" { app_settings = merge(var.app_settings, { MICROSOFT_PROVIDER_AUTHENTICATION_SECRET = "${local.should_create_app ? azuread_application_password.password[0].value : var.managed_identity_provider.existing.client_secret}" }) - - dynamic "application_stack" { - for_each = var.dotnet_version != "" ? [var.dotnet_version] : [] - content { - dotnet_version = application_stack.value - } - } - site_config { always_on = var.always_on vnet_route_all_enabled = var.route_all_outbound_traffic use_32_bit_worker = var.use_32_bit_worker + dynamic "application_stack" { + for_each = var.dotnet_version != "" ? [var.dotnet_version] : [] + content { + dotnet_version = application_stack.value + } + } + dynamic "ip_restriction" { for_each = var.ip_restrictions From 7fe756e5fe655436033b2dd9386acc8958ee5d50 Mon Sep 17 00:00:00 2001 From: Szymon Rozek Date: Mon, 19 Feb 2024 15:37:32 +0100 Subject: [PATCH 3/6] add isolated option --- modules/azure/function_app_linux_managed_identity/main.tf | 3 ++- .../azure/function_app_linux_managed_identity/variables.tf | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/azure/function_app_linux_managed_identity/main.tf b/modules/azure/function_app_linux_managed_identity/main.tf index 17782070..347a9305 100644 --- a/modules/azure/function_app_linux_managed_identity/main.tf +++ b/modules/azure/function_app_linux_managed_identity/main.tf @@ -60,7 +60,8 @@ resource "azurerm_linux_function_app" "function_app" { dynamic "application_stack" { for_each = var.dotnet_version != "" ? [var.dotnet_version] : [] content { - dotnet_version = application_stack.value + dotnet_version = application_stack.value + dotnet_isolated = var.dotnet_isolated } } diff --git a/modules/azure/function_app_linux_managed_identity/variables.tf b/modules/azure/function_app_linux_managed_identity/variables.tf index fd14386b..7e94dac5 100644 --- a/modules/azure/function_app_linux_managed_identity/variables.tf +++ b/modules/azure/function_app_linux_managed_identity/variables.tf @@ -19,6 +19,12 @@ variable "dotnet_version" { default = "" } +variable "dotnet_isolated" { + type = string + description = "Specifies the version of dotnet." + default = false +} + variable "managed_identity_provider" { type = object({ existing = optional(object({ From 8e1fffe5af356c9313cabc8dd800298bebcc81d8 Mon Sep 17 00:00:00 2001 From: Szymon Rozek Date: Mon, 19 Feb 2024 15:38:48 +0100 Subject: [PATCH 4/6] add isolated --- modules/azure/function_app_linux_managed_identity/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/azure/function_app_linux_managed_identity/variables.tf b/modules/azure/function_app_linux_managed_identity/variables.tf index 7e94dac5..66bb44e24 100644 --- a/modules/azure/function_app_linux_managed_identity/variables.tf +++ b/modules/azure/function_app_linux_managed_identity/variables.tf @@ -21,7 +21,7 @@ variable "dotnet_version" { variable "dotnet_isolated" { type = string - description = "Specifies the version of dotnet." + description = "Specifies if it is isolated function app." default = false } From 8a0f60db8d08961ab6b9cb43bc04ebf2fe4bb1c9 Mon Sep 17 00:00:00 2001 From: Szymon Rozek Date: Mon, 19 Feb 2024 15:44:20 +0100 Subject: [PATCH 5/6] add proper property name --- modules/azure/function_app_linux_managed_identity/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/azure/function_app_linux_managed_identity/main.tf b/modules/azure/function_app_linux_managed_identity/main.tf index 347a9305..965f4208 100644 --- a/modules/azure/function_app_linux_managed_identity/main.tf +++ b/modules/azure/function_app_linux_managed_identity/main.tf @@ -60,8 +60,8 @@ resource "azurerm_linux_function_app" "function_app" { dynamic "application_stack" { for_each = var.dotnet_version != "" ? [var.dotnet_version] : [] content { - dotnet_version = application_stack.value - dotnet_isolated = var.dotnet_isolated + dotnet_version = application_stack.value + use_dotnet_isolated_runtime = var.dotnet_isolated } } From b6c2f23e8a22d502e3f1ef797882109640fc0af2 Mon Sep 17 00:00:00 2001 From: Szymon Rozek Date: Mon, 19 Feb 2024 15:55:22 +0100 Subject: [PATCH 6/6] format --- modules/azure/function_app_linux_managed_identity/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/azure/function_app_linux_managed_identity/main.tf b/modules/azure/function_app_linux_managed_identity/main.tf index 965f4208..725dabef 100644 --- a/modules/azure/function_app_linux_managed_identity/main.tf +++ b/modules/azure/function_app_linux_managed_identity/main.tf @@ -60,8 +60,8 @@ resource "azurerm_linux_function_app" "function_app" { dynamic "application_stack" { for_each = var.dotnet_version != "" ? [var.dotnet_version] : [] content { - dotnet_version = application_stack.value - use_dotnet_isolated_runtime = var.dotnet_isolated + dotnet_version = application_stack.value + use_dotnet_isolated_runtime = var.dotnet_isolated } }