diff --git a/src/domains/nodo-app/.terraform.lock.hcl b/src/domains/nodo-app/.terraform.lock.hcl index 387698c87b..e04eb6f006 100644 --- a/src/domains/nodo-app/.terraform.lock.hcl +++ b/src/domains/nodo-app/.terraform.lock.hcl @@ -50,49 +50,49 @@ provider "registry.terraform.io/hashicorp/azuread" { } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.44.1" - constraints = ">= 3.30.0, <= 3.44.1, <= 3.45.0, <= 3.53.0, <= 3.71.0, <= 3.84.0, <= 3.85.0, <= 3.94.0" + version = "3.116.0" + constraints = "~> 3.30, ~> 3.76, ~> 3.95, != 3.97.0, != 3.97.1, <= 3.116.0" hashes = [ - "h1:7zeUPl2nDhKnWHpAeKy+7Cued79RDgwacN/qpTIim64=", - "h1:EkFaulKIAb3nb7svbpM18Tf7rl+ajVCXnXvP//Yvw2M=", - "h1:Nruhll1zw9gYR9KWbrVoN9npRKboPbEWbvq0BTCUa64=", - "h1:dq7s/3sZrI4oLWL/NUlOcOD3HGkzimRmEvFiWX+ENRw=", - "h1:iqP1wYNUezvM7Ygx2RPT37XMa6M9BZMEo/ce2f7tEKw=", - "zh:0a1761b5aeec47d5019114976de5eb9832dea1d57d632ca6fa464b99b782d1c1", - "zh:0e9c96fa7ed6d55a3f3a646ff346298c8b7728331bb3a74875f78ecb7d245c16", - "zh:1aa953a692c7b5b10219343f0238f4624ac988e247721b6ec6b1bed2b81f7ceb", - "zh:237258af1a1ce8a0aed8f6cdb03c69ea83ff4f3a46d5bd1466cd503f0b5aded8", - "zh:542067eeeb3b4e286e92d646e0f40426e204ed268973343e585aa521f075f8dc", - "zh:8326d52460252fd335ae97d0fabd9f5d90061a4fbeb273618f4067be3eb4e75a", - "zh:97a2b802bf6e204476131ddb7a91e832568ee8da3b0515ed23361c9f72ca9706", - "zh:9ae5a52ec85e0ad218e2ce9d33859f17afbb2fb2a690bf60d5f48fc7680e7fb0", - "zh:b17e77aff310e232f541334ba1858b5125ea0e527a5d6824de017192d8d8a3a2", - "zh:c469ba6681535c07c58dad6c1b59b056912300a7c91137ddc0103ef16b1d5697", - "zh:cea6026ef8fb5512d14c1ba6fdf36b90a09de536d4e4afad96b926af39114f74", + "h1:2QbjtN4oMXzdA++Nvrj/wSmWZTPgXKOSFGGQCLEMrb4=", + "h1:3v5wgHWHRB3J5sByxhgkPEOmL9H4GeFIasitGI36bkM=", + "h1:BCR3NIorFSvGG3v/+JOiiw3VM4PkChLO4m84wzD9NDo=", + "h1:SJM/KQDW9blKFmLMaupsZVYtcZ0fYpjLHEriMgCBGCY=", + "h1:jwwbQ09fH1RdcNsknt1AkvfSUbULsl7nZQn6S8fabFI=", + "zh:02b6606aff025fc2a962b3e568e000300abe959adac987183c24dac8eb057f4d", + "zh:2a23a8ce24ff9e885925ffee0c3ea7eadba7a702541d05869275778aa47bdea7", + "zh:57d10746384baeca4d5c56e88872727cdc150f437b8c5e14f0542127f7475e24", + "zh:59e3ebde1a2e1e094c671e179f231ead60684390dbf02d2b1b7fe67a228daa1a", + "zh:5f1f5c7d09efa2ee8ddf21bd9efbbf8286f6e90047556bef305c062fa0ac5880", + "zh:a40646aee3c9907276dab926e6123a8d70b1e56174836d4c59a9992034f88d70", + "zh:c21d40461bc5836cf56ad3d93d2fc47f61138574a55e972ad5ff1cb73bab66dc", + "zh:c56fb91a5ae66153ba0f737a26da1b3d4f88fdef7d41c63e06c5772d93b26953", + "zh:d1e60e85f51d12fc150aeab8e31d3f18f859c32f927f99deb5b74cb1e10087aa", + "zh:ed35e727e7d79e687cd3d148f52b442961ede286e7c5b4da1dcd9f0128009466", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:f6d2a4e7c58f44e7d04a4a9c73f35ed452f412c97c85def68c4b52814cbe03ab", ] } provider "registry.terraform.io/hashicorp/helm" { - version = "2.5.1" - constraints = "<= 2.5.1, <= 2.7.1" + version = "2.12.1" + constraints = "~> 2.12, <= 2.12.1" hashes = [ - "h1:9yMFsXyHAo+mUuMKczNSw44HcZaf1JkMqgOUgJF1dXs=", - "h1:NasRPC0qqlpGqcF3dsSoOFu7uc5hM+zJm+okd8FgrnQ=", - "h1:a9KwjqINdNy6IsEbkHUB1vwvYfy5OJ2VxFL9/NDFLoY=", - "h1:g3CzhAURjVq69AJ1u2d3DWd+i0rSmLX+JXSIts9BV6A=", - "h1:gogHvv1qr8bPzk5y1BoeTA5dOZt47byTXWXW3CJQ5C8=", - "zh:140b9748f0ad193a20d69e59d672f3c4eda8a56cede56a92f931bd3af020e2e9", - "zh:17ae319466ed6538ad49e011998bb86565fe0e97bc8b9ad7c8dda46a20f90669", - "zh:3a8bd723c21ba70e19f0395ed7096fc8e08bfc23366f1c3f06a9107eb37c572c", - "zh:3aae3b82adbe6dca52f1a1c8cf51575446e6b0f01f1b1f3b30de578c9af4a933", - "zh:3f65221f40148df57d2888e4f31ef3bf430b8c5af41de0db39a2b964e1826d7c", - "zh:650c74c4f46f5eb01df11d8392bdb7ebee3bba59ac0721000a6ad731ff0e61e2", - "zh:930fb8ab4cd6634472dfd6aa3123f109ef5b32cbe6ef7b4695fae6751353e83f", - "zh:ae57cd4b0be4b9ca252bc5d347bc925e35b0ed74d3dcdebf06c11362c1ac3436", - "zh:d15b1732a8602b6726eac22628b2f72f72d98b75b9c6aabceec9fd696fda696a", - "zh:d730ede1656bd193e2aea5302acec47c4905fe30b96f550196be4a0ed5f41936", - "zh:f010d4f9d8cd15936be4df12bf256cb2175ca1dedb728bd3a866c03d2ee7591f", + "h1:7wfYOAeSEchHB8idNl+2jf+OkFi9zFSOLWkEZFuTCik=", + "h1:aBfcqM4cbywa7TAxfT1YoFS+Cst9waerlm4XErFmJlk=", + "h1:sgYI7lwGqJqPopY3NGmhb1eQ0YbH8PIXaAZAmnJrAvw=", + "h1:sjzfyNQAjtF9zXHxB67geryjGkHaPDMMVw9iqPP5pkE=", + "h1:xwHVa6ab/XVfDrZ3h35OzLJ6g0Zte4VAvSnyKw3f9AI=", + "zh:1d623fb1662703f2feb7860e3c795d849c77640eecbc5a776784d08807b15004", + "zh:253a5bc62ba2c4314875139e3fbd2feaad5ef6b0fb420302a474ab49e8e51a38", + "zh:282358f4ad4f20d0ccaab670b8645228bfad1c03ac0d0df5889f0aea8aeac01a", + "zh:4fd06af3091a382b3f0d8f0a60880f59640d2b6d9d6a31f9a873c6f1bde1ec50", + "zh:6816976b1830f5629ae279569175e88b497abbbac30ee809948a1f923c67a80d", + "zh:7d82c4150cdbf48cfeec867be94c7b9bd7682474d4df0ebb7e24e148f964844f", + "zh:83f062049eea2513118a4c6054fb06c8600bac96196f25aed2cc21898ec86e93", + "zh:a79eec0cf4c08fca79e44033ec6e470f25ff23c3e2c7f9bc707ed7771c1072c0", + "zh:b2b2d904b2821a6e579910320605bc478bbef063579a23fbfdd6fcb5871b81f8", + "zh:e91177ca06a15487fc570cb81ecef6359aa399459ea2aa7c4f7367ba86f6fcad", + "zh:e976bcb82996fc4968f8382bbcb6673efb1f586bf92074058a232028d97825b1", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } @@ -122,25 +122,25 @@ provider "registry.terraform.io/hashicorp/kubernetes" { } provider "registry.terraform.io/hashicorp/null" { - version = "3.1.1" - constraints = "<= 3.2.1" + version = "3.2.1" + constraints = "~> 3.2, <= 3.2.1" hashes = [ - "h1:1J3nqAREzuaLE7x98LEELCCaMV6BRiawHSg9MmFvfQo=", - "h1:71sNUDvmiJcijsvfXpiLCz0lXIBSsEJjMxljt7hxMhw=", - "h1:Pctug/s/2Hg5FJqjYcTM0kPyx3AoYK1MpRWO0T9V2ns=", - "h1:YvH6gTaQzGdNv+SKTZujU1O0bO+Pw6vJHOPhqgN8XNs=", - "h1:ZD4wyZ0KJzt5s2mD0xD7paJlVONNicLvZKdgtezz02I=", - "zh:063466f41f1d9fd0dd93722840c1314f046d8760b1812fa67c34de0afcba5597", - "zh:08c058e367de6debdad35fc24d97131c7cf75103baec8279aba3506a08b53faf", - "zh:73ce6dff935150d6ddc6ac4a10071e02647d10175c173cfe5dca81f3d13d8afe", + "h1:FbGfc+muBsC17Ohy5g806iuI1hQc4SIexpYCrQHQd8w=", + "h1:tSj1mL6OQ8ILGqR2mDu7OYYYWf+hoir0pf9KAQ8IzO8=", + "h1:vUW21lLLsKlxtBf0QF7LKJreKxs0CM7YXGzqW1N/ODY=", + "h1:wqgRvlyVIbkCeCQs+5jj6zVuQL0KDxZZtNofGqqlSdI=", + "h1:ydA0/SNRVB1o95btfshvYsmxA+jZFRZcvKzZSB+4S1M=", + "zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840", + "zh:62a5cc82c3b2ddef7ef3a6f2fedb7b9b3deff4ab7b414938b08e51d6e8be87cb", + "zh:63cff4de03af983175a7e37e52d4bd89d990be256b16b5c7f919aff5ad485aa5", + "zh:74cb22c6700e48486b7cabefa10b33b801dfcab56f1a6ac9b6624531f3d36ea3", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:8fdd792a626413502e68c195f2097352bdc6a0df694f7df350ed784741eb587e", - "zh:976bbaf268cb497400fd5b3c774d218f3933271864345f18deebe4dcbfcd6afa", - "zh:b21b78ca581f98f4cdb7a366b03ae9db23a73dfa7df12c533d7c19b68e9e72e5", - "zh:b7fc0c1615dbdb1d6fd4abb9c7dc7da286631f7ca2299fb9cd4664258ccfbff4", - "zh:d1efc942b2c44345e0c29bc976594cb7278c38cfb8897b344669eafbc3cddf46", - "zh:e356c245b3cd9d4789bab010893566acace682d7db877e52d40fc4ca34a50924", - "zh:ea98802ba92fcfa8cf12cbce2e9e7ebe999afbf8ed47fa45fc847a098d89468b", - "zh:eff8872458806499889f6927b5d954560f3d74bf20b6043409edf94d26cd906f", + "zh:79e553aff77f1cfa9012a2218b8238dd672ea5e1b2924775ac9ac24d2a75c238", + "zh:a1e06ddda0b5ac48f7e7c7d59e1ab5a4073bbcf876c73c0299e4610ed53859dc", + "zh:c37a97090f1a82222925d45d84483b2aa702ef7ab66532af6cbcfb567818b970", + "zh:e4453fbebf90c53ca3323a92e7ca0f9961427d2f0ce0d2b65523cc04d5d999c2", + "zh:e80a746921946d8b6761e77305b752ad188da60688cfd2059322875d363be5f5", + "zh:fbdb892d9822ed0e4cb60f2fedbdbb556e4da0d88d3b942ae963ed6ff091e48f", + "zh:fca01a623d90d0cad0843102f9b8b9fe0d3ff8244593bd817f126582b52dd694", ] } diff --git a/src/domains/nodo-app/00_network.tf b/src/domains/nodo-app/00_network.tf index 499b6ec9b5..922232923b 100644 --- a/src/domains/nodo-app/00_network.tf +++ b/src/domains/nodo-app/00_network.tf @@ -10,7 +10,7 @@ data "azurerm_subnet" "aks_snet" { module "nodo_re_to_datastore_function_snet" { count = var.enable_nodo_re ? 1 : 0 - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet?ref=v6.4.1" + source = "./.terraform/modules/__v3__/subnet" name = "${local.project}-nodo-re-to-datastore-fn-snet" address_prefixes = var.nodo_re_to_datastore_function_subnet resource_group_name = local.vnet_resource_group_name @@ -33,7 +33,7 @@ module "nodo_re_to_datastore_function_snet" { module "nodo_re_to_tablestorage_function_snet" { count = var.enable_nodo_re ? 1 : 0 - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet?ref=v6.4.1" + source = "./.terraform/modules/__v3__/subnet" name = "${local.project}-nodo-re-to-tablestorage-fn-snet" address_prefixes = var.nodo_re_to_tablestorage_function_subnet resource_group_name = local.vnet_resource_group_name @@ -55,7 +55,7 @@ module "nodo_re_to_tablestorage_function_snet" { } module "nodo_verifyko_to_datastore_function_snet" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet?ref=v6.4.1" + source = "./.terraform/modules/__v3__/subnet" name = "${local.project}-nodo-verifyko-to-datastore-fn-snet" address_prefixes = var.nodo_verifyko_to_datastore_function_subnet resource_group_name = local.vnet_resource_group_name @@ -77,7 +77,7 @@ module "nodo_verifyko_to_datastore_function_snet" { } module "nodo_verifyko_to_tablestorage_function_snet" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet?ref=v6.4.1" + source = "./.terraform/modules/__v3__/subnet" name = "${local.project}-nodo-verifyko-to-tablestorage-fn-snet" address_prefixes = var.nodo_verifyko_to_tablestorage_function_subnet resource_group_name = local.vnet_resource_group_name diff --git a/src/domains/nodo-app/01_aks.tf b/src/domains/nodo-app/01_aks.tf index bf4c165576..b555e435d4 100644 --- a/src/domains/nodo-app/01_aks.tf +++ b/src/domains/nodo-app/01_aks.tf @@ -46,6 +46,11 @@ resource "azurerm_kubernetes_cluster_node_pool" "nodo_pool" { vnet_subnet_id = data.azurerm_subnet.aks_snet.id enable_node_public_ip = false + upgrade_settings { + max_surge = "50%" + drain_timeout_in_minutes = 30 + node_soak_duration_in_minutes = 0 + } tags = merge(var.tags, var.nodo_user_node_pool.node_tags) diff --git a/src/domains/nodo-app/02_namespace.tf b/src/domains/nodo-app/02_namespace.tf index 731911148c..85293d46e6 100644 --- a/src/domains/nodo-app/02_namespace.tf +++ b/src/domains/nodo-app/02_namespace.tf @@ -6,7 +6,7 @@ resource "kubernetes_namespace" "namespace" { module "pod_identity" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_pod_identity?ref=v6.4.1" + source = "./.terraform/modules/__v3__/kubernetes_pod_identity" resource_group_name = local.aks_resource_group_name location = var.location diff --git a/src/domains/nodo-app/02_security.tf b/src/domains/nodo-app/02_security.tf index 31ed9ca522..e114b5554f 100644 --- a/src/domains/nodo-app/02_security.tf +++ b/src/domains/nodo-app/02_security.tf @@ -2,3 +2,5 @@ data "azurerm_key_vault" "kv" { name = "${local.product}-${var.domain}-kv" resource_group_name = "${local.product}-${var.domain}-sec-rg" } + + diff --git a/src/domains/nodo-app/04_apim_cfg_for_node.tf b/src/domains/nodo-app/04_apim_cfg_for_node.tf index 129328fdb7..c86b7f2f7f 100644 --- a/src/domains/nodo-app/04_apim_cfg_for_node.tf +++ b/src/domains/nodo-app/04_apim_cfg_for_node.tf @@ -2,7 +2,7 @@ ## Products ## ############## module "apim_cfg_for_node_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.20.0" + source = "./.terraform/modules/__v3__/api_management_product" product_id = "cfg-for-node" display_name = "CFG for Node" diff --git a/src/domains/nodo-app/04_apim_mock_ec.tf b/src/domains/nodo-app/04_apim_mock_ec.tf index 4091c2cae5..19c5dbd2b9 100644 --- a/src/domains/nodo-app/04_apim_mock_ec.tf +++ b/src/domains/nodo-app/04_apim_mock_ec.tf @@ -3,7 +3,7 @@ ############## module "apim_mock_ec_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" count = var.env_short != "p" ? 1 : 0 product_id = "mock_ec" @@ -46,7 +46,7 @@ resource "azurerm_api_management_api_version_set" "api_mock_ec_api" { module "apim_api_mock_ec_api_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" count = var.env_short != "p" ? 1 : 0 name = format("%s-mock-ec-service-api", local.project) diff --git a/src/domains/nodo-app/04_apim_mock_ec_replica.tf b/src/domains/nodo-app/04_apim_mock_ec_replica.tf index f168cf465c..25f90dff68 100644 --- a/src/domains/nodo-app/04_apim_mock_ec_replica.tf +++ b/src/domains/nodo-app/04_apim_mock_ec_replica.tf @@ -3,7 +3,7 @@ ###################### module "apim_mock_ec_product_replica" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" count = var.env_short == "p" ? 0 : 1 product_id = "mock_ec_replica" display_name = "Mock EC for REPLICA NDP" @@ -44,7 +44,7 @@ resource "azurerm_api_management_api_version_set" "api_mock_ec_api_replica" { module "apim_api_mock_ec_api_replica_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" count = var.env_short == "p" ? 0 : 1 name = format("%s-mock-ec-service-api-replica", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/nodo-app/04_apim_mock_ec_secondary-replica.tf b/src/domains/nodo-app/04_apim_mock_ec_secondary-replica.tf index c4fb9bc7bd..46dc2b3807 100644 --- a/src/domains/nodo-app/04_apim_mock_ec_secondary-replica.tf +++ b/src/domains/nodo-app/04_apim_mock_ec_secondary-replica.tf @@ -3,7 +3,7 @@ ###################### module "apim_mock_ec_secondary_product_replica" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" count = var.env_short == "d" ? 1 : 0 product_id = "mock_ec_secondary_replica" display_name = "Mock EC (Secondary) for REPLICA NDP" @@ -44,7 +44,7 @@ resource "azurerm_api_management_api_version_set" "api_mock_ec_secondary_api_rep module "apim_api_mock_ec_secondary_api_replica_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" count = var.env_short == "d" ? 1 : 0 name = format("%s-mock-ec-secondary-service-api-replica", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/nodo-app/04_apim_mock_ec_secondary.tf b/src/domains/nodo-app/04_apim_mock_ec_secondary.tf index 7260c23a87..eb33ab8dca 100644 --- a/src/domains/nodo-app/04_apim_mock_ec_secondary.tf +++ b/src/domains/nodo-app/04_apim_mock_ec_secondary.tf @@ -3,7 +3,7 @@ ############## module "apim_mock_ec_secondary_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" count = var.env_short == "d" ? 1 : 0 product_id = "mock_ec_secondary" display_name = "Mock EC (Secondary) for NDP" @@ -47,7 +47,7 @@ resource "azurerm_api_management_api_version_set" "api_mock_ec_secondary_api" { module "apim_api_mock_ec_secondary_api_v1" { count = var.env_short == "d" ? 1 : 0 - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" name = format("%s-mock-ec-secondary-service-api", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/nodo-app/04_apim_mock_pm.tf b/src/domains/nodo-app/04_apim_mock_pm.tf index 93c3e9e42f..a8a95ff225 100644 --- a/src/domains/nodo-app/04_apim_mock_pm.tf +++ b/src/domains/nodo-app/04_apim_mock_pm.tf @@ -3,7 +3,7 @@ ############## module "apim_mock_pm_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" count = var.env_short == "d" ? 1 : 0 product_id = "mock_pm" @@ -46,7 +46,7 @@ resource "azurerm_api_management_api_version_set" "api_mock_pm_api" { module "apim_api_mock_pm_api_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" count = var.env_short == "d" ? 1 : 0 name = format("%s-mock-pm-service-api", local.project) diff --git a/src/domains/nodo-app/04_apim_mock_psp.tf b/src/domains/nodo-app/04_apim_mock_psp.tf index d1cace02a3..85c014e31e 100644 --- a/src/domains/nodo-app/04_apim_mock_psp.tf +++ b/src/domains/nodo-app/04_apim_mock_psp.tf @@ -3,7 +3,7 @@ ############## module "apim_mock_psp_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" count = var.env_short == "d" ? 1 : 0 product_id = "mock_psp" @@ -46,7 +46,7 @@ resource "azurerm_api_management_api_version_set" "api_mock_psp_api" { module "apim_api_mock_psp_api_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" count = var.env_short == "d" ? 1 : 0 name = format("%s-mock-psp-service-api", local.project) diff --git a/src/domains/nodo-app/04_apim_mock_psp_replica.tf b/src/domains/nodo-app/04_apim_mock_psp_replica.tf index 2394890889..3b6fa86449 100644 --- a/src/domains/nodo-app/04_apim_mock_psp_replica.tf +++ b/src/domains/nodo-app/04_apim_mock_psp_replica.tf @@ -3,7 +3,7 @@ ###################### module "apim_mock_psp_product_replica" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" count = var.env_short == "p" ? 0 : 1 product_id = "mock_psp_replica" display_name = "Mock PSP for REPLICA NDP" @@ -44,7 +44,7 @@ resource "azurerm_api_management_api_version_set" "api_mock_psp_api_replica" { module "apim_api_mock_psp_api_replica_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" count = var.env_short == "p" ? 0 : 1 name = format("%s-mock-psp-service-api-replica", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/nodo-app/04_apim_mock_psp_secondary.tf b/src/domains/nodo-app/04_apim_mock_psp_secondary.tf index 7606c28938..ac99980609 100644 --- a/src/domains/nodo-app/04_apim_mock_psp_secondary.tf +++ b/src/domains/nodo-app/04_apim_mock_psp_secondary.tf @@ -3,7 +3,7 @@ ############## module "apim_mock_psp_secondary_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" count = var.env_short == "d" ? 1 : 0 product_id = "mock_psp_secondary" @@ -46,7 +46,7 @@ resource "azurerm_api_management_api_version_set" "api_mock_psp_secondary_api" { module "apim_api_mock_psp_secondary_api_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" count = var.env_short == "d" ? 1 : 0 name = format("%s-mock-psp-secondary-service-api", local.project) diff --git a/src/domains/nodo-app/04_apim_mock_psp_secondary_replica.tf b/src/domains/nodo-app/04_apim_mock_psp_secondary_replica.tf index ed3ea1e7e9..c097d3b980 100644 --- a/src/domains/nodo-app/04_apim_mock_psp_secondary_replica.tf +++ b/src/domains/nodo-app/04_apim_mock_psp_secondary_replica.tf @@ -3,7 +3,7 @@ ###################### module "apim_mock_psp_secondary_product_replica" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" count = var.env_short == "d" ? 1 : 0 product_id = "mock_psp_secondary_replica" display_name = "Mock PSP (Secondary) for REPLICA NDP" @@ -44,7 +44,7 @@ resource "azurerm_api_management_api_version_set" "api_mock_psp_secondary_api_re module "apim_api_mock_psp_secondary_api_replica_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" count = var.env_short == "d" ? 1 : 0 name = format("%s-mock-psp-secondary-service-api-replica", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/nodo-app/04_apim_nodo_datamigration.tf b/src/domains/nodo-app/04_apim_nodo_datamigration.tf index 59cf5877d4..7a5e906a94 100644 --- a/src/domains/nodo-app/04_apim_nodo_datamigration.tf +++ b/src/domains/nodo-app/04_apim_nodo_datamigration.tf @@ -11,7 +11,7 @@ locals { ## Products ## ############## module "apim_nododatamigration_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.6.0" + source = "./.terraform/modules/__v3__/api_management_product" product_id = "nodo-data-migration" display_name = local.apim_nododatamigration_api.display_name @@ -38,7 +38,7 @@ resource "azurerm_api_management_api_version_set" "api_datamigration_api" { } module "apim_api_nododatamigration_api_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.6.0" + source = "./.terraform/modules/__v3__/api_management_api" name = format("%s-nodo-datamigration-api", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/nodo-app/04_apim_nodo_services_ndp.tf b/src/domains/nodo-app/04_apim_nodo_services_ndp.tf index 3957052418..bbf9c9b01e 100644 --- a/src/domains/nodo-app/04_apim_nodo_services_ndp.tf +++ b/src/domains/nodo-app/04_apim_nodo_services_ndp.tf @@ -3,7 +3,7 @@ ############## module "apim_nodo_dei_pagamenti_product_ndp" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" product_id = "nodo-ndp" display_name = "Nodo dei Pagamenti NDP" @@ -471,7 +471,7 @@ resource "azurerm_api_management_api_version_set" "nodo_per_pm_api_ndp" { module "apim_nodo_per_pm_api_v1_ndp" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" name = format("%s-nodo-per-pm-api-ndp", local.project) resource_group_name = local.pagopa_apim_rg @@ -530,7 +530,7 @@ resource "azurerm_api_management_api_operation_policy" "close_payment_api_v2_ndp module "apim_nodo_per_pm_api_v2_ndp" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" name = format("%s-nodo-per-pm-api-ndp", local.project) resource_group_name = local.pagopa_apim_rg @@ -581,7 +581,7 @@ resource "azurerm_api_management_api_version_set" "nodo_monitoring_api_ndp" { } module "apim_nodo_monitoring_api_ndp" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" name = format("%s-nodo-monitoring-api-ndp", var.env_short) resource_group_name = local.pagopa_apim_rg diff --git a/src/domains/nodo-app/04_apim_nodo_services_ndp_replica.tf b/src/domains/nodo-app/04_apim_nodo_services_ndp_replica.tf index 5cd6104d41..daeb595518 100644 --- a/src/domains/nodo-app/04_apim_nodo_services_ndp_replica.tf +++ b/src/domains/nodo-app/04_apim_nodo_services_ndp_replica.tf @@ -3,7 +3,7 @@ ###################### module "apim_nodo_dei_pagamenti_product_replica_ndp" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" count = var.env_short == "p" ? 0 : 1 product_id = "nodo-replica-ndp" display_name = "Nodo dei Pagamenti REPLICA NDP" @@ -447,7 +447,7 @@ resource "azurerm_api_management_api_version_set" "nodo_per_pm_api_replica_ndp" } module "apim_nodo_per_pm_api_v1_replica_ndp" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" count = var.env_short == "p" ? 0 : 1 name = format("%s-nodo-per-pm-api-replica-ndp", local.project) @@ -497,7 +497,7 @@ resource "azurerm_api_management_api_operation_policy" "parked_list_api_v1_repli } module "apim_nodo_per_pm_api_v2_replica_ndp" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" count = var.env_short == "p" ? 0 : 1 name = format("%s-nodo-per-pm-api-replica-ndp", local.project) resource_group_name = local.pagopa_apim_rg @@ -549,7 +549,7 @@ resource "azurerm_api_management_api_version_set" "nodo_monitoring_api_replica_n } module "apim_nodo_monitoring_api_replica_ndp" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" count = var.env_short == "p" ? 0 : 1 name = format("%s-nodo-monitoring-api-replica-ndp", var.env_short) resource_group_name = local.pagopa_apim_rg diff --git a/src/domains/nodo-app/04_apim_product_apim_for_node.tf b/src/domains/nodo-app/04_apim_product_apim_for_node.tf index 8975eb2344..8ea21afb5f 100644 --- a/src/domains/nodo-app/04_apim_product_apim_for_node.tf +++ b/src/domains/nodo-app/04_apim_product_apim_for_node.tf @@ -1,6 +1,6 @@ # This product groups each API called by node module "apim_apim_for_node_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v5.1.0" + source = "./.terraform/modules/__v3__/api_management_product" product_id = local.apim_for_node.product_id display_name = local.apim_for_node.display_name diff --git a/src/domains/nodo-app/04_apim_prometheus.tf b/src/domains/nodo-app/04_apim_prometheus.tf index b10eefea15..54be3ca7f1 100644 --- a/src/domains/nodo-app/04_apim_prometheus.tf +++ b/src/domains/nodo-app/04_apim_prometheus.tf @@ -3,7 +3,7 @@ ############## module "apim_prometheus_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" product_id = "prometheus" display_name = "Prometheus for NDP" @@ -44,7 +44,7 @@ resource "azurerm_api_management_api_version_set" "api_prometheus_api" { */ module "apim_api_prometheus_api_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" name = format("%s-prometheus-service-api", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/nodo-app/04_apim_receipt_for_ndp.tf b/src/domains/nodo-app/04_apim_receipt_for_ndp.tf index 0e05653af0..a2caa7b970 100644 --- a/src/domains/nodo-app/04_apim_receipt_for_ndp.tf +++ b/src/domains/nodo-app/04_apim_receipt_for_ndp.tf @@ -6,7 +6,7 @@ # https://pagopa.atlassian.net/wiki/spaces/IQCGJ/pages/654541075/RFC+Gestione+clientId+per+integrazione+Software+Client#Diagramma-dettaglio-flusso module "apim_receipt_for_ndp_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" count = var.enable_sendPaymentResultV2_SWClient ? 1 : 0 @@ -63,8 +63,9 @@ data "azurerm_key_vault_secret" "subscriptionkey_ecomm" { } module "apim_api_receipt_for_ndp_api_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" - count = var.enable_sendPaymentResultV2_SWClient ? 1 : 0 + source = "./.terraform/modules/__v3__/api_management_api" + + count = var.enable_sendPaymentResultV2_SWClient ? 1 : 0 name = format("%s-receipt-npd-api", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/nodo-app/04_apim_webbo.tf b/src/domains/nodo-app/04_apim_webbo.tf index fa3bb693a5..ec83ad75da 100644 --- a/src/domains/nodo-app/04_apim_webbo.tf +++ b/src/domains/nodo-app/04_apim_webbo.tf @@ -3,7 +3,7 @@ ############## module "apim_web_bo_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" product_id = "web_bo" display_name = "Web BO (BackOffice) for NDP" @@ -44,7 +44,7 @@ resource "azurerm_api_management_api_version_set" "api_web_bo_api" { */ module "apim_api_web_bo_api_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" name = format("%s-web-bo-service-api", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/nodo-app/04_apim_wfesp.tf b/src/domains/nodo-app/04_apim_wfesp.tf index 2c4dc11b86..4c20025d09 100644 --- a/src/domains/nodo-app/04_apim_wfesp.tf +++ b/src/domains/nodo-app/04_apim_wfesp.tf @@ -3,7 +3,7 @@ ############## module "apim_wfesp_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" product_id = "wfesp" display_name = "WFESP for NDP" @@ -44,7 +44,7 @@ resource "azurerm_api_management_api_version_set" "api_wfesp_api" { module "apim_api_wfesp_api_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" name = format("%s-wfesp-service-api", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/nodo-app/04_apim_wfesp_replica.tf b/src/domains/nodo-app/04_apim_wfesp_replica.tf index bcc932d8c8..bd6fa84235 100644 --- a/src/domains/nodo-app/04_apim_wfesp_replica.tf +++ b/src/domains/nodo-app/04_apim_wfesp_replica.tf @@ -3,7 +3,7 @@ ###################### module "apim_wfesp_product_replica" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_product" count = var.env_short == "p" ? 0 : 1 product_id = "wfesp-replica" display_name = "WFESP for REPLICA NDP" @@ -44,7 +44,7 @@ resource "azurerm_api_management_api_version_set" "api_wfesp_api_replica" { module "apim_api_wfesp_api_replica_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1" + source = "./.terraform/modules/__v3__/api_management_api" count = var.env_short == "p" ? 0 : 1 name = format("%s-wfesp-service-api-replica", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/nodo-app/04_apim_wisp_converter_01_product.tf b/src/domains/nodo-app/04_apim_wisp_converter_01_product.tf index 907bce6daa..cae42342ef 100644 --- a/src/domains/nodo-app/04_apim_wisp_converter_01_product.tf +++ b/src/domains/nodo-app/04_apim_wisp_converter_01_product.tf @@ -2,7 +2,7 @@ ## Products ## ############## module "apim_wisp_converter_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v5.1.0" + source = "./.terraform/modules/__v3__/api_management_product" count = var.create_wisp_converter ? 1 : 0 product_id = "pagopa-wisp-converter" diff --git a/src/domains/nodo-app/04_apim_wisp_converter_04_caching.tf b/src/domains/nodo-app/04_apim_wisp_converter_04_caching.tf index 4df55a3b64..f8c6259db4 100644 --- a/src/domains/nodo-app/04_apim_wisp_converter_04_caching.tf +++ b/src/domains/nodo-app/04_apim_wisp_converter_04_caching.tf @@ -13,7 +13,7 @@ resource "azurerm_api_management_api_version_set" "api_version_set_wisp_converte } module "wisp_converter_caching_api_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.7.0" + source = "./.terraform/modules/__v3__/api_management_api" count = var.create_wisp_converter ? 1 : 0 name = format("%s-wisp-converter-caching-api", var.env_short) diff --git a/src/domains/nodo-app/05_fn_ndp_re_to_datastore.tf b/src/domains/nodo-app/05_fn_ndp_re_to_datastore.tf index 23029afa8e..0bd2d6ec64 100644 --- a/src/domains/nodo-app/05_fn_ndp_re_to_datastore.tf +++ b/src/domains/nodo-app/05_fn_ndp_re_to_datastore.tf @@ -85,7 +85,7 @@ locals { module "nodo_re_to_datastore_function" { count = var.enable_nodo_re ? 1 : 0 - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app?ref=v6.20.0" + source = "./.terraform/modules/__v3__/function_app" resource_group_name = azurerm_resource_group.nodo_re_to_datastore_rg[0].name name = "${local.project}-re-fn" @@ -132,6 +132,8 @@ module "nodo_re_to_datastore_function" { account_replication_type = var.function_app_storage_account_replication_type access_tier = "Hot" advanced_threat_protection_enable = true + use_legacy_defender_version = true + public_network_access_enabled = false } app_settings = local.function_re_to_datastore_app_settings @@ -145,7 +147,7 @@ module "nodo_re_to_datastore_function" { module "nodo_re_to_datastore_function_slot_staging" { count = var.enable_nodo_re && var.env_short == "p" ? 1 : 0 - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app_slot?ref=v6.9.0" + source = "./.terraform/modules/__v3__/function_app_slot" app_service_plan_id = module.nodo_re_to_datastore_function[0].app_service_plan_id function_app_id = module.nodo_re_to_datastore_function[0].id diff --git a/src/domains/nodo-app/05_fn_ndp_re_to_tablestorage.tf b/src/domains/nodo-app/05_fn_ndp_re_to_tablestorage.tf index 5aa7c60134..ee1fd1711e 100644 --- a/src/domains/nodo-app/05_fn_ndp_re_to_tablestorage.tf +++ b/src/domains/nodo-app/05_fn_ndp_re_to_tablestorage.tf @@ -48,7 +48,7 @@ locals { ## Function nodo_re_to_tablestorage module "nodo_re_to_tablestorage_function" { count = var.enable_nodo_re ? 1 : 0 - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app?ref=v6.20.0" + source = "./.terraform/modules/__v3__/function_app" resource_group_name = azurerm_resource_group.nodo_re_to_datastore_rg[0].name name = "${local.project}-re-ts-fn" @@ -74,10 +74,6 @@ module "nodo_re_to_tablestorage_function" { client_certificate_mode = "Optional" - cors = { - allowed_origins = [] - } - app_service_plan_name = "${local.project}-re-to-tablestorage-plan" app_service_plan_info = { kind = var.nodo_re_to_tablestorage_function.kind @@ -94,6 +90,8 @@ module "nodo_re_to_tablestorage_function" { account_replication_type = var.function_app_storage_account_replication_type access_tier = "Hot" advanced_threat_protection_enable = true + use_legacy_defender_version = true + public_network_access_enabled = false } app_settings = local.function_re_to_tablestorage_app_settings @@ -107,7 +105,7 @@ module "nodo_re_to_tablestorage_function" { module "nodo_re_to_tablestorage_function_slot_staging" { count = var.enable_nodo_re && var.env_short == "p" ? 1 : 0 - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app_slot?ref=v6.9.0" + source = "./.terraform/modules/__v3__/function_app_slot" app_service_plan_id = module.nodo_re_to_tablestorage_function[0].app_service_plan_id function_app_id = module.nodo_re_to_tablestorage_function[0].id diff --git a/src/domains/nodo-app/05_fn_ndp_verifyko_to_datastore.tf b/src/domains/nodo-app/05_fn_ndp_verifyko_to_datastore.tf index 216f41355a..4134c49c3c 100644 --- a/src/domains/nodo-app/05_fn_ndp_verifyko_to_datastore.tf +++ b/src/domains/nodo-app/05_fn_ndp_verifyko_to_datastore.tf @@ -53,7 +53,7 @@ locals { ## Function nodo_verifyko_to_datastore module "nodo_verifyko_to_datastore_function" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app?ref=v7.33.0" + source = "./.terraform/modules/__v3__/function_app" resource_group_name = data.azurerm_resource_group.nodo_verify_ko_rg.name name = "${local.project}-verifyko2ds-fn" @@ -80,9 +80,6 @@ module "nodo_verifyko_to_datastore_function" { sticky_connection_string_names = ["COSMOS_CONN_STRING"] client_certificate_mode = "Optional" - cors = { - allowed_origins = [] - } app_service_plan_name = "${local.project}-verifyko-to-datastore-plan" app_service_plan_info = { @@ -107,7 +104,7 @@ module "nodo_verifyko_to_datastore_function" { module "nodo_verifyko_to_datastore_function_slot_staging" { count = var.env_short == "p" ? 1 : 0 - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app_slot?ref=v7.33.0" + source = "./.terraform/modules/__v3__/function_app_slot" app_service_plan_id = module.nodo_verifyko_to_datastore_function.app_service_plan_id function_app_id = module.nodo_verifyko_to_datastore_function.id diff --git a/src/domains/nodo-app/05_fn_ndp_verifyko_to_tablestorage.tf b/src/domains/nodo-app/05_fn_ndp_verifyko_to_tablestorage.tf index 2de1a0e569..59a57b4773 100644 --- a/src/domains/nodo-app/05_fn_ndp_verifyko_to_tablestorage.tf +++ b/src/domains/nodo-app/05_fn_ndp_verifyko_to_tablestorage.tf @@ -58,7 +58,7 @@ locals { ## Function nodo_verifyko_to_tablestorage module "nodo_verifyko_to_tablestorage_function" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app?ref=v7.33.0" + source = "./.terraform/modules/__v3__/function_app" resource_group_name = data.azurerm_resource_group.nodo_verify_ko_rg.name name = "${local.project}-verifyko2ts-fn" @@ -84,9 +84,6 @@ module "nodo_verifyko_to_tablestorage_function" { client_certificate_mode = "Optional" - cors = { - allowed_origins = [] - } app_service_plan_name = "${local.project}-verifyko-to-tablestorage-plan" app_service_plan_info = { @@ -111,7 +108,7 @@ module "nodo_verifyko_to_tablestorage_function" { module "nodo_verifyko_to_tablestorage_function_slot_staging" { count = var.env_short == "p" ? 1 : 0 - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app_slot?ref=v7.33.0" + source = "./.terraform/modules/__v3__/function_app_slot" app_service_plan_id = module.nodo_verifyko_to_tablestorage_function.app_service_plan_id function_app_id = module.nodo_verifyko_to_tablestorage_function.id diff --git a/src/domains/nodo-app/06_aks_middleware_tools.tf b/src/domains/nodo-app/06_aks_middleware_tools.tf index d185d5e8dc..20ceb5d7d9 100644 --- a/src/domains/nodo-app/06_aks_middleware_tools.tf +++ b/src/domains/nodo-app/06_aks_middleware_tools.tf @@ -1,23 +1,21 @@ module "tls_checker" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//tls_checker?ref=v5.5.2" - # source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//tls_checker?ref=v6.2.1" + source = "./.terraform/modules/__v3__/tls_checker" - https_endpoint = local.nodo_hostname - alert_name = local.nodo_hostname - alert_enabled = true - helm_chart_present = true - helm_chart_version = var.tls_cert_check_helm.chart_version - namespace = kubernetes_namespace.namespace.metadata[0].name - helm_chart_image_name = var.tls_cert_check_helm.image_name - helm_chart_image_tag = var.tls_cert_check_helm.image_tag - location_string = var.location_string - application_insights_connection_string = data.azurerm_application_insights.application_insights.connection_string - # application_insights_connection_string = "ai-${var.env_short}-connection-string" - application_insights_resource_group = data.azurerm_resource_group.monitor_rg.name - application_insights_id = data.azurerm_application_insights.application_insights.id - application_insights_action_group_ids = [data.azurerm_monitor_action_group.slack.id, data.azurerm_monitor_action_group.email.id] - # keyvault_name = data.azurerm_key_vault.kv.name - # keyvault_tenantid = data.azurerm_client_config.current.tenant_id + https_endpoint = local.nodo_hostname + alert_name = local.nodo_hostname + alert_enabled = true + helm_chart_present = true + helm_chart_version = var.tls_cert_check_helm.chart_version + namespace = kubernetes_namespace.namespace.metadata[0].name + helm_chart_image_name = var.tls_cert_check_helm.image_name + helm_chart_image_tag = var.tls_cert_check_helm.image_tag + location_string = var.location_string + kv_secret_name_for_application_insights_connection_string = "ai-${var.env_short}-connection-string" + application_insights_resource_group = data.azurerm_resource_group.monitor_rg.name + application_insights_id = data.azurerm_application_insights.application_insights.id + application_insights_action_group_ids = [data.azurerm_monitor_action_group.slack.id, data.azurerm_monitor_action_group.email.id] + keyvault_name = data.azurerm_key_vault.kv.name + keyvault_tenant_id = data.azurerm_client_config.current.tenant_id } resource "helm_release" "cert_mounter" { diff --git a/src/domains/nodo-app/99_main.tf b/src/domains/nodo-app/99_main.tf index 8e123dd751..fce1b8cec3 100644 --- a/src/domains/nodo-app/99_main.tf +++ b/src/domains/nodo-app/99_main.tf @@ -10,11 +10,11 @@ terraform { } azurerm = { source = "hashicorp/azurerm" - version = "<= 3.44.1" + version = "<= 3.116.0" } helm = { source = "hashicorp/helm" - version = "<= 2.5.1" + version = "<= 2.12.1" } kubernetes = { source = "hashicorp/kubernetes" @@ -50,3 +50,9 @@ provider "helm" { config_path = "${var.k8s_kube_config_path_prefix}/config-${local.aks_name}" } } + + +module "__v3__" { + # v8.59.0 + source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=3fc1dafaf4354e24ca8673005ec0caf4106343a3" +} diff --git a/src/domains/nodo-app/99_variables.tf b/src/domains/nodo-app/99_variables.tf index 0e36cb5ec5..a2b69af8df 100644 --- a/src/domains/nodo-app/99_variables.tf +++ b/src/domains/nodo-app/99_variables.tf @@ -424,6 +424,8 @@ variable "storage_account_info" { account_replication_type = string access_tier = string advanced_threat_protection_enable = bool + use_legacy_defender_version = bool + public_network_access_enabled = bool }) default = { @@ -432,6 +434,8 @@ variable "storage_account_info" { account_replication_type = "LRS" access_tier = "Hot" advanced_threat_protection_enable = true + use_legacy_defender_version = true + public_network_access_enabled = false } } diff --git a/src/domains/nodo-app/README.md b/src/domains/nodo-app/README.md index 58cbf73d9b..530c805eea 100644 --- a/src/domains/nodo-app/README.md +++ b/src/domains/nodo-app/README.md @@ -8,8 +8,8 @@ |------|---------| | [azapi](#requirement\_azapi) | <= 1.3.0 | | [azuread](#requirement\_azuread) | <= 2.30.0 | -| [azurerm](#requirement\_azurerm) | <= 3.44.1 | -| [helm](#requirement\_helm) | <= 2.5.1 | +| [azurerm](#requirement\_azurerm) | <= 3.116.0 | +| [helm](#requirement\_helm) | <= 2.12.1 | | [kubernetes](#requirement\_kubernetes) | <= 2.11.0 | | [null](#requirement\_null) | <= 3.2.1 | @@ -17,65 +17,66 @@ | Name | Source | Version | |------|--------|---------| -| [apim\_api\_mock\_ec\_api\_replica\_v1](#module\_apim\_api\_mock\_ec\_api\_replica\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_mock\_ec\_api\_v1](#module\_apim\_api\_mock\_ec\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_mock\_ec\_secondary\_api\_replica\_v1](#module\_apim\_api\_mock\_ec\_secondary\_api\_replica\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_mock\_ec\_secondary\_api\_v1](#module\_apim\_api\_mock\_ec\_secondary\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_mock\_pm\_api\_v1](#module\_apim\_api\_mock\_pm\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_mock\_psp\_api\_replica\_v1](#module\_apim\_api\_mock\_psp\_api\_replica\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_mock\_psp\_api\_v1](#module\_apim\_api\_mock\_psp\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_mock\_psp\_secondary\_api\_replica\_v1](#module\_apim\_api\_mock\_psp\_secondary\_api\_replica\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_mock\_psp\_secondary\_api\_v1](#module\_apim\_api\_mock\_psp\_secondary\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_nododatamigration\_api\_v1](#module\_apim\_api\_nododatamigration\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.6.0 | -| [apim\_api\_prometheus\_api\_v1](#module\_apim\_api\_prometheus\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_receipt\_for\_ndp\_api\_v1](#module\_apim\_api\_receipt\_for\_ndp\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_web\_bo\_api\_v1](#module\_apim\_api\_web\_bo\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_wfesp\_api\_replica\_v1](#module\_apim\_api\_wfesp\_api\_replica\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_wfesp\_api\_v1](#module\_apim\_api\_wfesp\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_apim\_for\_node\_product](#module\_apim\_apim\_for\_node\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v5.1.0 | -| [apim\_cfg\_for\_node\_product](#module\_apim\_cfg\_for\_node\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.20.0 | -| [apim\_mock\_ec\_product](#module\_apim\_mock\_ec\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_mock\_ec\_product\_replica](#module\_apim\_mock\_ec\_product\_replica) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_mock\_ec\_secondary\_product](#module\_apim\_mock\_ec\_secondary\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_mock\_ec\_secondary\_product\_replica](#module\_apim\_mock\_ec\_secondary\_product\_replica) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_mock\_pm\_product](#module\_apim\_mock\_pm\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_mock\_psp\_product](#module\_apim\_mock\_psp\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_mock\_psp\_product\_replica](#module\_apim\_mock\_psp\_product\_replica) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_mock\_psp\_secondary\_product](#module\_apim\_mock\_psp\_secondary\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_mock\_psp\_secondary\_product\_replica](#module\_apim\_mock\_psp\_secondary\_product\_replica) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_nodo\_dei\_pagamenti\_product\_ndp](#module\_apim\_nodo\_dei\_pagamenti\_product\_ndp) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_nodo\_dei\_pagamenti\_product\_replica\_ndp](#module\_apim\_nodo\_dei\_pagamenti\_product\_replica\_ndp) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_nodo\_monitoring\_api\_ndp](#module\_apim\_nodo\_monitoring\_api\_ndp) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_nodo\_monitoring\_api\_replica\_ndp](#module\_apim\_nodo\_monitoring\_api\_replica\_ndp) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_nodo\_per\_pm\_api\_v1\_ndp](#module\_apim\_nodo\_per\_pm\_api\_v1\_ndp) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_nodo\_per\_pm\_api\_v1\_replica\_ndp](#module\_apim\_nodo\_per\_pm\_api\_v1\_replica\_ndp) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_nodo\_per\_pm\_api\_v2\_ndp](#module\_apim\_nodo\_per\_pm\_api\_v2\_ndp) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_nodo\_per\_pm\_api\_v2\_replica\_ndp](#module\_apim\_nodo\_per\_pm\_api\_v2\_replica\_ndp) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_nododatamigration\_product](#module\_apim\_nododatamigration\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.6.0 | -| [apim\_prometheus\_product](#module\_apim\_prometheus\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_receipt\_for\_ndp\_product](#module\_apim\_receipt\_for\_ndp\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_web\_bo\_product](#module\_apim\_web\_bo\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_wfesp\_product](#module\_apim\_wfesp\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_wfesp\_product\_replica](#module\_apim\_wfesp\_product\_replica) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_wisp\_converter\_product](#module\_apim\_wisp\_converter\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v5.1.0 | -| [load\_balancer\_nodo\_egress](#module\_load\_balancer\_nodo\_egress) | git::https://github.com/pagopa/terraform-azurerm-v3.git//load_balancer | v6.5.0 | -| [nodo\_re\_to\_datastore\_function](#module\_nodo\_re\_to\_datastore\_function) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app | v6.20.0 | -| [nodo\_re\_to\_datastore\_function\_slot\_staging](#module\_nodo\_re\_to\_datastore\_function\_slot\_staging) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app_slot | v6.9.0 | -| [nodo\_re\_to\_datastore\_function\_snet](#module\_nodo\_re\_to\_datastore\_function\_snet) | git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet | v6.4.1 | -| [nodo\_re\_to\_tablestorage\_function](#module\_nodo\_re\_to\_tablestorage\_function) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app | v6.20.0 | -| [nodo\_re\_to\_tablestorage\_function\_slot\_staging](#module\_nodo\_re\_to\_tablestorage\_function\_slot\_staging) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app_slot | v6.9.0 | -| [nodo\_re\_to\_tablestorage\_function\_snet](#module\_nodo\_re\_to\_tablestorage\_function\_snet) | git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet | v6.4.1 | -| [nodo\_verifyko\_to\_datastore\_function](#module\_nodo\_verifyko\_to\_datastore\_function) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app | v7.33.0 | -| [nodo\_verifyko\_to\_datastore\_function\_slot\_staging](#module\_nodo\_verifyko\_to\_datastore\_function\_slot\_staging) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app_slot | v7.33.0 | -| [nodo\_verifyko\_to\_datastore\_function\_snet](#module\_nodo\_verifyko\_to\_datastore\_function\_snet) | git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet | v6.4.1 | -| [nodo\_verifyko\_to\_tablestorage\_function](#module\_nodo\_verifyko\_to\_tablestorage\_function) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app | v7.33.0 | -| [nodo\_verifyko\_to\_tablestorage\_function\_slot\_staging](#module\_nodo\_verifyko\_to\_tablestorage\_function\_slot\_staging) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app_slot | v7.33.0 | -| [nodo\_verifyko\_to\_tablestorage\_function\_snet](#module\_nodo\_verifyko\_to\_tablestorage\_function\_snet) | git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet | v6.4.1 | -| [pod\_identity](#module\_pod\_identity) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_pod_identity | v6.4.1 | -| [route\_table\_peering\_nexi](#module\_route\_table\_peering\_nexi) | git::https://github.com/pagopa/terraform-azurerm-v3.git//route_table | v7.72.1 | -| [tls\_checker](#module\_tls\_checker) | git::https://github.com/pagopa/terraform-azurerm-v3.git//tls_checker | v5.5.2 | -| [vmss\_snet](#module\_vmss\_snet) | git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet | v6.4.1 | -| [wisp\_converter\_caching\_api\_v1](#module\_wisp\_converter\_caching\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.7.0 | +| [\_\_v3\_\_](#module\_\_\_v3\_\_) | git::https://github.com/pagopa/terraform-azurerm-v3 | 3fc1dafaf4354e24ca8673005ec0caf4106343a3 | +| [apim\_api\_mock\_ec\_api\_replica\_v1](#module\_apim\_api\_mock\_ec\_api\_replica\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_mock\_ec\_api\_v1](#module\_apim\_api\_mock\_ec\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_mock\_ec\_secondary\_api\_replica\_v1](#module\_apim\_api\_mock\_ec\_secondary\_api\_replica\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_mock\_ec\_secondary\_api\_v1](#module\_apim\_api\_mock\_ec\_secondary\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_mock\_pm\_api\_v1](#module\_apim\_api\_mock\_pm\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_mock\_psp\_api\_replica\_v1](#module\_apim\_api\_mock\_psp\_api\_replica\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_mock\_psp\_api\_v1](#module\_apim\_api\_mock\_psp\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_mock\_psp\_secondary\_api\_replica\_v1](#module\_apim\_api\_mock\_psp\_secondary\_api\_replica\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_mock\_psp\_secondary\_api\_v1](#module\_apim\_api\_mock\_psp\_secondary\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_nododatamigration\_api\_v1](#module\_apim\_api\_nododatamigration\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_prometheus\_api\_v1](#module\_apim\_api\_prometheus\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_receipt\_for\_ndp\_api\_v1](#module\_apim\_api\_receipt\_for\_ndp\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_web\_bo\_api\_v1](#module\_apim\_api\_web\_bo\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_wfesp\_api\_replica\_v1](#module\_apim\_api\_wfesp\_api\_replica\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_wfesp\_api\_v1](#module\_apim\_api\_wfesp\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_apim\_for\_node\_product](#module\_apim\_apim\_for\_node\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_cfg\_for\_node\_product](#module\_apim\_cfg\_for\_node\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_mock\_ec\_product](#module\_apim\_mock\_ec\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_mock\_ec\_product\_replica](#module\_apim\_mock\_ec\_product\_replica) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_mock\_ec\_secondary\_product](#module\_apim\_mock\_ec\_secondary\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_mock\_ec\_secondary\_product\_replica](#module\_apim\_mock\_ec\_secondary\_product\_replica) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_mock\_pm\_product](#module\_apim\_mock\_pm\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_mock\_psp\_product](#module\_apim\_mock\_psp\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_mock\_psp\_product\_replica](#module\_apim\_mock\_psp\_product\_replica) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_mock\_psp\_secondary\_product](#module\_apim\_mock\_psp\_secondary\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_mock\_psp\_secondary\_product\_replica](#module\_apim\_mock\_psp\_secondary\_product\_replica) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_nodo\_dei\_pagamenti\_product\_ndp](#module\_apim\_nodo\_dei\_pagamenti\_product\_ndp) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_nodo\_dei\_pagamenti\_product\_replica\_ndp](#module\_apim\_nodo\_dei\_pagamenti\_product\_replica\_ndp) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_nodo\_monitoring\_api\_ndp](#module\_apim\_nodo\_monitoring\_api\_ndp) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_nodo\_monitoring\_api\_replica\_ndp](#module\_apim\_nodo\_monitoring\_api\_replica\_ndp) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_nodo\_per\_pm\_api\_v1\_ndp](#module\_apim\_nodo\_per\_pm\_api\_v1\_ndp) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_nodo\_per\_pm\_api\_v1\_replica\_ndp](#module\_apim\_nodo\_per\_pm\_api\_v1\_replica\_ndp) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_nodo\_per\_pm\_api\_v2\_ndp](#module\_apim\_nodo\_per\_pm\_api\_v2\_ndp) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_nodo\_per\_pm\_api\_v2\_replica\_ndp](#module\_apim\_nodo\_per\_pm\_api\_v2\_replica\_ndp) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_nododatamigration\_product](#module\_apim\_nododatamigration\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_prometheus\_product](#module\_apim\_prometheus\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_receipt\_for\_ndp\_product](#module\_apim\_receipt\_for\_ndp\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_web\_bo\_product](#module\_apim\_web\_bo\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_wfesp\_product](#module\_apim\_wfesp\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_wfesp\_product\_replica](#module\_apim\_wfesp\_product\_replica) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_wisp\_converter\_product](#module\_apim\_wisp\_converter\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [load\_balancer\_nodo\_egress](#module\_load\_balancer\_nodo\_egress) | ./.terraform/modules/__v3__/load_balancer | n/a | +| [nodo\_re\_to\_datastore\_function](#module\_nodo\_re\_to\_datastore\_function) | ./.terraform/modules/__v3__/function_app | n/a | +| [nodo\_re\_to\_datastore\_function\_slot\_staging](#module\_nodo\_re\_to\_datastore\_function\_slot\_staging) | ./.terraform/modules/__v3__/function_app_slot | n/a | +| [nodo\_re\_to\_datastore\_function\_snet](#module\_nodo\_re\_to\_datastore\_function\_snet) | ./.terraform/modules/__v3__/subnet | n/a | +| [nodo\_re\_to\_tablestorage\_function](#module\_nodo\_re\_to\_tablestorage\_function) | ./.terraform/modules/__v3__/function_app | n/a | +| [nodo\_re\_to\_tablestorage\_function\_slot\_staging](#module\_nodo\_re\_to\_tablestorage\_function\_slot\_staging) | ./.terraform/modules/__v3__/function_app_slot | n/a | +| [nodo\_re\_to\_tablestorage\_function\_snet](#module\_nodo\_re\_to\_tablestorage\_function\_snet) | ./.terraform/modules/__v3__/subnet | n/a | +| [nodo\_verifyko\_to\_datastore\_function](#module\_nodo\_verifyko\_to\_datastore\_function) | ./.terraform/modules/__v3__/function_app | n/a | +| [nodo\_verifyko\_to\_datastore\_function\_slot\_staging](#module\_nodo\_verifyko\_to\_datastore\_function\_slot\_staging) | ./.terraform/modules/__v3__/function_app_slot | n/a | +| [nodo\_verifyko\_to\_datastore\_function\_snet](#module\_nodo\_verifyko\_to\_datastore\_function\_snet) | ./.terraform/modules/__v3__/subnet | n/a | +| [nodo\_verifyko\_to\_tablestorage\_function](#module\_nodo\_verifyko\_to\_tablestorage\_function) | ./.terraform/modules/__v3__/function_app | n/a | +| [nodo\_verifyko\_to\_tablestorage\_function\_slot\_staging](#module\_nodo\_verifyko\_to\_tablestorage\_function\_slot\_staging) | ./.terraform/modules/__v3__/function_app_slot | n/a | +| [nodo\_verifyko\_to\_tablestorage\_function\_snet](#module\_nodo\_verifyko\_to\_tablestorage\_function\_snet) | ./.terraform/modules/__v3__/subnet | n/a | +| [pod\_identity](#module\_pod\_identity) | ./.terraform/modules/__v3__/kubernetes_pod_identity | n/a | +| [route\_table\_peering\_nexi](#module\_route\_table\_peering\_nexi) | ./.terraform/modules/__v3__/route_table | n/a | +| [tls\_checker](#module\_tls\_checker) | ./.terraform/modules/__v3__/tls_checker | n/a | +| [vmss\_snet](#module\_vmss\_snet) | ./.terraform/modules/__v3__/subnet | n/a | +| [wisp\_converter\_caching\_api\_v1](#module\_wisp\_converter\_caching\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | ## Resources @@ -285,7 +286,7 @@ | [apim\_dns\_zone\_prefix](#input\_apim\_dns\_zone\_prefix) | The dns subdomain for apim. | `string` | `null` | no | | [apim\_nodo\_auth\_decoupler\_enable](#input\_apim\_nodo\_auth\_decoupler\_enable) | Apply decoupler to nodo-auth product apim policy | `bool` | `true` | no | | [apim\_nodo\_decoupler\_enable](#input\_apim\_nodo\_decoupler\_enable) | Apply decoupler to nodo product apim policy | `bool` | `true` | no | -| [app\_gateway\_allowed\_paths\_pagopa\_onprem\_only](#input\_app\_gateway\_allowed\_paths\_pagopa\_onprem\_only) | Allowed paths from pagopa onprem only | 
object({
    paths = list(string)
    ips   = list(string)
  })
| n/a | yes | +| [app\_gateway\_allowed\_paths\_pagopa\_onprem\_only](#input\_app\_gateway\_allowed\_paths\_pagopa\_onprem\_only) | Allowed paths from pagopa onprem only | 
object({
    paths = list(string)
    ips   = list(string)
  })
| n/a | yes | | [cidr\_subnet\_vmss](#input\_cidr\_subnet\_vmss) | VMSS network address space. | `list(string)` | n/a | yes | | [cname\_record\_name](#input\_cname\_record\_name) | n/a | `string` | `"config"` | no | | [create\_wisp\_converter](#input\_create\_wisp\_converter) | CREATE WISP dismantling system infra | `bool` | `false` | no | @@ -312,37 +313,37 @@ | [nodo\_pagamenti\_auth\_password](#input\_nodo\_pagamenti\_auth\_password) | Default password used for nodo-auth | `string` | `"PLACEHOLDER"` | no | | [nodo\_pagamenti\_subkey\_required](#input\_nodo\_pagamenti\_subkey\_required) | Enabled subkeys for nodo dei pagamenti api | `bool` | `false` | no | | [nodo\_pagamenti\_x\_forwarded\_for](#input\_nodo\_pagamenti\_x\_forwarded\_for) | X-Forwarded-For IP address used for nodo-auth | `string` | n/a | yes | -| [nodo\_re\_to\_datastore\_function](#input\_nodo\_re\_to\_datastore\_function) | Nodo RE to datastore function | 
object({
    always_on                    = bool
    kind                         = string
    sku_size                     = string
    sku_tier                     = string
    maximum_elastic_worker_count = number
  })
| 
{
  "always_on": true,
  "kind": "Linux",
  "maximum_elastic_worker_count": 1,
  "sku_size": "B1",
  "sku_tier": "Basic"
}
| no | +| [nodo\_re\_to\_datastore\_function](#input\_nodo\_re\_to\_datastore\_function) | Nodo RE to datastore function | 
object({
    always_on                    = bool
    kind                         = string
    sku_size                     = string
    sku_tier                     = string
    maximum_elastic_worker_count = number
  })
| 
{
  "always_on": true,
  "kind": "Linux",
  "maximum_elastic_worker_count": 1,
  "sku_size": "B1",
  "sku_tier": "Basic"
}
| no | | [nodo\_re\_to\_datastore\_function\_app\_image\_tag](#input\_nodo\_re\_to\_datastore\_function\_app\_image\_tag) | Nodo RE to Datastore function app docker image tag. Defaults to 'latest' | `string` | `"latest"` | no | -| [nodo\_re\_to\_datastore\_function\_autoscale](#input\_nodo\_re\_to\_datastore\_function\_autoscale) | Nodo RE functions autoscaling parameters | 
object({
    default = number
    minimum = number
    maximum = number
  })
| n/a | yes | +| [nodo\_re\_to\_datastore\_function\_autoscale](#input\_nodo\_re\_to\_datastore\_function\_autoscale) | Nodo RE functions autoscaling parameters | 
object({
    default = number
    minimum = number
    maximum = number
  })
| n/a | yes | | [nodo\_re\_to\_datastore\_function\_subnet](#input\_nodo\_re\_to\_datastore\_function\_subnet) | Address prefixes subnet | `list(string)` | `null` | no | | [nodo\_re\_to\_datastore\_network\_policies\_enabled](#input\_nodo\_re\_to\_datastore\_network\_policies\_enabled) | Network policies enabled | `bool` | `false` | no | -| [nodo\_re\_to\_tablestorage\_function](#input\_nodo\_re\_to\_tablestorage\_function) | Nodo RE to datastore function | 
object({
    always_on                    = bool
    kind                         = string
    sku_size                     = string
    sku_tier                     = string
    maximum_elastic_worker_count = number
  })
| n/a | yes | +| [nodo\_re\_to\_tablestorage\_function](#input\_nodo\_re\_to\_tablestorage\_function) | Nodo RE to datastore function | 
object({
    always_on                    = bool
    kind                         = string
    sku_size                     = string
    sku_tier                     = string
    maximum_elastic_worker_count = number
  })
| n/a | yes | | [nodo\_re\_to\_tablestorage\_function\_app\_image\_tag](#input\_nodo\_re\_to\_tablestorage\_function\_app\_image\_tag) | Nodo RE to Table Storage function app docker image tag. Defaults to 'latest' | `string` | `"latest"` | no | -| [nodo\_re\_to\_tablestorage\_function\_autoscale](#input\_nodo\_re\_to\_tablestorage\_function\_autoscale) | Nodo RE functions autoscaling parameters | 
object({
    default = number
    minimum = number
    maximum = number
  })
| n/a | yes | +| [nodo\_re\_to\_tablestorage\_function\_autoscale](#input\_nodo\_re\_to\_tablestorage\_function\_autoscale) | Nodo RE functions autoscaling parameters | 
object({
    default = number
    minimum = number
    maximum = number
  })
| n/a | yes | | [nodo\_re\_to\_tablestorage\_function\_subnet](#input\_nodo\_re\_to\_tablestorage\_function\_subnet) | Address prefixes subnet | `list(string)` | `null` | no | | [nodo\_re\_to\_tablestorage\_network\_policies\_enabled](#input\_nodo\_re\_to\_tablestorage\_network\_policies\_enabled) | Network policies enabled | `bool` | `false` | no | -| [nodo\_user\_node\_pool](#input\_nodo\_user\_node\_pool) | AKS node pool user configuration | 
object({
    enabled            = bool,
    name               = string,
    vm_size            = string,
    os_disk_type       = string,
    os_disk_size_gb    = string,
    node_count_min     = number,
    node_count_max     = number,
    node_labels        = map(any),
    node_taints        = list(string),
    node_tags          = map(any),
    nodo_pool_max_pods = number,
  })
| n/a | yes | -| [nodo\_verifyko\_to\_datastore\_function](#input\_nodo\_verifyko\_to\_datastore\_function) | Nodo Verify KO events to datastore function | 
object({
    always_on                    = bool
    kind                         = string
    sku_size                     = string
    sku_tier                     = string
    maximum_elastic_worker_count = number
    zone_balancing_enabled       = bool
  })
| n/a | yes | +| [nodo\_user\_node\_pool](#input\_nodo\_user\_node\_pool) | AKS node pool user configuration | 
object({
    enabled            = bool,
    name               = string,
    vm_size            = string,
    os_disk_type       = string,
    os_disk_size_gb    = string,
    node_count_min     = number,
    node_count_max     = number,
    node_labels        = map(any),
    node_taints        = list(string),
    node_tags          = map(any),
    nodo_pool_max_pods = number,
  })
| n/a | yes | +| [nodo\_verifyko\_to\_datastore\_function](#input\_nodo\_verifyko\_to\_datastore\_function) | Nodo Verify KO events to datastore function | 
object({
    always_on                    = bool
    kind                         = string
    sku_size                     = string
    sku_tier                     = string
    maximum_elastic_worker_count = number
    zone_balancing_enabled       = bool
  })
| n/a | yes | | [nodo\_verifyko\_to\_datastore\_function\_app\_image\_tag](#input\_nodo\_verifyko\_to\_datastore\_function\_app\_image\_tag) | Nodo Verify KO to Datastore function app docker image tag. Defaults to 'latest' | `string` | `"latest"` | no | -| [nodo\_verifyko\_to\_datastore\_function\_autoscale](#input\_nodo\_verifyko\_to\_datastore\_function\_autoscale) | Nodo Verify KO event functions autoscaling parameters | 
object({
    default = number
    minimum = number
    maximum = number
  })
| n/a | yes | +| [nodo\_verifyko\_to\_datastore\_function\_autoscale](#input\_nodo\_verifyko\_to\_datastore\_function\_autoscale) | Nodo Verify KO event functions autoscaling parameters | 
object({
    default = number
    minimum = number
    maximum = number
  })
| n/a | yes | | [nodo\_verifyko\_to\_datastore\_function\_subnet](#input\_nodo\_verifyko\_to\_datastore\_function\_subnet) | Address prefixes subnet | `list(string)` | `null` | no | | [nodo\_verifyko\_to\_datastore\_network\_policies\_enabled](#input\_nodo\_verifyko\_to\_datastore\_network\_policies\_enabled) | Network policies enabled | `bool` | `false` | no | -| [nodo\_verifyko\_to\_tablestorage\_function](#input\_nodo\_verifyko\_to\_tablestorage\_function) | Nodo Verify KO events to table storage function | 
object({
    always_on                    = bool
    kind                         = string
    sku_size                     = string
    sku_tier                     = string
    maximum_elastic_worker_count = number
    zone_balancing_enabled       = bool
  })
| n/a | yes | +| [nodo\_verifyko\_to\_tablestorage\_function](#input\_nodo\_verifyko\_to\_tablestorage\_function) | Nodo Verify KO events to table storage function | 
object({
    always_on                    = bool
    kind                         = string
    sku_size                     = string
    sku_tier                     = string
    maximum_elastic_worker_count = number
    zone_balancing_enabled       = bool
  })
| n/a | yes | | [nodo\_verifyko\_to\_tablestorage\_function\_app\_image\_tag](#input\_nodo\_verifyko\_to\_tablestorage\_function\_app\_image\_tag) | Nodo Verify KO events to Table Storage function app docker image tag. Defaults to 'latest' | `string` | `"latest"` | no | -| [nodo\_verifyko\_to\_tablestorage\_function\_autoscale](#input\_nodo\_verifyko\_to\_tablestorage\_function\_autoscale) | Nodo Verify KO events to Table Storage functions autoscaling parameters | 
object({
    default = number
    minimum = number
    maximum = number
  })
| n/a | yes | +| [nodo\_verifyko\_to\_tablestorage\_function\_autoscale](#input\_nodo\_verifyko\_to\_tablestorage\_function\_autoscale) | Nodo Verify KO events to Table Storage functions autoscaling parameters | 
object({
    default = number
    minimum = number
    maximum = number
  })
| n/a | yes | | [nodo\_verifyko\_to\_tablestorage\_function\_subnet](#input\_nodo\_verifyko\_to\_tablestorage\_function\_subnet) | Address prefixes subnet | `list(string)` | `null` | no | | [nodo\_verifyko\_to\_tablestorage\_network\_policies\_enabled](#input\_nodo\_verifyko\_to\_tablestorage\_network\_policies\_enabled) | Network policies enabled | `bool` | `false` | no | -| [pod\_disruption\_budgets](#input\_pod\_disruption\_budgets) | Pod disruption budget for domain namespace | 
map(object({
    name         = optional(string, null)
    minAvailable = optional(number, null)
    matchLabels  = optional(map(any), {})
  }))
| `{}` | no | +| [pod\_disruption\_budgets](#input\_pod\_disruption\_budgets) | Pod disruption budget for domain namespace | 
map(object({
    name         = optional(string, null)
    minAvailable = optional(number, null)
    matchLabels  = optional(map(any), {})
  }))
| `{}` | no | | [prefix](#input\_prefix) | n/a | `string` | n/a | yes | -| [route\_aks](#input\_route\_aks) | AKS routing table | 
list(object({
    name                   = string
    address_prefix         = string
    next_hop_type          = string
    next_hop_in_ip_address = string
  }))
| n/a | yes | -| [storage\_account\_info](#input\_storage\_account\_info) | Storage account | 
object({
    account_kind                      = string
    account_tier                      = string
    account_replication_type          = string
    access_tier                       = string
    advanced_threat_protection_enable = bool
  })
| 
{
  "access_tier": "Hot",
  "account_kind": "StorageV2",
  "account_replication_type": "LRS",
  "account_tier": "Standard",
  "advanced_threat_protection_enable": true
}
| no | -| [tags](#input\_tags) | n/a | `map(any)` | 
{
  "CreatedBy": "Terraform"
}
| no | -| [tls\_cert\_check\_helm](#input\_tls\_cert\_check\_helm) | tls cert helm chart configuration | 
object({
    chart_version = string,
    image_name    = string,
    image_tag     = string
  })
| n/a | yes | +| [route\_aks](#input\_route\_aks) | AKS routing table | 
list(object({
    name                   = string
    address_prefix         = string
    next_hop_type          = string
    next_hop_in_ip_address = string
  }))
| n/a | yes | +| [storage\_account\_info](#input\_storage\_account\_info) | Storage account | 
object({
    account_kind                      = string
    account_tier                      = string
    account_replication_type          = string
    access_tier                       = string
    advanced_threat_protection_enable = bool
    use_legacy_defender_version       = bool
    public_network_access_enabled     = bool
  })
| 
{
  "access_tier": "Hot",
  "account_kind": "StorageV2",
  "account_replication_type": "LRS",
  "account_tier": "Standard",
  "advanced_threat_protection_enable": true,
  "public_network_access_enabled": false,
  "use_legacy_defender_version": true
}
| no | +| [tags](#input\_tags) | n/a | `map(any)` | 
{
  "CreatedBy": "Terraform"
}
| no | +| [tls\_cert\_check\_helm](#input\_tls\_cert\_check\_helm) | tls cert helm chart configuration | 
object({
    chart_version = string,
    image_name    = string,
    image_tag     = string
  })
| n/a | yes | | [vmss\_instance\_number](#input\_vmss\_instance\_number) | availability zones for vmss | `number` | n/a | yes | | [vmss\_zones](#input\_vmss\_zones) | availability zones for vmss | `list(string)` | n/a | yes | -| [wfesp\_dismantling](#input\_wfesp\_dismantling) | n/a | 
object({
    channel_list    = string
    wfesp_fixed_url = string
  })
| n/a | yes | -| [wisp\_converter](#input\_wisp\_converter) | n/a | 
object({
    enable_apim_switch                  = bool # enable WISP dismantling
    brokerPSP_whitelist                 = string
    channel_whitelist                   = string
    nodoinviarpt_paymenttype_whitelist  = string
    dismantling_primitives              = string
    dismantling_rt_primitives           = string
    checkout_predefined_expiration_time = number
    wisp_ecommerce_channels             = string
  })
| n/a | yes | +| [wfesp\_dismantling](#input\_wfesp\_dismantling) | n/a | 
object({
    channel_list    = string
    wfesp_fixed_url = string
  })
| n/a | yes | +| [wisp\_converter](#input\_wisp\_converter) | n/a | 
object({
    enable_apim_switch                  = bool # enable WISP dismantling
    brokerPSP_whitelist                 = string
    channel_whitelist                   = string
    nodoinviarpt_paymenttype_whitelist  = string
    dismantling_primitives              = string
    dismantling_rt_primitives           = string
    checkout_predefined_expiration_time = number
    wisp_ecommerce_channels             = string
  })
| n/a | yes | ## Outputs diff --git a/src/domains/nodo-app/env/weu-dev/terraform.tfvars b/src/domains/nodo-app/env/weu-dev/terraform.tfvars index 83b4e4945c..b17524bfe7 100644 --- a/src/domains/nodo-app/env/weu-dev/terraform.tfvars +++ b/src/domains/nodo-app/env/weu-dev/terraform.tfvars @@ -28,9 +28,9 @@ apim_dns_zone_prefix = "dev.platform" # chart releases: https://github.com/pagopa/aks-microservice-chart-blueprint/releases # image tags: https://github.com/pagopa/infra-ssl-check/releases tls_cert_check_helm = { - chart_version = "1.21.0" + chart_version = "2.0.0" image_name = "ghcr.io/pagopa/infra-ssl-check" - image_tag = "v1.2.2@sha256:22f4b53177cc8891bf10cbd0deb39f60e1cd12877021c3048a01e7738f63e0f9" + image_tag = "v1.3.4@sha256:c3d45736706c981493b6216451fc65e99a69d5d64409ccb1c4ca93fef57c921d" } nodo_user_node_pool = { @@ -195,6 +195,8 @@ storage_account_info = { account_replication_type = "ZRS" access_tier = "Hot" advanced_threat_protection_enable = true + use_legacy_defender_version = true + public_network_access_enabled = false } # WISP-dismantling-cfg diff --git a/src/domains/nodo-app/env/weu-prod/terraform.tfvars b/src/domains/nodo-app/env/weu-prod/terraform.tfvars index a7042fac9a..08cd0bfe29 100644 --- a/src/domains/nodo-app/env/weu-prod/terraform.tfvars +++ b/src/domains/nodo-app/env/weu-prod/terraform.tfvars @@ -28,9 +28,9 @@ apim_dns_zone_prefix = "platform" # chart releases: https://github.com/pagopa/aks-microservice-chart-blueprint/releases # image tags: https://github.com/pagopa/infra-ssl-check/releases tls_cert_check_helm = { - chart_version = "1.21.0" + chart_version = "2.0.0" image_name = "ghcr.io/pagopa/infra-ssl-check" - image_tag = "v1.2.2@sha256:22f4b53177cc8891bf10cbd0deb39f60e1cd12877021c3048a01e7738f63e0f9" + image_tag = "v1.3.4@sha256:c3d45736706c981493b6216451fc65e99a69d5d64409ccb1c4ca93fef57c921d" } nodo_user_node_pool = { @@ -277,6 +277,8 @@ storage_account_info = { account_replication_type = "GZRS" access_tier = "Hot" advanced_threat_protection_enable = true + use_legacy_defender_version = true + public_network_access_enabled = false } nodo_auth_subscription_limit = 10000 diff --git a/src/domains/nodo-app/env/weu-uat/terraform.tfvars b/src/domains/nodo-app/env/weu-uat/terraform.tfvars index 1974e1b24e..6ec05d2eb6 100644 --- a/src/domains/nodo-app/env/weu-uat/terraform.tfvars +++ b/src/domains/nodo-app/env/weu-uat/terraform.tfvars @@ -28,9 +28,9 @@ apim_dns_zone_prefix = "uat.platform" # chart releases: https://github.com/pagopa/aks-microservice-chart-blueprint/releases # image tags: https://github.com/pagopa/infra-ssl-check/releases tls_cert_check_helm = { - chart_version = "1.21.0" + chart_version = "2.0.0" image_name = "ghcr.io/pagopa/infra-ssl-check" - image_tag = "v1.2.2@sha256:22f4b53177cc8891bf10cbd0deb39f60e1cd12877021c3048a01e7738f63e0f9" + image_tag = "v1.3.4@sha256:c3d45736706c981493b6216451fc65e99a69d5d64409ccb1c4ca93fef57c921d" } nodo_user_node_pool = { @@ -231,6 +231,8 @@ storage_account_info = { account_replication_type = "ZRS" access_tier = "Hot" advanced_threat_protection_enable = true + use_legacy_defender_version = true + public_network_access_enabled = false } # WISP-dismantling-cfg diff --git a/src/domains/nodo-app/scaleset-egress.tf b/src/domains/nodo-app/scaleset-egress.tf index 0838d12f2c..35719b10fa 100644 --- a/src/domains/nodo-app/scaleset-egress.tf +++ b/src/domains/nodo-app/scaleset-egress.tf @@ -11,7 +11,8 @@ data "azurerm_virtual_network" "vnet_integration" { } module "vmss_snet" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet?ref=v6.4.1" + source = "./.terraform/modules/__v3__/subnet" + name = format("%s-vmss-snet", local.project) address_prefixes = var.cidr_subnet_vmss resource_group_name = local.vnet_resource_group_name @@ -97,7 +98,8 @@ resource "azurerm_virtual_machine_scale_set_extension" "vmss-extension" { # create load balancer (NVA) with tcp/0 ports # module "load_balancer_nodo_egress" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//load_balancer?ref=v6.5.0" + source = "./.terraform/modules/__v3__/load_balancer" + resource_group_name = local.vnet_resource_group_name location = var.location name = format("%s-egress-lb", local.project) @@ -135,7 +137,7 @@ module "load_balancer_nodo_egress" { # create routing table from aks to external endpoint via load balancer NVA # module "route_table_peering_nexi" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//route_table?ref=v7.72.1" + source = "./.terraform/modules/__v3__/route_table" name = format("%s-aks-to-nexi-rt", local.project) location = var.location diff --git a/src/domains/nodo-common/00_monitor.tf b/src/domains/nodo-common/00_monitor.tf index 3548428328..f5d32c6d5a 100644 --- a/src/domains/nodo-common/00_monitor.tf +++ b/src/domains/nodo-common/00_monitor.tf @@ -45,6 +45,11 @@ data "azurerm_monitor_action_group" "opsgenie" { name = local.monitor_action_group_opsgenie_name } +data "azurerm_application_insights" "application_insights" { + name = local.application_insights_name + resource_group_name = data.azurerm_resource_group.monitor_rg.name +} + /* data "azurerm_key_vault_secret" "techemail" { name = "nodo-tech-support" @@ -71,6 +76,6 @@ locals { } } -} +} */ diff --git a/src/domains/nodo-common/02_security.tf b/src/domains/nodo-common/02_security.tf index c66254e056..879751a9f9 100644 --- a/src/domains/nodo-common/02_security.tf +++ b/src/domains/nodo-common/02_security.tf @@ -68,6 +68,15 @@ resource "azurerm_key_vault_secret" "node_cfg_sync_re_sa_connection_string" { ] } + +resource "azurerm_key_vault_secret" "ai_connection_string" { + name = format("ai-%s-connection-string", var.env_short) + value = data.azurerm_application_insights.application_insights.connection_string + content_type = "text/plain" + + key_vault_id = data.azurerm_key_vault.key_vault.id +} + resource "azurerm_key_vault_secret" "wisp_converter_re_sa_connection_string" { count = var.create_wisp_converter ? 1 : 0 name = "wisp-converter-re-sa-connection-string-key" diff --git a/src/domains/nodo-common/99_locals.tf b/src/domains/nodo-common/99_locals.tf index 1025563559..e7ce45b796 100644 --- a/src/domains/nodo-common/99_locals.tf +++ b/src/domains/nodo-common/99_locals.tf @@ -15,7 +15,7 @@ locals { monitor_action_group_slack_name = "SlackPagoPA" monitor_action_group_email_name = "PagoPA" monitor_action_group_opsgenie_name = "Opsgenie" - + application_insights_name = "pagopa-${var.env_short}-appinsights" vnet_name = "${local.product}-vnet" vnet_replica_name = "${local.product}-${var.location_replica_short}-core-replica-vnet" vnet_resource_group_name = "${local.product}-vnet-rg"