From 92c8dadb43599c6bfffc6dcdf8cb44dd52eee394 Mon Sep 17 00:00:00 2001
From: Marco Mari <130982006+mamari90@users.noreply.github.com>
Date: Thu, 21 Nov 2024 16:21:32 +0100
Subject: [PATCH] feat: Upgraded apiconfig-app tf provider (#2575)
Upgraded apiconfig-app tf provider
---
src/domains/apiconfig-app/.terraform.lock.hcl | 74 +++++++++----------
src/domains/apiconfig-app/02_namespace.tf | 2 +-
.../04_apim_api_apiconfig-cache-node-nexi.tf | 2 +-
.../04_apim_api_apiconfig-cache-node.tf | 5 +-
...4_apim_api_apiconfig-cache-replica-node.tf | 10 ++-
.../apiconfig-app/04_apim_api_config.tf | 8 +-
.../04_apim_product_apiconfig-cache.tf | 2 +-
..._product_apiconfig-selfcare-integration.tf | 2 +-
.../apiconfig-app/05_aks_middleware_tools.tf | 32 ++++----
src/domains/apiconfig-app/99_main.tf | 9 ++-
src/domains/apiconfig-app/README.md | 39 +++++-----
src/domains/apiconfig-app/api_config.tf | 5 +-
src/domains/apiconfig-app/api_config_fe.tf | 5 +-
.../env/weu-dev/terraform.tfvars | 2 +-
.../env/weu-prod/terraform.tfvars | 2 +-
.../env/weu-uat/terraform.tfvars | 2 +-
16 files changed, 106 insertions(+), 95 deletions(-)
diff --git a/src/domains/apiconfig-app/.terraform.lock.hcl b/src/domains/apiconfig-app/.terraform.lock.hcl
index 816930b89c..8336364668 100644
--- a/src/domains/apiconfig-app/.terraform.lock.hcl
+++ b/src/domains/apiconfig-app/.terraform.lock.hcl
@@ -50,49 +50,49 @@ provider "registry.terraform.io/hashicorp/azuread" {
}
provider "registry.terraform.io/hashicorp/azurerm" {
- version = "3.40.0"
- constraints = ">= 3.30.0, <= 3.40.0, <= 3.44.1, <= 3.45.0, <= 3.53.0"
+ version = "3.116.0"
+ constraints = "~> 3.30, ~> 3.76, <= 3.116.0"
hashes = [
- "h1:/Jbhw/zNAsDYDoASaG6w+0KZyay9BkUVOpR8b7m0CsA=",
- "h1:7Vfig36efXmcsWQSZwdB+bqZLtoZ/RyytY9lXHx9Fic=",
- "h1:MdzSKWipft5VJlrNXfNNkOvC66aaiq2+H61Oa6gSVjc=",
- "h1:VpRitAMc2wjUH/2jCz9MtZZd83UFxwTCamjRvIh/Nvg=",
- "h1:dSM3nwscFP/OmH5Kr5FGao+9DjIXUEECnbMtWdrQOdg=",
- "zh:00fa6dc05bf2643c6a3c741edb7d88263698086835a8a613f1d7bd76d1b918fd",
- "zh:0da9b788e773272a7aa9d59bd9e3d5842edd4acc8c3895bea469e66dc14205a0",
- "zh:25a8c39d1f042fc7c83ba9dd745c3569ea9e577fadb57563a575fb115ac2b9f1",
- "zh:4423666dbeae8bc22c6e8898ffbb88745681dc27668ca9104b665dd7f3d7292c",
- "zh:78c07308e7407b558d15737a98fb5eaf15529d297fc3798de6a7d61e0466e2e3",
- "zh:894aca7e6f4f331ee8eb51957a180dc03d399d2b1727e0d7842e9b3f022a8c6a",
- "zh:bb0e620c2161b4c4892a6f50b1c4c69ed70f66bb5e92543a03d79d0e4b1d9441",
- "zh:c7d8e6a791159ca63b30908c9efe72ab65f60d64b30f0c1eb5a64972f4994844",
- "zh:d04c11bfd346c1ac34d16bbdca70b23b006e822f6beb236b85375e8343888eb4",
- "zh:f4edea9660327c7c70a823d786fd1b1c1b186c8759770447f63da72f23e1a73c",
+ "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:f986e268949cf445ff53a66af48a87c6f6dba5964e8a5b1dc0ea02afabdd71f7",
+ "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",
]
}
@@ -123,7 +123,7 @@ provider "registry.terraform.io/hashicorp/kubernetes" {
provider "registry.terraform.io/hashicorp/null" {
version = "3.2.1"
- constraints = "<= 3.2.1"
+ constraints = "~> 3.2, <= 3.2.1"
hashes = [
"h1:FbGfc+muBsC17Ohy5g806iuI1hQc4SIexpYCrQHQd8w=",
"h1:tSj1mL6OQ8ILGqR2mDu7OYYYWf+hoir0pf9KAQ8IzO8=",
diff --git a/src/domains/apiconfig-app/02_namespace.tf b/src/domains/apiconfig-app/02_namespace.tf
index 43597d8b50..ef69c5280b 100644
--- a/src/domains/apiconfig-app/02_namespace.tf
+++ b/src/domains/apiconfig-app/02_namespace.tf
@@ -5,7 +5,7 @@ resource "kubernetes_namespace" "namespace" {
}
module "pod_identity" {
- source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_pod_identity?ref=v4.1.17"
+ source = "./.terraform/modules/__v3__/kubernetes_pod_identity"
resource_group_name = local.aks_resource_group_name
location = var.location
diff --git a/src/domains/apiconfig-app/04_apim_api_apiconfig-cache-node-nexi.tf b/src/domains/apiconfig-app/04_apim_api_apiconfig-cache-node-nexi.tf
index ff2545e764..15240098e2 100644
--- a/src/domains/apiconfig-app/04_apim_api_apiconfig-cache-node-nexi.tf
+++ b/src/domains/apiconfig-app/04_apim_api_apiconfig-cache-node-nexi.tf
@@ -9,7 +9,7 @@ resource "azurerm_api_management_api_version_set" "api_apiconfig_cache_node_nexi
module "apim_api_apiconfig_cache_node_nexi_api_dev_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-apiconfig-cache-node-%s-api", local.project, "nexi")
api_management_name = local.pagopa_apim_name
diff --git a/src/domains/apiconfig-app/04_apim_api_apiconfig-cache-node.tf b/src/domains/apiconfig-app/04_apim_api_apiconfig-cache-node.tf
index 3c1cb496e4..322f38ff61 100644
--- a/src/domains/apiconfig-app/04_apim_api_apiconfig-cache-node.tf
+++ b/src/domains/apiconfig-app/04_apim_api_apiconfig-cache-node.tf
@@ -10,7 +10,8 @@ resource "azurerm_api_management_api_version_set" "api_apiconfig_cache_node_api_
}
module "apim_api_apiconfig_cache_node_api_v1_p" {
- source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v5.1.0"
+ source = "./.terraform/modules/__v3__/api_management_api"
+
name = format("%s-apiconfig-cache-node-%s-api", local.project, local.postgres)
api_management_name = local.pagopa_apim_name
resource_group_name = local.pagopa_apim_rg
@@ -51,7 +52,7 @@ resource "azurerm_api_management_api_version_set" "api_apiconfig_cache_node_api_
module "apim_api_apiconfig_cache_node_api_v1_o" {
- source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v5.1.0"
+ source = "./.terraform/modules/__v3__/api_management_api"
name = format("%s-apiconfig-cache-node-%s-api", local.project, local.oracle)
api_management_name = local.pagopa_apim_name
diff --git a/src/domains/apiconfig-app/04_apim_api_apiconfig-cache-replica-node.tf b/src/domains/apiconfig-app/04_apim_api_apiconfig-cache-replica-node.tf
index 49217b0966..fec8e72657 100644
--- a/src/domains/apiconfig-app/04_apim_api_apiconfig-cache-replica-node.tf
+++ b/src/domains/apiconfig-app/04_apim_api_apiconfig-cache-replica-node.tf
@@ -17,8 +17,9 @@ resource "azurerm_api_management_api_version_set" "api_apiconfig_cache_replica_n
module "apim_api_apiconfig_cache_replica_node_api_v1_p" {
- source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1"
- count = var.env_short == "p" ? 0 : 1
+ source = "./.terraform/modules/__v3__/api_management_api"
+
+ count = var.env_short == "p" ? 0 : 1
name = format("%s-apiconfig-cache-replica-node-%s-api", local.project, "p")
api_management_name = local.pagopa_apim_name
@@ -48,8 +49,9 @@ module "apim_api_apiconfig_cache_replica_node_api_v1_p" {
}
module "apim_api_apiconfig_cache_replica_node_api_v1_o" {
- source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.4.1"
- count = var.env_short == "p" ? 0 : 1
+ source = "./.terraform/modules/__v3__/api_management_api"
+
+ count = var.env_short == "p" ? 0 : 1
name = format("%s-apiconfig-cache-replica-node-%s-api", local.project, "o")
api_management_name = local.pagopa_apim_name
diff --git a/src/domains/apiconfig-app/04_apim_api_config.tf b/src/domains/apiconfig-app/04_apim_api_config.tf
index 4c4385a24a..0042e25d8e 100644
--- a/src/domains/apiconfig-app/04_apim_api_config.tf
+++ b/src/domains/apiconfig-app/04_apim_api_config.tf
@@ -3,7 +3,7 @@
##############
module "apim_api_config_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 = "product-api-config"
display_name = "ApiConfig JWT"
@@ -43,7 +43,7 @@ locals {
}
module "apim_api_config_api" {
- 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-api-config-api", var.env_short)
api_management_name = local.pagopa_apim_name
@@ -115,7 +115,7 @@ resource "azurerm_api_management_authorization_server" "apiconfig-oauth2" {
########################
module "apim_api_config_auth_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 = "product-api-config-auth"
display_name = "ApiConfig SubKey"
@@ -157,7 +157,7 @@ resource "azurerm_api_management_api_version_set" "api_config_auth_api" {
}
module "apim_api_config_auth_api" {
- 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-api-config-auth-api", var.env_short)
api_management_name = local.pagopa_apim_name
diff --git a/src/domains/apiconfig-app/04_apim_product_apiconfig-cache.tf b/src/domains/apiconfig-app/04_apim_product_apiconfig-cache.tf
index b9376c0463..4f7214ba60 100644
--- a/src/domains/apiconfig-app/04_apim_product_apiconfig-cache.tf
+++ b/src/domains/apiconfig-app/04_apim_product_apiconfig-cache.tf
@@ -1,7 +1,7 @@
###
### IT SHOULD BE DEPRECATED, PLEASE USE cfg-for-node PRODUCT
module "apim_apiconfig_cache_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 = local.apiconfig_cache_locals.product_id
display_name = local.apiconfig_cache_locals.display_name
diff --git a/src/domains/apiconfig-app/04_apim_product_apiconfig-selfcare-integration.tf b/src/domains/apiconfig-app/04_apim_product_apiconfig-selfcare-integration.tf
index 85831fe101..2e00b61830 100644
--- a/src/domains/apiconfig-app/04_apim_product_apiconfig-selfcare-integration.tf
+++ b/src/domains/apiconfig-app/04_apim_product_apiconfig-selfcare-integration.tf
@@ -1,5 +1,5 @@
module "apim_apiconfig_selfcare_integration_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.apiconfig_selfcare_integration_locals.product_id
display_name = local.apiconfig_selfcare_integration_locals.display_name
diff --git a/src/domains/apiconfig-app/05_aks_middleware_tools.tf b/src/domains/apiconfig-app/05_aks_middleware_tools.tf
index 19d97bdfb1..2f45228943 100644
--- a/src/domains/apiconfig-app/05_aks_middleware_tools.tf
+++ b/src/domains/apiconfig-app/05_aks_middleware_tools.tf
@@ -1,21 +1,21 @@
module "tls_checker" {
- 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.apiconfig_core_locals.hostname
- alert_name = local.apiconfig_core_locals.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 = "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.apiconfig_core_locals.hostname
+ alert_name = local.apiconfig_core_locals.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
}
diff --git a/src/domains/apiconfig-app/99_main.tf b/src/domains/apiconfig-app/99_main.tf
index 6ec4d252a4..37d2f88798 100644
--- a/src/domains/apiconfig-app/99_main.tf
+++ b/src/domains/apiconfig-app/99_main.tf
@@ -12,11 +12,11 @@ terraform {
}
azurerm = {
source = "hashicorp/azurerm"
- version = "<= 3.40.0"
+ version = "<= 3.116.0"
}
helm = {
source = "hashicorp/helm"
- version = "<= 2.5.1"
+ version = "<= 2.12.1"
}
kubernetes = {
source = "hashicorp/kubernetes"
@@ -61,3 +61,8 @@ provider "azapi" {
data "azurerm_subscription" "current" {}
data "azurerm_client_config" "current" {}
+
+module "__v3__" {
+ # v8.58.0
+ source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=63f6181a6f3a51707a2ab4795bdbed2d888c708b"
+}
diff --git a/src/domains/apiconfig-app/README.md b/src/domains/apiconfig-app/README.md
index a15f315107..2b4e176fc1 100644
--- a/src/domains/apiconfig-app/README.md
+++ b/src/domains/apiconfig-app/README.md
@@ -1,7 +1,7 @@
# apiconfig-app
-
+
## Requirements
| Name | Version |
@@ -9,9 +9,9 @@
| [terraform](#requirement\_terraform) | >=1.3.0 |
| [azapi](#requirement\_azapi) | <= 1.3.0 |
| [azuread](#requirement\_azuread) | <= 2.30.0 |
-| [azurerm](#requirement\_azurerm) | <= 3.40.0 |
+| [azurerm](#requirement\_azurerm) | <= 3.116.0 |
| [github](#requirement\_github) | <= 5.12.0 |
-| [helm](#requirement\_helm) | <= 2.5.1 |
+| [helm](#requirement\_helm) | <= 2.12.1 |
| [kubernetes](#requirement\_kubernetes) | <= 2.11.0 |
| [null](#requirement\_null) | <= 3.2.1 |
@@ -19,21 +19,22 @@
| Name | Source | Version |
|------|--------|---------|
-| [api\_config\_fe\_cdn](#module\_api\_config\_fe\_cdn) | git::https://github.com/pagopa/terraform-azurerm-v3.git//cdn | v6.4.1 |
-| [api\_config\_snet](#module\_api\_config\_snet) | git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet | v6.4.1 |
-| [apim\_api\_apiconfig\_cache\_node\_api\_v1\_o](#module\_apim\_api\_apiconfig\_cache\_node\_api\_v1\_o) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v5.1.0 |
-| [apim\_api\_apiconfig\_cache\_node\_api\_v1\_p](#module\_apim\_api\_apiconfig\_cache\_node\_api\_v1\_p) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v5.1.0 |
-| [apim\_api\_apiconfig\_cache\_node\_nexi\_api\_dev\_v1](#module\_apim\_api\_apiconfig\_cache\_node\_nexi\_api\_dev\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 |
-| [apim\_api\_apiconfig\_cache\_replica\_node\_api\_v1\_o](#module\_apim\_api\_apiconfig\_cache\_replica\_node\_api\_v1\_o) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 |
-| [apim\_api\_apiconfig\_cache\_replica\_node\_api\_v1\_p](#module\_apim\_api\_apiconfig\_cache\_replica\_node\_api\_v1\_p) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 |
-| [apim\_api\_config\_api](#module\_apim\_api\_config\_api) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 |
-| [apim\_api\_config\_auth\_api](#module\_apim\_api\_config\_auth\_api) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 |
-| [apim\_api\_config\_auth\_product](#module\_apim\_api\_config\_auth\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 |
-| [apim\_api\_config\_product](#module\_apim\_api\_config\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 |
-| [apim\_apiconfig\_cache\_product](#module\_apim\_apiconfig\_cache\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 |
-| [apim\_apiconfig\_selfcare\_integration\_product](#module\_apim\_apiconfig\_selfcare\_integration\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v5.1.0 |
-| [pod\_identity](#module\_pod\_identity) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_pod_identity | v4.1.17 |
-| [tls\_checker](#module\_tls\_checker) | git::https://github.com/pagopa/terraform-azurerm-v3.git//tls_checker | v6.2.1 |
+| [\_\_v3\_\_](#module\_\_\_v3\_\_) | git::https://github.com/pagopa/terraform-azurerm-v3 | 63f6181a6f3a51707a2ab4795bdbed2d888c708b |
+| [api\_config\_fe\_cdn](#module\_api\_config\_fe\_cdn) | ./.terraform/modules/__v3__/cdn | n/a |
+| [api\_config\_snet](#module\_api\_config\_snet) | ./.terraform/modules/__v3__/subnet | n/a |
+| [apim\_api\_apiconfig\_cache\_node\_api\_v1\_o](#module\_apim\_api\_apiconfig\_cache\_node\_api\_v1\_o) | ./.terraform/modules/__v3__/api_management_api | n/a |
+| [apim\_api\_apiconfig\_cache\_node\_api\_v1\_p](#module\_apim\_api\_apiconfig\_cache\_node\_api\_v1\_p) | ./.terraform/modules/__v3__/api_management_api | n/a |
+| [apim\_api\_apiconfig\_cache\_node\_nexi\_api\_dev\_v1](#module\_apim\_api\_apiconfig\_cache\_node\_nexi\_api\_dev\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a |
+| [apim\_api\_apiconfig\_cache\_replica\_node\_api\_v1\_o](#module\_apim\_api\_apiconfig\_cache\_replica\_node\_api\_v1\_o) | ./.terraform/modules/__v3__/api_management_api | n/a |
+| [apim\_api\_apiconfig\_cache\_replica\_node\_api\_v1\_p](#module\_apim\_api\_apiconfig\_cache\_replica\_node\_api\_v1\_p) | ./.terraform/modules/__v3__/api_management_api | n/a |
+| [apim\_api\_config\_api](#module\_apim\_api\_config\_api) | ./.terraform/modules/__v3__/api_management_api | n/a |
+| [apim\_api\_config\_auth\_api](#module\_apim\_api\_config\_auth\_api) | ./.terraform/modules/__v3__/api_management_api | n/a |
+| [apim\_api\_config\_auth\_product](#module\_apim\_api\_config\_auth\_product) | ./.terraform/modules/__v3__/api_management_product | n/a |
+| [apim\_api\_config\_product](#module\_apim\_api\_config\_product) | ./.terraform/modules/__v3__/api_management_product | n/a |
+| [apim\_apiconfig\_cache\_product](#module\_apim\_apiconfig\_cache\_product) | ./.terraform/modules/__v3__/api_management_product | n/a |
+| [apim\_apiconfig\_selfcare\_integration\_product](#module\_apim\_apiconfig\_selfcare\_integration\_product) | ./.terraform/modules/__v3__/api_management_product | n/a |
+| [pod\_identity](#module\_pod\_identity) | ./.terraform/modules/__v3__/kubernetes_pod_identity | n/a |
+| [tls\_checker](#module\_tls\_checker) | ./.terraform/modules/__v3__/tls_checker | n/a |
## Resources
@@ -154,4 +155,4 @@
| Name | Description |
|------|-------------|
| [pa](#output\_pa) | n/a |
-
+
diff --git a/src/domains/apiconfig-app/api_config.tf b/src/domains/apiconfig-app/api_config.tf
index 0dbe2757eb..3875e56a35 100644
--- a/src/domains/apiconfig-app/api_config.tf
+++ b/src/domains/apiconfig-app/api_config.tf
@@ -14,8 +14,9 @@ locals {
# Subnet to host the api config
module "api_config_snet" {
- count = var.cidr_subnet_api_config != null ? 1 : 0
- source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet?ref=v6.4.1"
+ count = var.cidr_subnet_api_config != null ? 1 : 0
+ source = "./.terraform/modules/__v3__/subnet"
+
name = format("%s-api-config-snet", local.product)
address_prefixes = var.cidr_subnet_api_config
resource_group_name = data.azurerm_virtual_network.vnet.resource_group_name
diff --git a/src/domains/apiconfig-app/api_config_fe.tf b/src/domains/apiconfig-app/api_config_fe.tf
index 5210071686..d5856b0fae 100644
--- a/src/domains/apiconfig-app/api_config_fe.tf
+++ b/src/domains/apiconfig-app/api_config_fe.tf
@@ -13,7 +13,7 @@ resource "azurerm_resource_group" "api_config_fe_rg" {
* CDN
*/
module "api_config_fe_cdn" {
- source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//cdn?ref=v6.4.1"
+ source = "./.terraform/modules/__v3__/cdn"
count = var.api_config_fe_enabled ? 1 : 0
name = "api-config-fe"
@@ -24,7 +24,6 @@ module "api_config_fe_cdn" {
# should be something like that config .platform .pagapa.it
hostname = format("%s.%s.%s", var.cname_record_name, var.apim_dns_zone_prefix, var.external_domain)
https_rewrite_enabled = true
- lock_enabled = false
storage_account_replication_type = var.cdn_storage_account_replication_type
@@ -82,6 +81,8 @@ module "api_config_fe_cdn" {
]
}
+ log_analytics_workspace_id = data.azurerm_log_analytics_workspace.log_analytics.id
+
tags = var.tags
}
diff --git a/src/domains/apiconfig-app/env/weu-dev/terraform.tfvars b/src/domains/apiconfig-app/env/weu-dev/terraform.tfvars
index 6900ca6c61..4acd0cf7af 100644
--- a/src/domains/apiconfig-app/env/weu-dev/terraform.tfvars
+++ b/src/domains/apiconfig-app/env/weu-dev/terraform.tfvars
@@ -30,7 +30,7 @@ private_dns_zone_db_nodo_pagamenti = "d.db-nodo-pagamenti.com"
tls_cert_check_helm = {
chart_version = "2.8.0"
image_name = "ghcr.io/pagopa/infra-ssl-check"
- image_tag = "v1.3.4"
+ image_tag = "v1.3.4@sha256:c3d45736706c981493b6216451fc65e99a69d5d64409ccb1c4ca93fef57c921d"
}
diff --git a/src/domains/apiconfig-app/env/weu-prod/terraform.tfvars b/src/domains/apiconfig-app/env/weu-prod/terraform.tfvars
index a58ce530b1..a1f43ffb3b 100644
--- a/src/domains/apiconfig-app/env/weu-prod/terraform.tfvars
+++ b/src/domains/apiconfig-app/env/weu-prod/terraform.tfvars
@@ -32,7 +32,7 @@ cidr_subnet_api_config = ["10.230.10.128/29"]
tls_cert_check_helm = {
chart_version = "2.8.0"
image_name = "ghcr.io/pagopa/infra-ssl-check"
- image_tag = "v1.3.4"
+ image_tag = "v1.3.4@sha256:c3d45736706c981493b6216451fc65e99a69d5d64409ccb1c4ca93fef57c921d"
}
diff --git a/src/domains/apiconfig-app/env/weu-uat/terraform.tfvars b/src/domains/apiconfig-app/env/weu-uat/terraform.tfvars
index 951970951f..b53353b9af 100644
--- a/src/domains/apiconfig-app/env/weu-uat/terraform.tfvars
+++ b/src/domains/apiconfig-app/env/weu-uat/terraform.tfvars
@@ -32,7 +32,7 @@ cidr_subnet_api_config = ["10.230.9.128/29"]
tls_cert_check_helm = {
chart_version = "2.8.0"
image_name = "ghcr.io/pagopa/infra-ssl-check"
- image_tag = "v1.3.4"
+ image_tag = "v1.3.4@sha256:c3d45736706c981493b6216451fc65e99a69d5d64409ccb1c4ca93fef57c921d"
}
db_service_name = "NDPSPCA_NODO4_CFG"
db_port = 1524