upgraded synthetic module, disabled fdr and customized nexi tests

pagopa · Dec 24, 2024 · b9df259 · b9df259
1 parent 7ce5991
commit b9df259
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 8 deletions.
diff --git a/src/synthetic-monitoring/02_monitoring.tf b/src/synthetic-monitoring/02_monitoring.tf
@@ -46,5 +46,7 @@ module "monitoring_function" {
     alert_enabled                            = var.synthetic_alerts_enabled
     verify_payment_internal_expected_outcome = var.verify_payment_internal_expected_outcome
     nexi_node_ip                             = var.nexi_node_ip
+    fdr_enabled                              = var.env == "prod" ? false : true
+    nexi_ndp_host                            = var.nexi_ndp_host
   })
 }
diff --git a/src/synthetic-monitoring/99_main.tf b/src/synthetic-monitoring/99_main.tf
@@ -34,6 +34,6 @@ data "azurerm_subscription" "current" {}
 data "azurerm_client_config" "current" {}
 
 module "__v3__" {
-  # v8.64.0
-  source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=ff49c94c7bfb8f2867e550483d8acc125bf516a7"
+  # v8.67.0
+  source = "git::https://github.com/pagopa/terraform-azurerm-v3?ref=bfddd6f7c18b5bd1aa1b367cefed6b5dc6f1242d"
 }
diff --git a/src/synthetic-monitoring/99_variables.tf b/src/synthetic-monitoring/99_variables.tf
@@ -118,3 +118,7 @@ variable "nexi_node_ip" {
   type        = string
   description = "Nodo Pagamenti Nexi ip"
 }
+variable "nexi_ndp_host" {
+  type        = string
+  description = "Nodo Pagamenti Nexi ip"
+}
diff --git a/src/synthetic-monitoring/README.md b/src/synthetic-monitoring/README.md
@@ -14,7 +14,7 @@
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module___v3__"></a> [\_\_v3\_\_](#module\_\_\_v3\_\_) | git::https://github.com/pagopa/terraform-azurerm-v3 | ff49c94c7bfb8f2867e550483d8acc125bf516a7 |
+| <a name="module___v3__"></a> [\_\_v3\_\_](#module\_\_\_v3\_\_) | git::https://github.com/pagopa/terraform-azurerm-v3 | bfddd6f7c18b5bd1aa1b367cefed6b5dc6f1242d |
 | <a name="module_monitoring_function"></a> [monitoring\_function](#module\_monitoring\_function) | ./.terraform/modules/__v3__/monitoring_function | n/a |
 | <a name="module_secret_core"></a> [secret\_core](#module\_secret\_core) | git::https://github.com/pagopa/terraform-azurerm-v3.git//key_vault_secrets_query | v8.54.0 |
 
@@ -51,6 +51,7 @@
 | <a name="input_law_sku"></a> [law\_sku](#input\_law\_sku) | Sku of the Log Analytics Workspace | `string` | `"PerGB2018"` | no |
 | <a name="input_location"></a> [location](#input\_location) | One of westeurope, northeurope | `string` | n/a | yes |
 | <a name="input_location_short"></a> [location\_short](#input\_location\_short) | One of wue, neu | `string` | n/a | yes |
+| <a name="input_nexi_ndp_host"></a> [nexi\_ndp\_host](#input\_nexi\_ndp\_host) | Nodo Pagamenti Nexi ip | `string` | n/a | yes |
 | <a name="input_nexi_node_ip"></a> [nexi\_node\_ip](#input\_nexi\_node\_ip) | Nodo Pagamenti Nexi ip | `string` | n/a | yes |
 | <a name="input_prefix"></a> [prefix](#input\_prefix) | n/a | `string` | n/a | yes |
 | <a name="input_self_alert_enabled"></a> [self\_alert\_enabled](#input\_self\_alert\_enabled) | (Optional) enables the alert on the function itself | `bool` | `true` | no |

diff --git a/src/synthetic-monitoring/env/weu-dev/terraform.tfvars b/src/synthetic-monitoring/env/weu-dev/terraform.tfvars
@@ -40,3 +40,4 @@ check_position_body = {
 }
 verify_payment_internal_expected_outcome = "KO"
 nexi_node_ip                             = "10.70.66.200"
+nexi_ndp_host                            = "nodo-p-sit.tst-npc.sia.eu"
diff --git a/src/synthetic-monitoring/env/weu-prod/terraform.tfvars b/src/synthetic-monitoring/env/weu-prod/terraform.tfvars
@@ -36,4 +36,5 @@ check_position_body = {
 }
 verify_payment_internal_expected_outcome = "OK"
 nexi_node_ip                             = "10.79.20.34"
-
+nexi_ndp_host                            = "nodo-p.npc.sia.eu"
+nexi_ndp_host_2                          = "nodo-dei-pagamenti.npc.sia.eu"
diff --git a/src/synthetic-monitoring/env/weu-uat/terraform.tfvars b/src/synthetic-monitoring/env/weu-uat/terraform.tfvars
@@ -36,4 +36,4 @@ check_position_body = {
 }
 verify_payment_internal_expected_outcome = "KO"
 nexi_node_ip                             = "10.70.74.200"
-
+nexi_ndp_host                            = "nodo-p-uat.tst-npc.sia.eu"
diff --git a/src/synthetic-monitoring/monitoring_configuration.json.tpl b/src/synthetic-monitoring/monitoring_configuration.json.tpl
@@ -317,6 +317,7 @@
   {
     "apiName" : "status",
     "appName" : "fdr",
+    "enabled" : ${fdr_enabled},
     "url" :  "https://${internal_api_domain_prefix}.fdr.${internal_api_domain_suffix}/pagopa-fdr-service/info",
     "type" : "aks",
     "checkCertificate" : true,
@@ -333,6 +334,7 @@
   {
     "apiName" : "status",
     "appName" : "fdr",
+    "enabled" : ${fdr_enabled},
     "url" :  "https://${api_dot_env_name}.platform.pagopa.it/shared/statuspage/v1/info?product=fdrndpnew",
     "type" : "apim",
     "checkCertificate" : true,
@@ -724,7 +726,7 @@
     "headers": {
       "Content-Type": "application/json",
       "ndphost": "nodo-${env_short}.nexigroup.com",
-      "Host": "nodo-dei-pagamenti.npc.sia.eu"
+      "Host": "${nexi_ndp_host}"
     },
     "tags" : {
       "description" : "pagopa nodo ${env_name} check position"
@@ -854,7 +856,7 @@
       "SOAPAction": "verifyPaymentNotice",
       "Content-Type": "application/xml",
       "ndphost": "nodo-${env_short}.nexigroup.com",
-      "Host": "nodo-dei-pagamenti.npc.sia.eu"
+      "Host": "${nexi_ndp_host}"
     },
     "tags" : {
       "description" : "pagopa nodo ${env_name} verify payment notice to internal service"
@@ -920,7 +922,7 @@
       "SOAPAction": "verifyPaymentNotice",
       "Content-Type": "application/xml",
       "ndphost": "nodo-${env_short}.nexigroup.com",
-      "Host": "nodo-dei-pagamenti.npc.sia.eu"
+      "Host": "${nexi_ndp_host}"
     },
     "tags" : {
       "description" : "pagopa nodo ${env_name} verify payment notice to external service trough nexi"