From 7be83a2f7a532b4ad16bdc8717f5b6c07aae7a34 Mon Sep 17 00:00:00 2001 From: Marco Mari <130982006+mamari90@users.noreply.github.com> Date: Fri, 22 Nov 2024 12:45:49 +0100 Subject: [PATCH] feat: Upgraded gpsapp tf provider (#2583) upgraded gpsapp tf provider --- src/domains/gps-app/.terraform.lock.hcl | 86 ++++++++++++------- src/domains/gps-app/00_alert_gpd_ingestion.tf | 18 ++-- src/domains/gps-app/00_network.tf | 2 +- src/domains/gps-app/02_namespace.tf | 2 +- src/domains/gps-app/04_apim_gpd.tf | 2 +- src/domains/gps-app/04_apim_gpd_core.tf | 12 +-- src/domains/gps-app/04_apim_gpd_for_pn_aca.tf | 6 +- src/domains/gps-app/04_apim_gpd_payments.tf | 6 +- src/domains/gps-app/04_apim_gpd_reporting.tf | 4 +- src/domains/gps-app/04_apim_gpd_upload.tf | 2 +- src/domains/gps-app/04_apim_gps.tf | 4 +- src/domains/gps-app/04_apim_gps_donation.tf | 4 +- .../gps-app/04_apim_gps_enrollments.tf | 4 +- src/domains/gps-app/04_apim_payments_pull.tf | 4 +- .../gps-app/04_apim_reporting_enrollment.tf | 4 +- .../gps-app/05_gpd_reporting_functions.tf | 12 +-- .../gps-app/06_aks_middleware_tools.tf | 2 +- src/domains/gps-app/99_main.tf | 13 ++- src/domains/gps-app/99_variables.tf | 4 + src/domains/gps-app/README.md | 84 +++++++++--------- .../gps-app/env/weu-dev/terraform.tfvars | 34 ++++---- .../gps-app/env/weu-prod/terraform.tfvars | 4 +- .../gps-app/env/weu-uat/terraform.tfvars | 4 +- 23 files changed, 180 insertions(+), 137 deletions(-) diff --git a/src/domains/gps-app/.terraform.lock.hcl b/src/domains/gps-app/.terraform.lock.hcl index a5e96e5c05..e176b3a681 100644 --- a/src/domains/gps-app/.terraform.lock.hcl +++ b/src/domains/gps-app/.terraform.lock.hcl @@ -6,6 +6,10 @@ provider "registry.terraform.io/azure/azapi" { constraints = "<= 1.3.0" hashes = [ "h1:OWZNYEGEIunmpxEcbGveH+kkdELQfMCUYxLt1b25UOc=", + "h1:UTQiZ34OcSms4LZ2sAa1OarDXw31OtogqBj0SwZCoDY=", + "h1:b4PzksrgRiHgOTVXIMTODOAlsvdj3uWSdCvA7lw+9ik=", + "h1:h/ZVYAapVQ+W0R4P5IK/Mvsi84jiYTggmgJHZgfVbfg=", + "h1:zpNS7i+p+MeA4h6xCbwXzcKtMeAn3je9k6J7DZQqReY=", "zh:0923b297c5b71ed584e5f3a0b2393e80244076e85102a90438159833353274b0", "zh:11fa2922aa98ca55beaf7cc33c7edbde81bbd405fdfea2955276c7f5a8537240", "zh:14af830fb6091d084bfc2711c8e9c7bf05aa3c56fe8fd8e2fb4eddeb345be88d", @@ -25,7 +29,11 @@ provider "registry.terraform.io/gavinbunney/kubectl" { version = "1.14.0" constraints = "1.14.0" hashes = [ + "h1:Ck8Re/28x7VBI5ArFg0VSg1woPu/APm1ZbMuzqUdnPo=", "h1:ItrWfCZMzM2JmvDncihBMalNLutsAk7kyyxVRaipftY=", + "h1:gLFn+RvP37sVzp9qnFCwngRjjFV649r6apjxvJ1E/SE=", + "h1:mX2AOFIMIxJmW5kM8DT51gloIOKCr9iT6W8yodnUyfs=", + "h1:tK3u7J4Ojrnx62lRvLok/XGvA7gzMkaVqNOZUDzWKOw=", "zh:0350f3122ff711984bbc36f6093c1fe19043173fad5a904bce27f86afe3cc858", "zh:07ca36c7aa7533e8325b38232c77c04d6ef1081cb0bac9d56e8ccd51f12f2030", "zh:0c351afd91d9e994a71fe64bbd1662d0024006b3493bb61d46c23ea3e42a7cf5", @@ -42,7 +50,11 @@ provider "registry.terraform.io/hashicorp/azuread" { version = "2.21.0" constraints = "<= 2.21.0" hashes = [ + "h1:9gG6SWoUZZmmXbYBv6ra2RF5NYpamB9tGjsuBxrasFQ=", "h1:KbY8dRdbfTwTzEBcdOFdD50JX8CUG5Mni25D2+k1rGc=", + "h1:akcofWscEl0ecIbf7lyEqRvPfOdA5q75EZvK8uSum1c=", + "h1:p9epRqujcxIMeT9THP0oNLGe4jjMBLjT5a7RntnFDaA=", + "h1:qHYbB6LJsYPVUcd7QkZ5tU+IX+10VcUG4NzsmIuWdlE=", "zh:18c56e0478e8b3849f6d52f7e0ee495538e7fce66f22fc84a79599615e50ad1c", "zh:1b95ba8dddc46c744b2d2be7da6fafaa8ebd8368d46ff77416a95cb7d622251e", "zh:1c3e89cf19118fc07d7b04257251fc9897e722c16e0a0df7b07fcd261f8c12e7", @@ -59,41 +71,49 @@ provider "registry.terraform.io/hashicorp/azuread" { } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.45.0" - constraints = ">= 3.30.0, <= 3.45.0, <= 3.53.0" + version = "3.116.0" + constraints = "~> 3.30, ~> 3.76, ~> 3.95, != 3.97.0, != 3.97.1, <= 3.116.0" hashes = [ - "h1:VQWxV5+qelZeUCjpdLvZ7iAom4RvG+fVVgK6ELvw/cs=", - "zh:04c5dbb8845366ce5eb0dc2d55e151270cc2c0ace20993867fdae9af43b953ad", - "zh:2589585da615ccae341400d45d672ee3fae413fdd88449b5befeff12a85a44b2", - "zh:603869ed98fff5d9bf841a51afd9e06b628533c59356c8433aef4b15df63f5f7", - "zh:853fecab9c987b6772c8d9aa10362675f6c626b60ebc7118aa33ce91366fcc38", - "zh:979848c45e8e058862c36ba3a661457f7c81ef26ebb6634f479600de9c203d65", - "zh:9b512c8588ecc9c1b803b746a3a8517422561a918f0dfb0faaa707ed53ef1760", - "zh:a9601ffb58043426bcff1220662d6d137f0b2857a24f2dcf180aeac2c9cea688", - "zh:d52d2652328f0ed3ba202561d88cb9f43c174edbfaab1abf69f772125dbfe15e", - "zh:d92d91ca597c47f575bf3ae129f4b723be9b7dcb71b906ec6ec740fac29b1aaa", - "zh:ded73b730e4197b70fda9e83447c119f92f75dc37be3ff2ed45730c8f0348c28", - "zh:ec37ac332d50f8ca5827f97198346b0f8ecbf470e2e3ba1e027bb389d826b902", + "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=", - "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", ] } @@ -102,7 +122,11 @@ 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", @@ -120,8 +144,12 @@ 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/gps-app/00_alert_gpd_ingestion.tf b/src/domains/gps-app/00_alert_gpd_ingestion.tf index a037728d55..bb9c31de11 100644 --- a/src/domains/gps-app/00_alert_gpd_ingestion.tf +++ b/src/domains/gps-app/00_alert_gpd_ingestion.tf @@ -2,15 +2,15 @@ locals { fn_name_for_alerts_exceptions = var.env_short != "p" ? [] : [ { - id: "paymentoptionprocessor" + id : "paymentoptionprocessor" name : "PaymentOptionProcessor" }, { - id: "paymentpositionprocessor" + id : "paymentpositionprocessor" name : "PaymentPositionProcessor" }, { - id: "transferprocessor" + id : "transferprocessor" name : "TransferProcessor" } ] @@ -24,7 +24,7 @@ locals { } resource "azurerm_monitor_scheduled_query_rules_alert" "gpd-ingestion-manager-availability" { - for_each = { for c in local.fn_name_for_alerts_exceptions : c.name => c } + for_each = { for c in local.fn_name_for_alerts_exceptions : c.name => c } resource_group_name = "dashboards" name = "pagopa-${var.env_short}-gpd-ingestion-manager-availability-${each.value.id}" location = var.location @@ -52,7 +52,7 @@ union traces, exceptions //| render timechart | where availability < threshold QUERY - , each.value.name) + , each.value.name) severity = 1 frequency = 5 time_window = 5 @@ -63,7 +63,7 @@ union traces, exceptions } resource "azurerm_monitor_scheduled_query_rules_alert" "gpd-ingestion-manager-error-json" { - for_each = { for c in local.fn_name_for_alerts_exceptions : c.name => c } + for_each = { for c in local.fn_name_for_alerts_exceptions : c.name => c } resource_group_name = "dashboards" name = "pagopa-${var.env_short}-gpd-ingestion-manager-error-json-${each.value.id}" location = var.location @@ -95,7 +95,7 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "gpd-ingestion-manager-er } resource "azurerm_monitor_scheduled_query_rules_alert" "gpd-ingestion-manager-error-generic" { - for_each = { for c in local.fn_name_for_alerts_exceptions : c.name => c } + for_each = { for c in local.fn_name_for_alerts_exceptions : c.name => c } resource_group_name = "dashboards" name = "pagopa-${var.env_short}-gpd-ingestion-manager-error-generic-${each.value.id}" location = var.location @@ -127,7 +127,7 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "gpd-ingestion-manager-er } resource "azurerm_monitor_scheduled_query_rules_alert" "gpd-ingestion-manager-error-pdv-tokenizer" { - for_each = { for c in local.fn_name_for_alerts_exceptions : c.name => c } + for_each = { for c in local.fn_name_for_alerts_exceptions : c.name => c } resource_group_name = "dashboards" name = "pagopa-${var.env_short}-gpd-ingestion-manager-error-pdv-tokenizer-${each.value.id}" location = var.location @@ -159,7 +159,7 @@ resource "azurerm_monitor_scheduled_query_rules_alert" "gpd-ingestion-manager-er } resource "azurerm_monitor_scheduled_query_rules_alert" "gpd-ingestion-manager-error-unexpected-pdv-tokenizer" { - for_each = { for c in local.fn_name_for_alerts_exceptions : c.name => c } + for_each = { for c in local.fn_name_for_alerts_exceptions : c.name => c } resource_group_name = "dashboards" name = "pagopa-${var.env_short}-gpd-ingestion-manager-error-unexpected-pdv-tokenizer-${each.value.id}" location = var.location diff --git a/src/domains/gps-app/00_network.tf b/src/domains/gps-app/00_network.tf index f9be6aa95b..2943df6847 100644 --- a/src/domains/gps-app/00_network.tf +++ b/src/domains/gps-app/00_network.tf @@ -17,7 +17,7 @@ data "azurerm_subnet" "canoneunico_function_snet" { # Subnet to host ecommerce transactions function module "reporting_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}-reporting-fn-snet" address_prefixes = var.cidr_subnet_reporting_functions resource_group_name = local.vnet_resource_group_name diff --git a/src/domains/gps-app/02_namespace.tf b/src/domains/gps-app/02_namespace.tf index 8fe2d11243..51aa1b617f 100644 --- a/src/domains/gps-app/02_namespace.tf +++ b/src/domains/gps-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=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/gps-app/04_apim_gpd.tf b/src/domains/gps-app/04_apim_gpd.tf index 93e1e86989..93f6fffdf0 100644 --- a/src/domains/gps-app/04_apim_gpd.tf +++ b/src/domains/gps-app/04_apim_gpd.tf @@ -7,7 +7,7 @@ ######################################################## module "apim_gpd_integration_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3//api_management_product?ref=v6.11.2" + source = "./.terraform/modules/__v3__/api_management_product" product_id = "debt-positions-integration" display_name = "GPD Debt Positions integration for organizations" diff --git a/src/domains/gps-app/04_apim_gpd_core.tf b/src/domains/gps-app/04_apim_gpd_core.tf index 1c93be29ce..5b4946d9d7 100644 --- a/src/domains/gps-app/04_apim_gpd_core.tf +++ b/src/domains/gps-app/04_apim_gpd_core.tf @@ -5,7 +5,7 @@ ## Products ## module "apim_gpd_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3//api_management_product?ref=v6.11.2" + source = "./.terraform/modules/__v3__/api_management_product" product_id = "product-gpd" display_name = "GPD pagoPA" description = "Prodotto Gestione Posizione Debitorie" @@ -24,7 +24,7 @@ module "apim_gpd_product" { ## API ## module "apim_api_gpd_api" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3//api_management_api?ref=v6.11.2" + source = "./.terraform/modules/__v3__/api_management_api" name = format("%s-api-gpd-api", var.env_short) api_management_name = local.pagopa_apim_name @@ -51,7 +51,7 @@ module "apim_api_gpd_api" { } module "apim_api_gpd_api_v2" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3//api_management_api?ref=v6.11.2" + source = "./.terraform/modules/__v3__/api_management_api" name = "${var.env_short}-api-gpd-api" api_management_name = local.pagopa_apim_name @@ -93,7 +93,7 @@ resource "azurerm_api_management_api_version_set" "api_gpd_api" { ## Products ## module "apim_debt_positions_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3//api_management_product?ref=v6.11.2" + source = "./.terraform/modules/__v3__/api_management_product" product_id = "debt-positions" display_name = "GPD Debt Positions for organizations" @@ -121,7 +121,7 @@ resource "azurerm_api_management_api_version_set" "api_debt_positions_api" { } module "apim_api_debt_positions_api_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3//api_management_api?ref=v6.11.2" + source = "./.terraform/modules/__v3__/api_management_api" name = format("%s-debt-positions-service-api", local.product) api_management_name = local.pagopa_apim_name @@ -149,7 +149,7 @@ module "apim_api_debt_positions_api_v1" { module "apim_api_debt_positions_api_v2" { count = var.env_short != "p" ? 1 : 0 # disbled v2 external bulk prod - source = "git::https://github.com/pagopa/terraform-azurerm-v3//api_management_api?ref=v6.11.2" + source = "./.terraform/modules/__v3__/api_management_api" name = format("%s-debt-positions-service-api", local.product) api_management_name = local.pagopa_apim_name diff --git a/src/domains/gps-app/04_apim_gpd_for_pn_aca.tf b/src/domains/gps-app/04_apim_gpd_for_pn_aca.tf index e3dd755382..e37e706e6a 100644 --- a/src/domains/gps-app/04_apim_gpd_for_pn_aca.tf +++ b/src/domains/gps-app/04_apim_gpd_for_pn_aca.tf @@ -45,7 +45,7 @@ locals { ############################ module "apim_pn_integration_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 = "pn-integration" display_name = "PN Integration" @@ -67,7 +67,7 @@ module "apim_pn_integration_product" { ############################# module "apim_aca_integration_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 = "aca-integration" display_name = "ACA Integration" @@ -98,7 +98,7 @@ resource "azurerm_api_management_api_version_set" "api_pn_integration_api" { } module "apim_api_pn_integration_gpd_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-pn-integration-gpd-api-aks", var.env_short) api_management_name = local.pagopa_apim_name diff --git a/src/domains/gps-app/04_apim_gpd_payments.tf b/src/domains/gps-app/04_apim_gpd_payments.tf index e08672e0df..d6241b1bc7 100644 --- a/src/domains/gps-app/04_apim_gpd_payments.tf +++ b/src/domains/gps-app/04_apim_gpd_payments.tf @@ -30,7 +30,7 @@ locals { ################### module "apim_gpd_payments_soap_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 = "gpd-payments-soap" display_name = "GPD Payments pagoPA - SOAP" @@ -126,7 +126,7 @@ resource "azurerm_api_management_api_operation_policy" "paSendRT_v2_wisp_api_pol ################### module "apim_gpd_payments_rest_external_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 = "gpd-payments-rest-aks" display_name = "GPD Payments pagoPA - REST for Auth" @@ -156,7 +156,7 @@ resource "azurerm_api_management_api_version_set" "api_gpd_payments_rest_externa } module "apim_api_gpd_payments_rest_external_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-gpd-payments-rest-api-aks", var.env_short) api_management_name = local.pagopa_apim_name diff --git a/src/domains/gps-app/04_apim_gpd_reporting.tf b/src/domains/gps-app/04_apim_gpd_reporting.tf index 489a569060..a8f16a7f15 100644 --- a/src/domains/gps-app/04_apim_gpd_reporting.tf +++ b/src/domains/gps-app/04_apim_gpd_reporting.tf @@ -16,7 +16,7 @@ locals { ############## module "apim_gpd_reporting_analysis_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-gpd-reporting" display_name = "GPD Reporting Analysis pagoPA" @@ -48,7 +48,7 @@ resource "azurerm_api_management_api_version_set" "api_gpd_reporting_analysis_ap module "apim_api_gpd_reporting_analysis_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-gpd-reporting-analysis-api", var.env_short) api_management_name = local.pagopa_apim_name diff --git a/src/domains/gps-app/04_apim_gpd_upload.tf b/src/domains/gps-app/04_apim_gpd_upload.tf index 262ab39707..8883b3d32d 100644 --- a/src/domains/gps-app/04_apim_gpd_upload.tf +++ b/src/domains/gps-app/04_apim_gpd_upload.tf @@ -25,7 +25,7 @@ resource "azurerm_api_management_api_version_set" "apim_gpd_upload_api" { } module "apim_gpd_upload_api_v1" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3//api_management_api?ref=v6.11.2" + source = "./.terraform/modules/__v3__/api_management_api" name = "${local.product}-gpd-upload-api" api_management_name = local.pagopa_apim_name diff --git a/src/domains/gps-app/04_apim_gps.tf b/src/domains/gps-app/04_apim_gps.tf index c5619807fa..d4e99821b9 100644 --- a/src/domains/gps-app/04_apim_gps.tf +++ b/src/domains/gps-app/04_apim_gps.tf @@ -3,7 +3,7 @@ ############## module "apim_gps_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 = "spontaneouspayments" display_name = "GPS pagoPA" @@ -44,7 +44,7 @@ resource "azurerm_api_management_api_version_set" "api_gps_api" { module "apim_api_gps_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-spontaneous-payments-service-api", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/gps-app/04_apim_gps_donation.tf b/src/domains/gps-app/04_apim_gps_donation.tf index 2677540cd7..9aecae1d4d 100644 --- a/src/domains/gps-app/04_apim_gps_donation.tf +++ b/src/domains/gps-app/04_apim_gps_donation.tf @@ -3,7 +3,7 @@ ############## module "apim_gps_donation_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 = "gpsdonation" display_name = "GPS Donation Service" @@ -44,7 +44,7 @@ resource "azurerm_api_management_api_version_set" "api_gps_donation_api" { module "apim_api_gps_donation_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-gps-donation-service-api", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/gps-app/04_apim_gps_enrollments.tf b/src/domains/gps-app/04_apim_gps_enrollments.tf index e33e1025a8..c1e1228464 100644 --- a/src/domains/gps-app/04_apim_gps_enrollments.tf +++ b/src/domains/gps-app/04_apim_gps_enrollments.tf @@ -7,7 +7,7 @@ ############## module "apim_gps_enrollments_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 = "gps-enrollments" display_name = "GPS enrollments" @@ -48,7 +48,7 @@ resource "azurerm_api_management_api_version_set" "api_gps_enrollments_api" { module "apim_api_gps_enrollments_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-spontaneous-payments-enrollments-service-api", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/gps-app/04_apim_payments_pull.tf b/src/domains/gps-app/04_apim_payments_pull.tf index 19a7db87bd..8687aac171 100644 --- a/src/domains/gps-app/04_apim_payments_pull.tf +++ b/src/domains/gps-app/04_apim_payments_pull.tf @@ -3,7 +3,7 @@ #################################### module "apim_gpd_payments_pull_product" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3//api_management_product?ref=v6.11.2" + source = "./.terraform/modules/__v3__/api_management_product" product_id = "gpd-payments-pull" display_name = "GPD Payments Pull" @@ -30,7 +30,7 @@ module "apim_gpd_payments_pull_product" { module "apim_gpd_payments_pull_product_and_debt_positions_product_test" { count = 1 # var.env_short != "p" ? 1 : 0 # ppull-prod-test - source = "git::https://github.com/pagopa/terraform-azurerm-v3//api_management_product?ref=v6.11.2" + source = "./.terraform/modules/__v3__/api_management_product" product_id = "test-gpd-payments-pull-and-debt-positions" display_name = "TEST GPD Payments Pull & GPD Debt Positions for organizations" diff --git a/src/domains/gps-app/04_apim_reporting_enrollment.tf b/src/domains/gps-app/04_apim_reporting_enrollment.tf index d818145ac7..996e839258 100644 --- a/src/domains/gps-app/04_apim_reporting_enrollment.tf +++ b/src/domains/gps-app/04_apim_reporting_enrollment.tf @@ -17,7 +17,7 @@ locals { ############## module "apim_gpd_enrollment_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 = "gpd-reporting-orgs-enrollment" display_name = local.apim_reporting-orgs-enrollment_service_api.display_name @@ -49,7 +49,7 @@ resource "azurerm_api_management_api_version_set" "api_gpd_enrollment_api" { module "apim_api_gpd_enrollment_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-reporting-orgs-enrollment-service-api", local.project) api_management_name = local.pagopa_apim_name diff --git a/src/domains/gps-app/05_gpd_reporting_functions.tf b/src/domains/gps-app/05_gpd_reporting_functions.tf index f2126f6226..f2803484e2 100644 --- a/src/domains/gps-app/05_gpd_reporting_functions.tf +++ b/src/domains/gps-app/05_gpd_reporting_functions.tf @@ -151,7 +151,7 @@ locals { ## Function reporting_batch module "reporting_batch_function" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app?ref=v6.9.0" + source = "./.terraform/modules/__v3__/function_app" resource_group_name = azurerm_resource_group.gpd_rg.name name = replace("${local.project}fn-gpd-batch", "gps", "") @@ -195,7 +195,7 @@ module "reporting_batch_function" { module "reporting_batch_function_slot_staging" { count = 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 = azurerm_app_service_plan.gpd_reporting_service_plan.id function_app_id = module.reporting_batch_function.id @@ -229,7 +229,7 @@ module "reporting_batch_function_slot_staging" { ## Function reporting_service module "reporting_service_function" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app?ref=v6.9.0" + source = "./.terraform/modules/__v3__/function_app" resource_group_name = azurerm_resource_group.gpd_rg.name name = format("%s-fn-gpd-service", local.product_location) @@ -279,7 +279,7 @@ module "reporting_service_function" { module "reporting_service_function_slot_staging" { count = 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 = azurerm_app_service_plan.gpd_reporting_service_plan.id function_app_id = module.reporting_service_function.id @@ -313,7 +313,7 @@ module "reporting_service_function_slot_staging" { ## Function reporting_analysis module "reporting_analysis_function" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app?ref=v6.9.0" + source = "./.terraform/modules/__v3__/function_app" resource_group_name = azurerm_resource_group.gpd_rg.name name = format("%s-fn-gpd-analysis", local.product_location) @@ -359,7 +359,7 @@ module "reporting_analysis_function" { module "reporting_analysis_function_slot_staging" { count = 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 = azurerm_app_service_plan.gpd_reporting_service_plan.id function_app_id = module.reporting_analysis_function.id diff --git a/src/domains/gps-app/06_aks_middleware_tools.tf b/src/domains/gps-app/06_aks_middleware_tools.tf index 1ea43be538..f609585cf6 100644 --- a/src/domains/gps-app/06_aks_middleware_tools.tf +++ b/src/domains/gps-app/06_aks_middleware_tools.tf @@ -1,5 +1,5 @@ module "tls_checker" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//tls_checker?ref=v6.7.0" + source = "./.terraform/modules/__v3__/tls_checker" https_endpoint = local.gps_hostname alert_name = local.gps_hostname diff --git a/src/domains/gps-app/99_main.tf b/src/domains/gps-app/99_main.tf index 8303b763e2..0886ed88ea 100644 --- a/src/domains/gps-app/99_main.tf +++ b/src/domains/gps-app/99_main.tf @@ -10,11 +10,11 @@ terraform { } azurerm = { source = "hashicorp/azurerm" - version = "<= 3.45.0" + version = "<= 3.116.0" } helm = { source = "hashicorp/helm" - version = "<= 2.5.1" + version = "<= 2.12.1" } kubernetes = { source = "hashicorp/kubernetes" @@ -61,6 +61,11 @@ provider "helm" { } } +provider "kubectl" { + config_path = "${var.k8s_kube_config_path_prefix}/config-${local.aks_name}" +} + module "__v3__" { - source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=15bbe5eb512bc0fa8f06ed28e0cca754b868743a" -} \ No newline at end of file + # v8.59.0 + source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=3fc1dafaf4354e24ca8673005ec0caf4106343a3" +} diff --git a/src/domains/gps-app/99_variables.tf b/src/domains/gps-app/99_variables.tf index cb34fc5c2d..395f82e481 100644 --- a/src/domains/gps-app/99_variables.tf +++ b/src/domains/gps-app/99_variables.tf @@ -409,6 +409,8 @@ variable "fn_app_storage_account_info" { account_replication_type = optional(string, "LRS") advanced_threat_protection_enable = optional(bool, true) access_tier = optional(string, "Hot") + public_network_access_enabled = optional(bool, false) + use_legacy_defender_version = optional(bool, false) }) default = { @@ -417,6 +419,8 @@ variable "fn_app_storage_account_info" { account_replication_type = "LRS" access_tier = "Hot" advanced_threat_protection_enable = true + public_network_access_enabled = false + use_legacy_defender_version = true } } diff --git a/src/domains/gps-app/README.md b/src/domains/gps-app/README.md index 1911dc025c..91f9eba1a5 100644 --- a/src/domains/gps-app/README.md +++ b/src/domains/gps-app/README.md @@ -8,8 +8,8 @@ |------|---------| | [azapi](#requirement\_azapi) | <= 1.3.0 | | [azuread](#requirement\_azuread) | <= 2.21.0 | -| [azurerm](#requirement\_azurerm) | <= 3.45.0 | -| [helm](#requirement\_helm) | <= 2.5.1 | +| [azurerm](#requirement\_azurerm) | <= 3.116.0 | +| [helm](#requirement\_helm) | <= 2.12.1 | | [kubectl](#requirement\_kubectl) | 1.14.0 | | [kubernetes](#requirement\_kubernetes) | <= 2.11.0 | | [null](#requirement\_null) | <= 3.2.1 | @@ -18,42 +18,42 @@ | Name | Source | Version | |------|--------|---------| -| [\_\_v3\_\_](#module\_\_\_v3\_\_) | git::https://github.com/pagopa/terraform-azurerm-v3 | 15bbe5eb512bc0fa8f06ed28e0cca754b868743a | -| [apim\_aca\_integration\_product](#module\_apim\_aca\_integration\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_api\_debt\_positions\_api\_v1](#module\_apim\_api\_debt\_positions\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3//api_management_api | v6.11.2 | -| [apim\_api\_debt\_positions\_api\_v2](#module\_apim\_api\_debt\_positions\_api\_v2) | git::https://github.com/pagopa/terraform-azurerm-v3//api_management_api | v6.11.2 | -| [apim\_api\_gpd\_api](#module\_apim\_api\_gpd\_api) | git::https://github.com/pagopa/terraform-azurerm-v3//api_management_api | v6.11.2 | -| [apim\_api\_gpd\_api\_v2](#module\_apim\_api\_gpd\_api\_v2) | git::https://github.com/pagopa/terraform-azurerm-v3//api_management_api | v6.11.2 | -| [apim\_api\_gpd\_enrollment\_api\_v1](#module\_apim\_api\_gpd\_enrollment\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_gpd\_payments\_rest\_external\_api\_v1](#module\_apim\_api\_gpd\_payments\_rest\_external\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_gpd\_reporting\_analysis\_api](#module\_apim\_api\_gpd\_reporting\_analysis\_api) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_gps\_api\_v1](#module\_apim\_api\_gps\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_gps\_donation\_api\_v1](#module\_apim\_api\_gps\_donation\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_gps\_enrollments\_api\_v1](#module\_apim\_api\_gps\_enrollments\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_api\_pn\_integration\_gpd\_api\_v1](#module\_apim\_api\_pn\_integration\_gpd\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.4.1 | -| [apim\_debt\_positions\_product](#module\_apim\_debt\_positions\_product) | git::https://github.com/pagopa/terraform-azurerm-v3//api_management_product | v6.11.2 | -| [apim\_gpd\_enrollment\_product](#module\_apim\_gpd\_enrollment\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_gpd\_integration\_product](#module\_apim\_gpd\_integration\_product) | git::https://github.com/pagopa/terraform-azurerm-v3//api_management_product | v6.11.2 | -| [apim\_gpd\_payments\_pull\_product](#module\_apim\_gpd\_payments\_pull\_product) | git::https://github.com/pagopa/terraform-azurerm-v3//api_management_product | v6.11.2 | -| [apim\_gpd\_payments\_pull\_product\_and\_debt\_positions\_product\_test](#module\_apim\_gpd\_payments\_pull\_product\_and\_debt\_positions\_product\_test) | git::https://github.com/pagopa/terraform-azurerm-v3//api_management_product | v6.11.2 | -| [apim\_gpd\_payments\_rest\_external\_product](#module\_apim\_gpd\_payments\_rest\_external\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_gpd\_payments\_soap\_product](#module\_apim\_gpd\_payments\_soap\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_gpd\_product](#module\_apim\_gpd\_product) | git::https://github.com/pagopa/terraform-azurerm-v3//api_management_product | v6.11.2 | -| [apim\_gpd\_reporting\_analysis\_product](#module\_apim\_gpd\_reporting\_analysis\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_gpd\_upload\_api\_v1](#module\_apim\_gpd\_upload\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3//api_management_api | v6.11.2 | -| [apim\_gps\_donation\_product](#module\_apim\_gps\_donation\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_gps\_enrollments\_product](#module\_apim\_gps\_enrollments\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_gps\_product](#module\_apim\_gps\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [apim\_pn\_integration\_product](#module\_apim\_pn\_integration\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.4.1 | -| [pod\_identity](#module\_pod\_identity) | git::https://github.com/pagopa/terraform-azurerm-v3.git//kubernetes_pod_identity | v6.4.1 | -| [reporting\_analysis\_function](#module\_reporting\_analysis\_function) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app | v6.9.0 | -| [reporting\_analysis\_function\_slot\_staging](#module\_reporting\_analysis\_function\_slot\_staging) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app_slot | v6.9.0 | -| [reporting\_batch\_function](#module\_reporting\_batch\_function) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app | v6.9.0 | -| [reporting\_batch\_function\_slot\_staging](#module\_reporting\_batch\_function\_slot\_staging) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app_slot | v6.9.0 | -| [reporting\_function\_snet](#module\_reporting\_function\_snet) | git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet | v6.4.1 | -| [reporting\_service\_function](#module\_reporting\_service\_function) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app | v6.9.0 | -| [reporting\_service\_function\_slot\_staging](#module\_reporting\_service\_function\_slot\_staging) | git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app_slot | v6.9.0 | -| [tls\_checker](#module\_tls\_checker) | git::https://github.com/pagopa/terraform-azurerm-v3.git//tls_checker | v6.7.0 | +| [\_\_v3\_\_](#module\_\_\_v3\_\_) | git::https://github.com/pagopa/terraform-azurerm-v3 | 3fc1dafaf4354e24ca8673005ec0caf4106343a3 | +| [apim\_aca\_integration\_product](#module\_apim\_aca\_integration\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_api\_debt\_positions\_api\_v1](#module\_apim\_api\_debt\_positions\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_debt\_positions\_api\_v2](#module\_apim\_api\_debt\_positions\_api\_v2) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_gpd\_api](#module\_apim\_api\_gpd\_api) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_gpd\_api\_v2](#module\_apim\_api\_gpd\_api\_v2) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_gpd\_enrollment\_api\_v1](#module\_apim\_api\_gpd\_enrollment\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_gpd\_payments\_rest\_external\_api\_v1](#module\_apim\_api\_gpd\_payments\_rest\_external\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_gpd\_reporting\_analysis\_api](#module\_apim\_api\_gpd\_reporting\_analysis\_api) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_gps\_api\_v1](#module\_apim\_api\_gps\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_gps\_donation\_api\_v1](#module\_apim\_api\_gps\_donation\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_gps\_enrollments\_api\_v1](#module\_apim\_api\_gps\_enrollments\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_api\_pn\_integration\_gpd\_api\_v1](#module\_apim\_api\_pn\_integration\_gpd\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_debt\_positions\_product](#module\_apim\_debt\_positions\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_gpd\_enrollment\_product](#module\_apim\_gpd\_enrollment\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_gpd\_integration\_product](#module\_apim\_gpd\_integration\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_gpd\_payments\_pull\_product](#module\_apim\_gpd\_payments\_pull\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_gpd\_payments\_pull\_product\_and\_debt\_positions\_product\_test](#module\_apim\_gpd\_payments\_pull\_product\_and\_debt\_positions\_product\_test) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_gpd\_payments\_rest\_external\_product](#module\_apim\_gpd\_payments\_rest\_external\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_gpd\_payments\_soap\_product](#module\_apim\_gpd\_payments\_soap\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_gpd\_product](#module\_apim\_gpd\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_gpd\_reporting\_analysis\_product](#module\_apim\_gpd\_reporting\_analysis\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_gpd\_upload\_api\_v1](#module\_apim\_gpd\_upload\_api\_v1) | ./.terraform/modules/__v3__/api_management_api | n/a | +| [apim\_gps\_donation\_product](#module\_apim\_gps\_donation\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_gps\_enrollments\_product](#module\_apim\_gps\_enrollments\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_gps\_product](#module\_apim\_gps\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [apim\_pn\_integration\_product](#module\_apim\_pn\_integration\_product) | ./.terraform/modules/__v3__/api_management_product | n/a | +| [pod\_identity](#module\_pod\_identity) | ./.terraform/modules/__v3__/kubernetes_pod_identity | n/a | +| [reporting\_analysis\_function](#module\_reporting\_analysis\_function) | ./.terraform/modules/__v3__/function_app | n/a | +| [reporting\_analysis\_function\_slot\_staging](#module\_reporting\_analysis\_function\_slot\_staging) | ./.terraform/modules/__v3__/function_app_slot | n/a | +| [reporting\_batch\_function](#module\_reporting\_batch\_function) | ./.terraform/modules/__v3__/function_app | n/a | +| [reporting\_batch\_function\_slot\_staging](#module\_reporting\_batch\_function\_slot\_staging) | ./.terraform/modules/__v3__/function_app_slot | n/a | +| [reporting\_function\_snet](#module\_reporting\_function\_snet) | ./.terraform/modules/__v3__/subnet | n/a | +| [reporting\_service\_function](#module\_reporting\_service\_function) | ./.terraform/modules/__v3__/function_app | n/a | +| [reporting\_service\_function\_slot\_staging](#module\_reporting\_service\_function\_slot\_staging) | ./.terraform/modules/__v3__/function_app_slot | n/a | +| [tls\_checker](#module\_tls\_checker) | ./.terraform/modules/__v3__/tls_checker | n/a | ## Resources @@ -85,6 +85,12 @@ | [azurerm_key_vault_secret.gpd_subscription_key](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource | | [azurerm_key_vault_secret.test_gpd_payments_pull_and_debt_positions_subkey_kv](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource | | [azurerm_monitor_autoscale_setting.reporting_function](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_autoscale_setting) | resource | +| [azurerm_monitor_scheduled_query_rules_alert.gpd-ingestion-manager-availability](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_scheduled_query_rules_alert) | resource | +| [azurerm_monitor_scheduled_query_rules_alert.gpd-ingestion-manager-error-alert](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_scheduled_query_rules_alert) | resource | +| [azurerm_monitor_scheduled_query_rules_alert.gpd-ingestion-manager-error-generic](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_scheduled_query_rules_alert) | resource | +| [azurerm_monitor_scheduled_query_rules_alert.gpd-ingestion-manager-error-json](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_scheduled_query_rules_alert) | resource | +| [azurerm_monitor_scheduled_query_rules_alert.gpd-ingestion-manager-error-pdv-tokenizer](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_scheduled_query_rules_alert) | resource | +| [azurerm_monitor_scheduled_query_rules_alert.gpd-ingestion-manager-error-unexpected-pdv-tokenizer](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_scheduled_query_rules_alert) | resource | | [azurerm_monitor_scheduled_query_rules_alert.opex_pagopa-gpd-core-external-availability-upd](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_scheduled_query_rules_alert) | resource | | [azurerm_monitor_scheduled_query_rules_alert.opex_pagopa-gpd-core-external-responsetime-upd](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_scheduled_query_rules_alert) | resource | | [azurerm_monitor_scheduled_query_rules_alert.opex_pagopa-gpd-core-internal-availability-lock-exception](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/monitor_scheduled_query_rules_alert) | resource | @@ -173,7 +179,7 @@ | [env\_short](#input\_env\_short) | n/a | `string` | n/a | yes | | [external\_domain](#input\_external\_domain) | Domain for delegation | `string` | `null` | no | | [flag\_responsetime\_alert](#input\_flag\_responsetime\_alert) | Flag to enable if payments-pull response time alert is available | `number` | `0` | no | -| [fn\_app\_storage\_account\_info](#input\_fn\_app\_storage\_account\_info) | n/a | 
object({
    account_kind                      = optional(string, "StorageV2")
    account_tier                      = optional(string, "Standard")
    account_replication_type          = optional(string, "LRS")
    advanced_threat_protection_enable = optional(bool, true)
    access_tier                       = optional(string, "Hot")
  })
| 
{
  "access_tier": "Hot",
  "account_kind": "StorageV2",
  "account_replication_type": "LRS",
  "account_tier": "Standard",
  "advanced_threat_protection_enable": true
}
| no | +| [fn\_app\_storage\_account\_info](#input\_fn\_app\_storage\_account\_info) | n/a | 
object({
    account_kind                      = optional(string, "StorageV2")
    account_tier                      = optional(string, "Standard")
    account_replication_type          = optional(string, "LRS")
    advanced_threat_protection_enable = optional(bool, true)
    access_tier                       = optional(string, "Hot")
    public_network_access_enabled     = optional(bool, false)
    use_legacy_defender_version       = optional(bool, false)
  })
| 
{
  "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 | | [gpd\_always\_on](#input\_gpd\_always\_on) | Always on property | `bool` | `true` | no | | [gpd\_autoscale\_default](#input\_gpd\_autoscale\_default) | The number of instances that are available for scaling if metrics are not available for evaluation. | `number` | `1` | no | | [gpd\_autoscale\_maximum](#input\_gpd\_autoscale\_maximum) | The maximum number of instances for this resource. | `number` | `3` | no | diff --git a/src/domains/gps-app/env/weu-dev/terraform.tfvars b/src/domains/gps-app/env/weu-dev/terraform.tfvars index d629af5bd7..b680dfcd8b 100644 --- a/src/domains/gps-app/env/weu-dev/terraform.tfvars +++ b/src/domains/gps-app/env/weu-dev/terraform.tfvars @@ -29,9 +29,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" } # function_app docker @@ -66,19 +66,19 @@ pgbouncer_enabled = false create_wisp_converter = true ### debezium kafka conn -zookeeper_replicas = "1" +zookeeper_replicas = "1" zookeeper_request_memory = "512Mi" -zookeeper_request_cpu = "0.5" -zookeeper_limits_memory = "512Mi" -zookeeper_limits_cpu = "0.5" -zookeeper_jvm_xms = "512m" -zookeeper_jvm_xmx = "512m" -zookeeper_storage_size = "100Gi" -replicas = 1 -request_cpu = 0.5 -request_memory = "512Mi" -limits_memory = "512Mi" -limits_cpu = 0.5 -postgres_db_name = "apd" -tasks_max = "1" -container_registry = "pagopadcommonacr.azurecr.io" +zookeeper_request_cpu = "0.5" +zookeeper_limits_memory = "512Mi" +zookeeper_limits_cpu = "0.5" +zookeeper_jvm_xms = "512m" +zookeeper_jvm_xmx = "512m" +zookeeper_storage_size = "100Gi" +replicas = 1 +request_cpu = 0.5 +request_memory = "512Mi" +limits_memory = "512Mi" +limits_cpu = 0.5 +postgres_db_name = "apd" +tasks_max = "1" +container_registry = "pagopadcommonacr.azurecr.io" diff --git a/src/domains/gps-app/env/weu-prod/terraform.tfvars b/src/domains/gps-app/env/weu-prod/terraform.tfvars index 61c16a201c..fe596ecd93 100644 --- a/src/domains/gps-app/env/weu-prod/terraform.tfvars +++ b/src/domains/gps-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" } # function_app docker diff --git a/src/domains/gps-app/env/weu-uat/terraform.tfvars b/src/domains/gps-app/env/weu-uat/terraform.tfvars index 46b693d520..da2f964465 100644 --- a/src/domains/gps-app/env/weu-uat/terraform.tfvars +++ b/src/domains/gps-app/env/weu-uat/terraform.tfvars @@ -26,9 +26,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" } # function_app docker