diff --git a/src/domains/afm-app/README.md b/src/domains/afm-app/README.md index d23563b29..9ffaf7223 100644 --- a/src/domains/afm-app/README.md +++ b/src/domains/afm-app/README.md @@ -40,6 +40,7 @@ | [azurerm_api_management_api_version_set.api_afm_utils_api](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_version_set) | resource | | [azurerm_api_management_group.api_afm_calculator_node_group](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_group) | resource | | [azurerm_api_management_named_value.afm_marketplace_sub_key_internal](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_named_value) | resource | +| [azurerm_api_management_named_value.afm_ndp_test_sub_key](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_named_value) | resource | | [azurerm_api_management_named_value.afm_secondary_sub_key](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_named_value) | resource | | [azurerm_api_management_product_group.api_afm_calculator_node_product_group](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_product_group) | resource | | [azurerm_key_vault_secret.aks_apiserver_url](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/key_vault_secret) | resource | diff --git a/src/domains/ecommerce-app/README.md b/src/domains/ecommerce-app/README.md index 21ce36577..240804959 100644 --- a/src/domains/ecommerce-app/README.md +++ b/src/domains/ecommerce-app/README.md @@ -19,7 +19,6 @@ | [apim\_ecommerce\_checkout\_product](#module\_apim\_ecommerce\_checkout\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.6.0 | | [apim\_ecommerce\_helpdesk\_commands\_product](#module\_apim\_ecommerce\_helpdesk\_commands\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.6.0 | | [apim\_ecommerce\_helpdesk\_product](#module\_apim\_ecommerce\_helpdesk\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.6.0 | -| [apim\_ecommerce\_io\_api\_v1](#module\_apim\_ecommerce\_io\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.6.0 | | [apim\_ecommerce\_io\_api\_v2](#module\_apim\_ecommerce\_io\_api\_v2) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.6.0 | | [apim\_ecommerce\_io\_outcomes\_api\_v1](#module\_apim\_ecommerce\_io\_outcomes\_api\_v1) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_api | v6.3.0 | | [apim\_ecommerce\_io\_product](#module\_apim\_ecommerce\_io\_product) | git::https://github.com/pagopa/terraform-azurerm-v3.git//api_management_product | v6.6.0 | @@ -76,19 +75,10 @@ | [azurerm_api_management_api_operation_policy.get_transactions_v2](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | | [azurerm_api_management_api_operation_policy.helpdesk_pgs_vpos](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | | [azurerm_api_management_api_operation_policy.helpdesk_pgs_xpay](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | -| [azurerm_api_management_api_operation_policy.io_calculate_fee](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | | [azurerm_api_management_api_operation_policy.io_calculate_fee_v2](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | -| [azurerm_api_management_api_operation_policy.io_create_session](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | -| [azurerm_api_management_api_operation_policy.io_create_transaction](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | -| [azurerm_api_management_api_operation_policy.io_delete_transaction](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | | [azurerm_api_management_api_operation_policy.io_get_all_payment_methods](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | -| [azurerm_api_management_api_operation_policy.io_get_transaction_info](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | -| [azurerm_api_management_api_operation_policy.io_post_wallet_transactions](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | | [azurerm_api_management_api_operation_policy.io_post_wallet_transactions_v2](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | -| [azurerm_api_management_api_operation_policy.io_transaction_authorization_request](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | | [azurerm_api_management_api_operation_policy.io_transaction_authorization_request_v2](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | -| [azurerm_api_management_api_operation_policy.io_transaction_outcome](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | -| [azurerm_api_management_api_operation_policy.io_wallets_by_user](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | | [azurerm_api_management_api_operation_policy.io_wallets_by_user_v2](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | | [azurerm_api_management_api_operation_policy.npg_notifications_policy](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | | [azurerm_api_management_api_operation_policy.post_orders_build](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/api_management_api_operation_policy) | resource | diff --git a/src/domains/nodo-app/README.md b/src/domains/nodo-app/README.md index ad9328445..e6e21fbae 100644 --- a/src/domains/nodo-app/README.md +++ b/src/domains/nodo-app/README.md @@ -323,7 +323,7 @@ | [vmss\_instance\_number](#input\_vmss\_instance\_number) | availability zones for vmss | `number` | n/a | yes | | [vmss\_zones](#input\_vmss\_zones) | availability zones for vmss | `list(string)` | n/a | yes | | [wfesp\_dismantling](#input\_wfesp\_dismantling) | n/a |
object({| n/a | yes | -| [wisp\_converter](#input\_wisp\_converter) | n/a |
channel_list = string
wfesp_fixed_url = string
})
object({| n/a | yes | +| [wisp\_converter](#input\_wisp\_converter) | n/a |
enable_apim_switch = bool # enable WISP dismantling
brokerPSP_whitelist = string
channel_whitelist = string
station_whitelist = string
ci_whitelist = string
nodoinviarpt_paymenttype_whitelist = string
dismantling_primitives = string
dismantling_rt_primitives = string
})
object({| n/a | yes | ## Outputs diff --git a/src/domains/nodo-app/env/weu-dev/terraform.tfvars b/src/domains/nodo-app/env/weu-dev/terraform.tfvars index 818fd5542..b2fb7aedc 100644 --- a/src/domains/nodo-app/env/weu-dev/terraform.tfvars +++ b/src/domains/nodo-app/env/weu-dev/terraform.tfvars @@ -214,6 +214,6 @@ enable_sendPaymentResultV2_SWClient = true # WFESP-dismantling-cfg wfesp_dismantling = { - channel_list = "13212880150_90" - wfesp_fixed_url = "https://wfesp.pagopa.gov.it/redirect/wpl05/get?idSession=" + channel_list = "13212880150_90" + wfesp_fixed_url = "https://wfesp.pagopa.gov.it/redirect/wpl05/get?idSession=" } diff --git a/src/domains/nodo-app/env/weu-uat/terraform.tfvars b/src/domains/nodo-app/env/weu-uat/terraform.tfvars index c4f5c48d9..5dfe64de9 100644 --- a/src/domains/nodo-app/env/weu-uat/terraform.tfvars +++ b/src/domains/nodo-app/env/weu-uat/terraform.tfvars @@ -223,9 +223,9 @@ storage_account_info = { create_wisp_converter = true wisp_converter = { enable_apim_switch = true - brokerPSP_whitelist = "97735020584" # AGID - channel_whitelist = "97735020584_02" # https://pagopa.atlassian.net/wiki/spaces/PAG/pages/135924270/Canali+Particolari - station_whitelist = "*" # https://config.uat.platform.pagopa.it/stations/15376371009_09 in UAT x i test quella di MockEC + brokerPSP_whitelist = "97735020584" # AGID + channel_whitelist = "97735020584_02" # https://pagopa.atlassian.net/wiki/spaces/PAG/pages/135924270/Canali+Particolari + station_whitelist = "*" # https://config.uat.platform.pagopa.it/stations/15376371009_09 in UAT x i test quella di MockEC ci_whitelist = "*" nodoinviarpt_paymenttype_whitelist = "BBT" dismantling_primitives = "nodoInviaRPT,nodoInviaCarrelloRPT" diff --git a/src/domains/nodo-common/02_security.tf b/src/domains/nodo-common/02_security.tf index 7667e6b45..e672fbfc5 100644 --- a/src/domains/nodo-common/02_security.tf +++ b/src/domains/nodo-common/02_security.tf @@ -28,6 +28,15 @@ data "azurerm_servicebus_queue_authorization_rule" "wisp_payment_timeout_authori depends_on = [azurerm_servicebus_queue.service_bus_wisp_queue] } +data "azurerm_servicebus_queue_authorization_rule" "nodo_wisp_ecommerce_hang_timeout_queue" { + name = "nodo_wisp_ecommerce_hang_timeout_queue" + resource_group_name = local.sb_resource_group_name + queue_name = "nodo_wisp_ecommerce_hang_timeout_queue" + namespace_name = "${local.project}-servicebus-wisp" + + depends_on = [azurerm_servicebus_queue.service_bus_wisp_queue] +} + data "azurerm_servicebus_queue_authorization_rule" "wisp_paainviart_authorization" { name = "wisp_converter_paainviart" resource_group_name = local.sb_resource_group_name @@ -204,6 +213,16 @@ resource "azurerm_key_vault_secret" "wisp_payment_timeout_key" { key_vault_id = data.azurerm_key_vault.key_vault.id } +resource "azurerm_key_vault_secret" "ecommerce_hang_timeout_key" { + count = var.create_wisp_converter ? 1 : 0 + + name = "ecommerce-hang-timer-queue-connection-string" + value = data.azurerm_servicebus_queue_authorization_rule.nodo_wisp_ecommerce_hang_timeout_queue.primary_connection_string + content_type = "text/plain" + + key_vault_id = data.azurerm_key_vault.key_vault.id +} + resource "azurerm_key_vault_secret" "wisp_paainviart_key" { count = var.create_wisp_converter ? 1 : 0 diff --git a/src/domains/nodo-common/06_service_bus_wisp_converter.tf b/src/domains/nodo-common/06_service_bus_wisp_converter.tf index ec0a10768..e6f0f628a 100644 --- a/src/domains/nodo-common/06_service_bus_wisp_converter.tf +++ b/src/domains/nodo-common/06_service_bus_wisp_converter.tf @@ -3,9 +3,10 @@ locals { queues = { for q in var.service_bus_wisp_queues : q.name => q } # List of queue names - queue_names = keys(local.queues) + queue_names = [ for q in var.service_bus_wisp_queues: q.name] + # List of queue values - queue_values = values(local.queues) + queue_values = [ for q in var.service_bus_wisp_queues: q ] # Map of
enable_apim_switch = bool # enable WISP dismantling
brokerPSP_whitelist = string
channel_whitelist = string
station_whitelist = string
ci_whitelist = string
nodoinviarpt_paymenttype_whitelist = string
dismantling_primitives = string
})