diff --git a/src/domains/aca-app/.terraform.lock.hcl b/src/domains/aca-app/.terraform.lock.hcl index 7a57a5263f..f6aaa7e6c5 100644 --- a/src/domains/aca-app/.terraform.lock.hcl +++ b/src/domains/aca-app/.terraform.lock.hcl @@ -5,11 +5,7 @@ provider "registry.terraform.io/hashicorp/azuread" { version = "2.33.0" constraints = "<= 2.33.0" hashes = [ - "h1:J8QmWBVaHiwndVJ04Us9hEKJNuMn7tSoBQ0IR19yR9s=", - "h1:PDiZA9QpXCkaSuWu6jiCRcjVtKJETqjcOZq4I434zfE=", - "h1:QAQe2+WSqGnHYAVoA+NN4Oeuoqg5sXq3U9Qmj6S1P5M=", "h1:XIvCW3Nl4bW1bc9f8jyGhft+fQjaed4yy/LFzDAeVJ8=", - "h1:Z28tjly5UfKOE+HL/oALxCPhmCuBwUgZ4uaYt68VR3M=", "zh:0602d03d7d7e38819f78dc377e64f365427496edf1065bfbb113e3921ab1c34e", "zh:08843838f4fe146084592472648d4ea7191931eabe042a96c3b3c6eaf8ddfb43", "zh:1c3e89cf19118fc07d7b04257251fc9897e722c16e0a0df7b07fcd261f8c12e7", @@ -26,49 +22,41 @@ provider "registry.terraform.io/hashicorp/azuread" { } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.40.0" - constraints = ">= 3.30.0, <= 3.40.0, <= 3.45.0" + version = "3.116.0" + constraints = "~> 3.30, <= 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:BCR3NIorFSvGG3v/+JOiiw3VM4PkChLO4m84wzD9NDo=", + "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.7.1" - constraints = "<= 2.7.1" + version = "2.12.1" + constraints = "~> 2.12, <= 2.12.1" hashes = [ - "h1:11oWNeohjD8Fy9S7WQSKY3GmDZi7gVdMRp8/Wqxn410=", - "h1:L5qLTfZH7PnZt9+YnS7iYmPBEDQOpEjZiF0v50BRNi8=", - "h1:OGZRkgiLBWmoA8/a9xZnEs5gsC5JhW+75++MkCPQbqw=", - "h1:RQrbJ5av+lUg5SICTFKJAib+McriKioommg6/Hy+5pM=", - "h1:jIiXxDpkVLVRTuY1w6GwhWvPWbvbn4vdIkPx87rcW4U=", - "zh:13e2467092deeff01c4cfa2b54ba4510aa7a9b06c58f22c4215b0f4333858364", - "zh:4549843db4fdf5d8150e8c0734e67b54b5c3bcfc914e3221e6952f428fb984d2", - "zh:55b5f83ed52f93dd00a73c33c948326052efd700350c19e63bb1679b12bfcda6", - "zh:749397e41393289eb0ef6efd0a75911d29b8aa7f48e5d6813b4b350dad91acbd", - "zh:7a4a2c95b055f6c8e70d1fc7a4cc4fd6e4f04845be36e40d42d31dfc13db37b8", - "zh:8143e5b8218857052505c805b570889b862c618ce6cbfbddb98938ff7a5901d3", - "zh:856d94b3b34d6204d66c6de4feab4737c74dba037ad64e4c613e8eec61d17f1a", - "zh:b9b037f1edda209022df1c7fc906786970524873e27b061f3355cb9bbed2cf08", - "zh:c433b27f52a0600490af07f8b217ab0b1048ba347d68e6fe478aba18634e78d9", - "zh:da133748368c6e27b433cd7faeb7b800536c8651e7af0415452901dfc7577dbf", - "zh:eecc63c2dec8aafa2ffd7426800c3e1a5e31e848be01ea9511ad0184dce15945", + "h1:aBfcqM4cbywa7TAxfT1YoFS+Cst9waerlm4XErFmJlk=", + "zh:1d623fb1662703f2feb7860e3c795d849c77640eecbc5a776784d08807b15004", + "zh:253a5bc62ba2c4314875139e3fbd2feaad5ef6b0fb420302a474ab49e8e51a38", + "zh:282358f4ad4f20d0ccaab670b8645228bfad1c03ac0d0df5889f0aea8aeac01a", + "zh:4fd06af3091a382b3f0d8f0a60880f59640d2b6d9d6a31f9a873c6f1bde1ec50", + "zh:6816976b1830f5629ae279569175e88b497abbbac30ee809948a1f923c67a80d", + "zh:7d82c4150cdbf48cfeec867be94c7b9bd7682474d4df0ebb7e24e148f964844f", + "zh:83f062049eea2513118a4c6054fb06c8600bac96196f25aed2cc21898ec86e93", + "zh:a79eec0cf4c08fca79e44033ec6e470f25ff23c3e2c7f9bc707ed7771c1072c0", + "zh:b2b2d904b2821a6e579910320605bc478bbef063579a23fbfdd6fcb5871b81f8", + "zh:e91177ca06a15487fc570cb81ecef6359aa399459ea2aa7c4f7367ba86f6fcad", + "zh:e976bcb82996fc4968f8382bbcb6673efb1f586bf92074058a232028d97825b1", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } @@ -77,11 +65,7 @@ provider "registry.terraform.io/hashicorp/kubernetes" { version = "2.11.0" constraints = "<= 2.11.0" hashes = [ - "h1:T65SZhN/tQgsAsHe/G5PCgpjofi+aTKPZ+nZg6WOJpc=", - "h1:d5NamuGihJgxmtSq07kSZblnJuekkjdFdRLTDeGb0us=", "h1:lSh/Q5vX73hHL80TtGn2Vrv1UYLzlIRjC+xaCijY4ew=", - "h1:lrhK0YgF/daYiTUWAQeY3vBD7uX8gm/44ZD4GTw71r4=", - "h1:pJiAJwZKUaoAJ4x+3ONJkwEVkjrwGROCGFgj7noPO58=", "zh:143a19dd0ea3b07fc5e3d9231f3c2d01f92894385c98a67327de74c76c715843", "zh:1fc757d209e09c3cf7848e4274daa32408c07743698fbed10ee52a4a479b62b6", "zh:22dfebd0685749c51a8f765d51a1090a259778960ac1cd4f32021a325b2b9b72", @@ -99,12 +83,8 @@ 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=", - "h1:vUW21lLLsKlxtBf0QF7LKJreKxs0CM7YXGzqW1N/ODY=", - "h1:wqgRvlyVIbkCeCQs+5jj6zVuQL0KDxZZtNofGqqlSdI=", "h1:ydA0/SNRVB1o95btfshvYsmxA+jZFRZcvKzZSB+4S1M=", "zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840", "zh:62a5cc82c3b2ddef7ef3a6f2fedb7b9b3deff4ab7b414938b08e51d6e8be87cb", diff --git a/src/domains/aca-app/04_apim_aca.tf b/src/domains/aca-app/04_apim_aca.tf index eb77fb3e95..7887cc1df9 100644 --- a/src/domains/aca-app/04_apim_aca.tf +++ b/src/domains/aca-app/04_apim_aca.tf @@ -3,7 +3,7 @@ ############## module "apim_aca_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product?ref=v6.3.0" + source = "./.terraform/modules/__v3__/api_management_product" product_id = "aca" display_name = "ACA pagoPA" @@ -43,7 +43,7 @@ resource "azurerm_api_management_api_version_set" "aca_api" { } module "apim_aca_api_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api?ref=v6.3.0" + source = "./.terraform/modules/__v3__/api_management_api" name = format("%s-api", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/aca-app/05_aks_middleware_tools.tf b/src/domains/aca-app/05_aks_middleware_tools.tf index 971d917157..0456a5df29 100644 --- a/src/domains/aca-app/05_aks_middleware_tools.tf +++ b/src/domains/aca-app/05_aks_middleware_tools.tf @@ -1,21 +1,23 @@ module "tls_checker" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//tls_checker?ref=v6.3.0" + source = "./.terraform/modules/__v3__/tls_checker" - https_endpoint = local.aca_hostname - alert_name = local.aca_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.aca_hostname + alert_name = local.aca_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_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 + + kv_secret_name_for_application_insights_connection_string = "ai-${var.env_short}-connection-string" } resource "helm_release" "cert_mounter" { @@ -41,7 +43,7 @@ resource "helm_release" "cert_mounter" { module "pod_identity" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_pod_identity?ref=v6.3.0" + source = "./.terraform/modules/__v3__/kubernetes_pod_identity" resource_group_name = local.aks_resource_group_name location = var.location diff --git a/src/domains/aca-app/99_main.tf b/src/domains/aca-app/99_main.tf index 37a81a61ca..4cc41c5128 100644 --- a/src/domains/aca-app/99_main.tf +++ b/src/domains/aca-app/99_main.tf @@ -2,7 +2,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = "<= 3.40.0" + version = "<= 3.116.0" } azuread = { source = "hashicorp/azuread" @@ -18,7 +18,7 @@ terraform { } helm = { source = "hashicorp/helm" - version = "<= 2.7.1" + version = "<= 2.12.1" } } @@ -46,3 +46,8 @@ provider "helm" { config_path = "${var.k8s_kube_config_path_prefix}/config-${local.aks_name}" } } + +module "__v3__" { + # v8.58.0 + source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=63f6181a6f3a51707a2ab4795bdbed2d888c708b" +} diff --git a/src/domains/aca-app/README.md b/src/domains/aca-app/README.md index 1c0e06622c..26bb1ed1c7 100644 --- a/src/domains/aca-app/README.md +++ b/src/domains/aca-app/README.md @@ -1,13 +1,13 @@ # aca-app - + ## Requirements | Name | Version | |------|---------| | [azuread](#requirement\_azuread) | <= 2.33.0 | -| [azurerm](#requirement\_azurerm) | <= 3.40.0 | -| [helm](#requirement\_helm) | <= 2.7.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 | @@ -15,10 +15,11 @@ | Name | Source | Version | |------|--------|---------| -| [apim\_aca\_api\_v1](#module\_apim\_aca\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.3.0 | -| [apim\_aca\_product](#module\_apim\_aca\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.3.0 | -| [pod\_identity](#module\_pod\_identity) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_pod_identity | v6.3.0 | -| [tls\_checker](#module\_tls\_checker) | git::https://github.com/pagopa/terraform-azurerm-v3.git//tls_checker | v6.3.0 | +| [\_\_v3\_\_](#module\_\_\_v3\_\_) | git::https://github.com/pagopa/terraform-azurerm-v3 | 63f6181a6f3a51707a2ab4795bdbed2d888c708b | +| [apim\_aca\_api\_v1](#module\_apim\_aca\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_aca\_product](#module\_apim\_aca\_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 @@ -93,4 +94,4 @@ ## Outputs No outputs. - + diff --git a/src/domains/aca-app/env/weu-dev/terraform.tfvars b/src/domains/aca-app/env/weu-dev/terraform.tfvars index 7737acc914..33263b0a3d 100644 --- a/src/domains/aca-app/env/weu-dev/terraform.tfvars +++ b/src/domains/aca-app/env/weu-dev/terraform.tfvars @@ -31,4 +31,4 @@ tls_cert_check_helm = { chart_version = "2.0.0" image_name = "ghcr.io/pagopa/infra-ssl-check" image_tag = "v1.3.4@sha256:c3d45736706c981493b6216451fc65e99a69d5d64409ccb1c4ca93fef57c921d" -} \ No newline at end of file +} diff --git a/src/domains/aca-app/env/weu-uat/terraform.tfvars b/src/domains/aca-app/env/weu-uat/terraform.tfvars index c63d601af2..5580a0b46b 100644 --- a/src/domains/aca-app/env/weu-uat/terraform.tfvars +++ b/src/domains/aca-app/env/weu-uat/terraform.tfvars @@ -31,4 +31,4 @@ tls_cert_check_helm = { chart_version = "2.0.0" image_name = "ghcr.io/pagopa/infra-ssl-check" image_tag = "v1.3.4@sha256:c3d45736706c981493b6216451fc65e99a69d5d64409ccb1c4ca93fef57c921d" -} \ No newline at end of file +}