From 7ab7aad7edb80b9f241c325b729ad8a0156b619d Mon Sep 17 00:00:00 2001 From: Gianluca Ciuffa Date: Tue, 10 Dec 2024 17:44:50 +0100 Subject: [PATCH 1/5] set ecommerce ingress hostname --- .../v2/wisp-sendpaymentresult.xml.tpl | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl b/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl index e63cdbc079..4d75520df5 100644 --- a/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl +++ b/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl @@ -21,10 +21,9 @@ - - + @@ -52,26 +51,6 @@ - - - - - - - - - - - @($"https://{(string)context.Variables["ecommerce_url"]}/pagopa-ecommerce-transactions-service/transactions/{(string)context.Variables["transactionId"]}/user-receipts") - POST - - application/json - - @($"{(string)context.Variables["body_value"]}") - - - - From 4e2a6bfd79faf8e6e00084e6f04401b776c2a99b Mon Sep 17 00:00:00 2001 From: Gianluca Ciuffa Date: Tue, 10 Dec 2024 17:49:25 +0100 Subject: [PATCH 2/5] send payhment result update --- .../pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl b/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl index 4d75520df5..496900561b 100644 --- a/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl +++ b/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl @@ -23,8 +23,14 @@ - - + + @($"https://{(string)context.Variables["ecommerce_url"]}/pagopa-ecommerce-transactions-service/transactions/{(string)context.Variables["transactionId"]}/user-receipts") + POST + + application/json + + @($"{(string)context.Variables["body_value"]}") + @@ -51,6 +57,7 @@ + From 3537d1836d245e23bcae1c3e2a378722371b44c4 Mon Sep 17 00:00:00 2001 From: Gianluca Ciuffa Date: Thu, 12 Dec 2024 09:50:41 +0100 Subject: [PATCH 3/5] fix send payment result policy --- .../pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl b/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl index 496900561b..960d2be93e 100644 --- a/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl +++ b/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl @@ -21,16 +21,8 @@ - - - @($"https://{(string)context.Variables["ecommerce_url"]}/pagopa-ecommerce-transactions-service/transactions/{(string)context.Variables["transactionId"]}/user-receipts") - POST - - application/json - - @($"{(string)context.Variables["body_value"]}") - + @@ -57,7 +49,6 @@ - From 26f55bbe8130465f58c79a49359e0e9ac5e020f8 Mon Sep 17 00:00:00 2001 From: Gianluca Ciuffa Date: Thu, 12 Dec 2024 11:03:23 +0100 Subject: [PATCH 4/5] fix backend service url --- .../pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl b/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl index 960d2be93e..900182adbf 100644 --- a/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl +++ b/src/core/api/payment_manager_api/pm-per-nodo/v2/wisp-sendpaymentresult.xml.tpl @@ -22,7 +22,7 @@ - + From 31e6bf1d2e30c64de9332ad24f03b61ebc7a7d47 Mon Sep 17 00:00:00 2001 From: Gianluca Ciuffa Date: Thu, 12 Dec 2024 11:16:31 +0100 Subject: [PATCH 5/5] update core readme --- src/core/README.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/core/README.md b/src/core/README.md index a147efe0ad..e98b40e3aa 100644 --- a/src/core/README.md +++ b/src/core/README.md @@ -1,7 +1,6 @@ - -| [vnet\_name](#output\_vnet\_name) | n/a | + ## Requirements | Name | Version | @@ -322,7 +321,7 @@ | [apim\_logger\_resource\_id](#input\_apim\_logger\_resource\_id) | Resource id for the APIM logger | `string` | `null` | no | | [apim\_nodo\_auth\_decoupler\_enable](#input\_apim\_nodo\_auth\_decoupler\_enable) | Apply decoupler to nodo-auth product apim policy | `bool` | `false` | no | | [apim\_nodo\_decoupler\_enable](#input\_apim\_nodo\_decoupler\_enable) | Apply decoupler to nodo product apim policy | `bool` | `false` | no | -| [app\_gateway\_allowed\_paths\_pagopa\_onprem\_only](#input\_app\_gateway\_allowed\_paths\_pagopa\_onprem\_only) | Allowed paths from pagopa onprem only | 
object({
    paths = list(string)
    ips   = list(string)
  })
| n/a | yes | +| [app\_gateway\_allowed\_paths\_pagopa\_onprem\_only](#input\_app\_gateway\_allowed\_paths\_pagopa\_onprem\_only) | Allowed paths from pagopa onprem only | 
object({
    paths = list(string)
    ips   = list(string)
  })
| n/a | yes | | [bpd\_hostname](#input\_bpd\_hostname) | BPD hostname | `string` | `""` | no | | [buyer\_banks\_storage\_account\_replication\_type](#input\_buyer\_banks\_storage\_account\_replication\_type) | (Optional) Buyer banks storage account replication type | `string` | `"LRS"` | no | | [buyerbanks\_advanced\_threat\_protection](#input\_buyerbanks\_advanced\_threat\_protection) | Enable contract threat advanced protection | `bool` | `false` | no | @@ -345,12 +344,12 @@ | [dns\_zone\_prefix](#input\_dns\_zone\_prefix) | The dns subdomain. | `string` | `null` | no | | [dns\_zone\_prefix\_prf](#input\_dns\_zone\_prefix\_prf) | The dns subdomain. | `string` | `""` | no | | [ecommerce\_ingress\_hostname](#input\_ecommerce\_ingress\_hostname) | ecommerce ingress hostname | `string` | `null` | no | -| [enabled\_features](#input\_enabled\_features) | Features enabled in this domain | 
object({
    vnet_ita          = bool
    node_forwarder_ha = optional(bool, false)
  })
| 
{
  "vnet_ita": false
}
| no | +| [enabled\_features](#input\_enabled\_features) | Features enabled in this domain | 
object({
    vnet_ita          = bool
    node_forwarder_ha = optional(bool, false)
  })
| 
{
  "vnet_ita": false
}
| no | | [env](#input\_env) | Contains env description in extend format (dev,uat,prod) | `string` | n/a | yes | | [env\_short](#input\_env\_short) | Environment shot version | `string` | n/a | yes | | [external\_domain](#input\_external\_domain) | Domain for delegation | `string` | `null` | no | | [fesp\_hostname](#input\_fesp\_hostname) | Fesp hostname | `string` | `""` | no | -| [function\_app\_storage\_account\_info](#input\_function\_app\_storage\_account\_info) | n/a | 
object({
    account_kind                      = optional(string, "StorageV2")
    account_tier                      = optional(string, "Standard")
    account_replication_type          = optional(string, "LRS")
    access_tier                       = optional(string, "Hot")
    advanced_threat_protection_enable = optional(bool, true)
  })
| 
{
  "access_tier": "Hot",
  "account_kind": "StorageV2",
  "account_replication_type": "LRS",
  "account_tier": "Standard",
  "advanced_threat_protection_enable": true
}
| no | +| [function\_app\_storage\_account\_info](#input\_function\_app\_storage\_account\_info) | n/a | 
object({
    account_kind                      = optional(string, "StorageV2")
    account_tier                      = optional(string, "Standard")
    account_replication_type          = optional(string, "LRS")
    access_tier                       = optional(string, "Hot")
    advanced_threat_protection_enable = optional(bool, true)
  })
| 
{
  "access_tier": "Hot",
  "account_kind": "StorageV2",
  "account_replication_type": "LRS",
  "account_tier": "Standard",
  "advanced_threat_protection_enable": true
}
| no | | [io\_bpd\_hostname](#input\_io\_bpd\_hostname) | IO BPD hostname | `string` | `""` | no | | [location](#input\_location) | Main location | `string` | `"westeurope"` | no | | [location\_ita](#input\_location\_ita) | Main location | `string` | `"italynorth"` | no | @@ -364,7 +363,7 @@ | [postgres\_private\_endpoint\_enabled](#input\_postgres\_private\_endpoint\_enabled) | Private endpoint database enable? | `bool` | `false` | no | | [prefix](#input\_prefix) | n/a | `string` | `"pagopa"` | no | | [satispay\_hostname](#input\_satispay\_hostname) | Satispay hostname | `string` | `""` | no | -| [tags](#input\_tags) | n/a | `map(any)` | 
{
  "CreatedBy": "Terraform"
}
| no | +| [tags](#input\_tags) | n/a | `map(any)` | 
{
  "CreatedBy": "Terraform"
}
| no | | [xpay\_hostname](#input\_xpay\_hostname) | Nexi xpay hostname | `string` | `""` | no | ## Outputs @@ -377,4 +376,4 @@ | [vnet\_integration\_address\_space](#output\_vnet\_integration\_address\_space) | n/a | | [vnet\_integration\_name](#output\_vnet\_integration\_name) | n/a | | [vnet\_name](#output\_vnet\_name) | n/a | - +