Skip to content

Commit

Permalink
Merge branch 'main' into PAGOPA-2425
Browse files Browse the repository at this point in the history
  • Loading branch information
andrea-deri authored Nov 29, 2024
2 parents 3b9fa16 + 4f303eb commit 5f385e3
Show file tree
Hide file tree
Showing 97 changed files with 109 additions and 72 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<policies>
<inbound>
<!-- Check google reCAPTCHA token validity START -->
<set-variable name="recaptchaSecret" value="{{google-recaptcha-secret}}" />
<set-variable name="recaptchaSecret" value="{{ecommerce-for-checkout-google-recaptcha-secret}}" />
<set-variable name="recaptchaToken" value="@(context.Request.OriginalUrl.Query.GetValueOrDefault("recaptchaResponse"))" />
<choose>
<when condition="@(context.Variables["recaptchaToken"] == null || context.Variables["recaptchaToken"] == "")">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<policies>
<inbound>
<!-- Check google reCAPTCHA token validity START -->
<set-variable name="recaptchaSecret" value="{{google-recaptcha-secret}}" />
<set-variable name="recaptchaSecret" value="{{ecommerce-for-checkout-google-recaptcha-secret}}" />
<set-variable name="recaptchaToken" value="@(context.Request.OriginalUrl.Query.GetValueOrDefault("recaptchaResponse"))" />
<choose>
<when condition="@(context.Variables["recaptchaToken"] == null || context.Variables["recaptchaToken"] == "")">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<inbound>
<base />
<!-- Check google reCAPTCHA token validity START -->
<set-variable name="recaptchaSecret" value="{{google-recaptcha-secret}}" />
<set-variable name="recaptchaSecret" value="{{ecommerce-for-checkout-google-recaptcha-secret}}" />
<set-variable name="recaptchaToken" value="@(context.Request.OriginalUrl.Query.GetValueOrDefault("recaptchaResponse"))" />
<choose>
<when condition="@(context.Variables["recaptchaToken"] == null || context.Variables["recaptchaToken"] == "")">
Expand Down
2 changes: 1 addition & 1 deletion src/domains/pay-wallet-common/env/itn-dev/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ cosmos_mongo_db_params = {
is_virtual_network_filter_enabled = false
enable_provisioned_throughput_exceeded_alert = false
backup_continuous_enabled = false
ip_range_filter = "104.42.195.92,40.76.54.131,52.176.6.30,52.169.50.45,52.187.184.26,13.88.56.148,40.91.218.243,13.91.105.215,4.210.172.107,40.80.152.199,13.95.130.121,20.245.81.54,40.118.23.126"
ip_range_filter = null
}

cosmos_mongo_db_pay_wallet_params = {
Expand Down
49 changes: 0 additions & 49 deletions src/domains/paymentoptions-app/05_aks_middleware_tools.tf

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions src/domains/paymentoptions-secrets/secret/itn-dev/secret.ini

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions src/domains/paymentoptions-secrets/secret/itn-prod/secret.ini

This file was deleted.

This file was deleted.

3 changes: 0 additions & 3 deletions src/domains/paymentoptions-secrets/secret/itn-uat/secret.ini

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
49 changes: 49 additions & 0 deletions src/domains/payopt-app/05_aks_middleware_tools.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# module "tls_checker" {
# source = "./.terraform/modules/__v3__/tls_checker"

# https_endpoint = local.domain_hostname
# alert_name = local.domain_hostname
# alert_enabled = true
# helm_chart_present = true
# namespace = kubernetes_namespace.namespace.metadata[0].name
# location_string = var.location_string
# kv_secret_name_for_application_insights_connection_string = "app-insight-connection-string"
# application_insights_resource_group = data.azurerm_resource_group.monitor_italy_rg.name
# application_insights_id = data.azurerm_application_insights.application_insights_italy.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
# }

# resource "helm_release" "cert_mounter" {
# name = "cert-mounter-blueprint"
# repository = "https://pagopa.github.io/aks-helm-cert-mounter-blueprint"
# chart = "cert-mounter-blueprint"
# version = "1.0.4"
# namespace = var.domain
# timeout = 120
# force_update = true

# values = [
# templatefile("${path.root}/helm/cert-mounter.yaml.tpl", {
# NAMESPACE = var.domain,
# DOMAIN = var.domain,
# CERTIFICATE_NAME = replace(local.domain_hostname, ".", "-"),
# ENV_SHORT = var.env_short,
# KV_NAME = data.azurerm_key_vault.kv.name
# })
# ]
# }

# resource "helm_release" "reloader" {
# name = "reloader"
# repository = "https://stakater.github.io/stakater-charts"
# chart = "reloader"
# version = "v1.0.69"
# namespace = kubernetes_namespace.namespace.metadata[0].name

# set {
# name = "reloader.watchGlobally"
# value = "false"
# }
# }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions src/domains/payopt-secrets/secret/itn-dev/configs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
22 changes: 22 additions & 0 deletions src/domains/payopt-secrets/secret/itn-dev/noedit_secret_enc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"sops": {
"kms": null,
"gcp_kms": null,
"azure_kv": [
{
"vault_url": "https://pagopa-d-itn-payopt-kv.vault.azure.net",
"name": "pagopa-d-payopt-sops-key",
"version": "3cfc1dcd61ee4a9bb4bff1fd4e5d45f1",
"created_at": "2024-11-28T14:36:24Z",
"enc": "vpf4sFWuobCrXfjbD0TXrg8Tv31mVZngHunMNN_tL_wMI38V11PI1yJtx9XiHiC1Mf84mlKCq8OeOwB9kMQacsngGuVtE1hTMBIGqd2mbmXoKKHXQfyoczXOMTgUGCtrpAHBvO86BX6ONbRIz9WFYnXBntDk6CkVDFYVTwiViO77nSo6LpxG_PG9cBS_Am_gdzDZxM1gMJx3OrIxuEIaQ_l9LuO35Wtx1DW8hrD95xSNEaRUOxZr9bzAHtZYvKEeWdj2AzZCxkL8ikMVB1fpi5qpOzpnEDl9HMylxExET7E6Nhbl8eUXNRJi00MCNC6HeOcPdYd8gPHYtHdefThmVg"
}
],
"hc_vault": null,
"age": null,
"lastmodified": "2024-11-28T14:36:26Z",
"mac": "ENC[AES256_GCM,data:hkNbqIGNsyia2OK0mRXYMD3sLz4Sgc8mLuUaVCVmuVw8XSFBjrVDK5Vn1Z77xh34a9PFhW7ovWndeAO0tCwWVrFoL3vO9UhHGhoihUGy81SbmawJruF4DR+f3BTrk1lEIE39nAUHbikS97GknfTH8aZbOFupAd+hCXFO1DkHZ5g=,iv:QZEf/HHOtth8xX5+d0/omA3LAzSlzFLO5tdz6B6ZJ9o=,tag:+FnEej6YVzQ5vFLd1MwbCA==,type:str]",
"pgp": null,
"unencrypted_suffix": "_unencrypted",
"version": "3.9.1"
}
}
3 changes: 3 additions & 0 deletions src/domains/payopt-secrets/secret/itn-dev/secret.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
file_crypted="noedit_secret_enc.json"
kv_name="pagopa-d-itn-payopt-kv"
kv_sops_key_name="pagopa-d-payopt-sops-key"
1 change: 1 addition & 0 deletions src/domains/payopt-secrets/secret/itn-prod/configs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
3 changes: 3 additions & 0 deletions src/domains/payopt-secrets/secret/itn-prod/secret.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
file_crypted="noedit_secret_enc.json"
kv_name="pagopa-p-itn-payopt-kv"
kv_sops_key_name="pagopa-p-payopt-sops-key"
1 change: 1 addition & 0 deletions src/domains/payopt-secrets/secret/itn-uat/configs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
22 changes: 22 additions & 0 deletions src/domains/payopt-secrets/secret/itn-uat/noedit_secret_enc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"sops": {
"kms": null,
"gcp_kms": null,
"azure_kv": [
{
"vault_url": "https://pagopa-u-itn-payopt-kv.vault.azure.net",
"name": "pagopa-u-payopt-sops-key",
"version": "391d59d66b2e4c118246648bf60dc813",
"created_at": "2024-11-28T14:41:50Z",
"enc": "dyWl_4p70QqcfQsqmIABzVxCWauyBDVZIg9WsqjoAfhNWbCbYvzXbjCiIJhOUJK_4H-EHDb70bnIG4HyIhNmEoNhQD69R9YDkQvJs146WOfBeUT4EO7xcXcM0wZEwjkeQq0PwkVRVvufColcIhlNKg0VMDCK6K2vRijAHAT4P9-gWrVukCnLYP2mlgXKmjX51CQVOV9S97LJEXzl4ki3mI8DGrGYX9qY9uZb6har_8MJaxAAAwcCkz5OYeAImDnz4f_t3ZcIpy4LeG1rubJCNnAxBLCXxL7lt4m-nwcclLQMd_a1U-DyyoOS03_2KwTYkhQI0YnXS9xancsdWXwK9g"
}
],
"hc_vault": null,
"age": null,
"lastmodified": "2024-11-28T14:41:51Z",
"mac": "ENC[AES256_GCM,data:Umg7BLjeiSk1FSp+ozRgtM/EAmf4SD0wvTJvlrNpmv7hi5g+rn1V2/OoyS7xxnQg4eqDNOJSs3mDfcdHfMffYs2mNxNl8H91SYYkgH85VZYHKShUVS4o5bKwAvyDPmB4qRJ/aAlFGUWMVobGUuBSDP1/GT0Md7Ic4qeYaaepN9k=,iv:ZfMS6ik70+Ctv+/wmy4gfWvrH1+5QIHkp1v+K6n0wbQ=,tag:bAW+DPq9SLrvjvSOXleczw==,type:str]",
"pgp": null,
"unencrypted_suffix": "_unencrypted",
"version": "3.9.1"
}
}
3 changes: 3 additions & 0 deletions src/domains/payopt-secrets/secret/itn-uat/secret.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
file_crypted="noedit_secret_enc.json"
kv_name="pagopa-u-itn-payopt-kv"
kv_sops_key_name="pagopa-u-payopt-sops-key"
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 5f385e3

Please sign in to comment.