From 329382edb87051a2854ec1ab64ee1d851cc68b10 Mon Sep 17 00:00:00 2001 From: Pietro Tota <115724836+pietro-tota@users.noreply.github.com> Date: Thu, 28 Nov 2024 15:59:27 +0100 Subject: [PATCH 1/4] chore(pay-wallet-common): enable public access to cosmos DB for dev env (#2618) --- src/domains/pay-wallet-common/env/itn-dev/terraform.tfvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/domains/pay-wallet-common/env/itn-dev/terraform.tfvars b/src/domains/pay-wallet-common/env/itn-dev/terraform.tfvars index 6d966c7f63..90add576be 100644 --- a/src/domains/pay-wallet-common/env/itn-dev/terraform.tfvars +++ b/src/domains/pay-wallet-common/env/itn-dev/terraform.tfvars @@ -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 = { From e90eea9b8d8c9b2450f5744953867b3c4c4622f4 Mon Sep 17 00:00:00 2001 From: Simone infante <52280205+infantesimone@users.noreply.github.com> Date: Thu, 28 Nov 2024 17:20:43 +0100 Subject: [PATCH 2/4] feat: upgrade recaptcha token named value (#2607) --- .../api/ecommerce-checkout/v1/_payment_request_policy.xml.tpl | 2 +- .../api/ecommerce-checkout/v1/_transaction_policy.xml.tpl | 2 +- .../api/ecommerce-checkout/v2/_transaction_policy.xml.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/domains/ecommerce-app/api/ecommerce-checkout/v1/_payment_request_policy.xml.tpl b/src/domains/ecommerce-app/api/ecommerce-checkout/v1/_payment_request_policy.xml.tpl index a00ceef3f6..20f6fa6cad 100644 --- a/src/domains/ecommerce-app/api/ecommerce-checkout/v1/_payment_request_policy.xml.tpl +++ b/src/domains/ecommerce-app/api/ecommerce-checkout/v1/_payment_request_policy.xml.tpl @@ -1,7 +1,7 @@ - + diff --git a/src/domains/ecommerce-app/api/ecommerce-checkout/v1/_transaction_policy.xml.tpl b/src/domains/ecommerce-app/api/ecommerce-checkout/v1/_transaction_policy.xml.tpl index 0f949c30a4..a4fd8a9e85 100644 --- a/src/domains/ecommerce-app/api/ecommerce-checkout/v1/_transaction_policy.xml.tpl +++ b/src/domains/ecommerce-app/api/ecommerce-checkout/v1/_transaction_policy.xml.tpl @@ -1,7 +1,7 @@ - + diff --git a/src/domains/ecommerce-app/api/ecommerce-checkout/v2/_transaction_policy.xml.tpl b/src/domains/ecommerce-app/api/ecommerce-checkout/v2/_transaction_policy.xml.tpl index e747d56f7b..f381de268b 100644 --- a/src/domains/ecommerce-app/api/ecommerce-checkout/v2/_transaction_policy.xml.tpl +++ b/src/domains/ecommerce-app/api/ecommerce-checkout/v2/_transaction_policy.xml.tpl @@ -2,7 +2,7 @@ - + From aa5646b6d48d57ae9c7f8b54f1ad95fd75ce8d4c Mon Sep 17 00:00:00 2001 From: Pasquale Spica <36746022+pasqualespica@users.noreply.github.com> Date: Thu, 28 Nov 2024 17:24:46 +0100 Subject: [PATCH 3/4] chore: Fix payopt domain (#2620) fix payopt domain --- .../.terraform.lock.hcl | 5 ----- .../secret/itn-dev/configs.json | 2 +- .../secret/itn-dev/noedit_secret_enc.json | 22 +++++++++++++++++++ .../secret/itn-dev/secret.ini | 4 ++-- .../secret/itn-prod/configs.json | 3 +-- .../secret/itn-prod/secret.ini | 4 ++-- .../secret/itn-uat/configs.json | 3 +-- .../secret/itn-uat/noedit_secret_enc.json | 22 +++++++++++++++++++ .../secret/itn-uat/secret.ini | 4 ++-- 9 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 src/domains/paymentoptions-secrets/secret/itn-dev/noedit_secret_enc.json create mode 100644 src/domains/paymentoptions-secrets/secret/itn-uat/noedit_secret_enc.json diff --git a/src/domains/paymentoptions-secrets/.terraform.lock.hcl b/src/domains/paymentoptions-secrets/.terraform.lock.hcl index a389468af5..e6e5cedf47 100644 --- a/src/domains/paymentoptions-secrets/.terraform.lock.hcl +++ b/src/domains/paymentoptions-secrets/.terraform.lock.hcl @@ -6,7 +6,6 @@ provider "registry.terraform.io/hashicorp/azuread" { constraints = "<= 2.47.0" hashes = [ "h1:g8+gBFM4QVOEQFqAEs5pR6iXpbGvgPvcEi1evHwziyw=", - "h1:iRwDQBdXBpVBoYwM9au2RG01RQuJSm3TGQ2kioFVAas=", "zh:1372d81eb24ef3b4b00ea350fe87219f22da51691b8e42ce91d662f6c2a8af5e", "zh:1c3e89cf19118fc07d7b04257251fc9897e722c16e0a0df7b07fcd261f8c12e7", "zh:1e654a74d171d6ff8f9f6f67e3ff1421d4c5e56a18607703626bf12cd23ba001", @@ -27,7 +26,6 @@ provider "registry.terraform.io/hashicorp/azurerm" { constraints = "~> 3.30, <= 3.106.0" hashes = [ "h1:6t9Nz9tYAR9BfHZ8yc56m+GKRl0nriwjQ5DyA0/TnCs=", - "h1:Mxe1/I27IZK3BP6cm84Gt0+7PXd2EDaDUMxuljm/rUA=", "zh:07980d6fdc40c0adb670c8413a5c667917d6dbb51fcedc467c35d64c2f3a1f47", "zh:2e6e8491b1f089644b0d23f8da83398f1e10cf5a62b16efcef2b5454fe923038", "zh:450dbd72821c5619cc3bcdc20fdd0e29515147e44b733f9c79d3a75851810055", @@ -48,7 +46,6 @@ provider "registry.terraform.io/hashicorp/external" { constraints = "<= 2.2.3" hashes = [ "h1:648ZjJR81c2W1OLtYmUQa9/1rGr3vvZSuX9dR1ucGWY=", - "h1:D2RKjqoU26isFINpmeKG9NS0LvkPmrQkNXeYO2TdgyA=", "zh:184ecd339d764de845db0e5b8a9c87893dcd0c9d822167f73658f89d80ec31c9", "zh:2661eaca31d17d6bbb18a8f673bbfe3fe1b9b7326e60d0ceb302017003274e3c", "zh:2c0a180f6d1fc2ba6e03f7dfc5f73b617e45408681f75bca75aa82f3796df0e4", @@ -68,7 +65,6 @@ provider "registry.terraform.io/hashicorp/kubernetes" { version = "2.16.1" constraints = "<= 2.16.1" hashes = [ - "h1:PO4Ye/+lu5hCaUEOtwNOldQYoA0dqL1bcBICIpdlcd8=", "h1:kO/d+ZMZYM2tNMMFHZqBmVR0MeemoGnI2G2NSN92CrU=", "zh:06224975f5910d41e73b35a4d5079861da2c24f9353e3ebb015fbb3b3b996b1c", "zh:2bc400a8d9fe7755cca27c2551564a9e2609cfadc77f526ef855114ee02d446f", @@ -89,7 +85,6 @@ provider "registry.terraform.io/hashicorp/null" { version = "3.2.1" constraints = "~> 3.2, <= 3.2.1" hashes = [ - "h1:tSj1mL6OQ8ILGqR2mDu7OYYYWf+hoir0pf9KAQ8IzO8=", "h1:ydA0/SNRVB1o95btfshvYsmxA+jZFRZcvKzZSB+4S1M=", "zh:58ed64389620cc7b82f01332e27723856422820cfd302e304b5f6c3436fb9840", "zh:62a5cc82c3b2ddef7ef3a6f2fedb7b9b3deff4ab7b414938b08e51d6e8be87cb", diff --git a/src/domains/paymentoptions-secrets/secret/itn-dev/configs.json b/src/domains/paymentoptions-secrets/secret/itn-dev/configs.json index 0967ef424b..9e26dfeeb6 100644 --- a/src/domains/paymentoptions-secrets/secret/itn-dev/configs.json +++ b/src/domains/paymentoptions-secrets/secret/itn-dev/configs.json @@ -1 +1 @@ -{} +{} \ No newline at end of file diff --git a/src/domains/paymentoptions-secrets/secret/itn-dev/noedit_secret_enc.json b/src/domains/paymentoptions-secrets/secret/itn-dev/noedit_secret_enc.json new file mode 100644 index 0000000000..6c3c1af837 --- /dev/null +++ b/src/domains/paymentoptions-secrets/secret/itn-dev/noedit_secret_enc.json @@ -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" + } +} \ No newline at end of file diff --git a/src/domains/paymentoptions-secrets/secret/itn-dev/secret.ini b/src/domains/paymentoptions-secrets/secret/itn-dev/secret.ini index 067019d64d..1cf65b61b0 100644 --- a/src/domains/paymentoptions-secrets/secret/itn-dev/secret.ini +++ b/src/domains/paymentoptions-secrets/secret/itn-dev/secret.ini @@ -1,3 +1,3 @@ file_crypted="noedit_secret_enc.json" -kv_name="pagopa-d-itn-paymentoptions-kv" -kv_sops_key_name="pagopa-d-paymentoptions-sops-key" +kv_name="pagopa-d-itn-payopt-kv" +kv_sops_key_name="pagopa-d-payopt-sops-key" diff --git a/src/domains/paymentoptions-secrets/secret/itn-prod/configs.json b/src/domains/paymentoptions-secrets/secret/itn-prod/configs.json index 2c63c08510..9e26dfeeb6 100644 --- a/src/domains/paymentoptions-secrets/secret/itn-prod/configs.json +++ b/src/domains/paymentoptions-secrets/secret/itn-prod/configs.json @@ -1,2 +1 @@ -{ -} +{} \ No newline at end of file diff --git a/src/domains/paymentoptions-secrets/secret/itn-prod/secret.ini b/src/domains/paymentoptions-secrets/secret/itn-prod/secret.ini index a83c6d693e..61a2254ac6 100644 --- a/src/domains/paymentoptions-secrets/secret/itn-prod/secret.ini +++ b/src/domains/paymentoptions-secrets/secret/itn-prod/secret.ini @@ -1,3 +1,3 @@ file_crypted="noedit_secret_enc.json" -kv_name="pagopa-p-itn-paymentoptions-kv" -kv_sops_key_name="pagopa-p-paymentoptions-sops-key" +kv_name="pagopa-p-itn-payopt-kv" +kv_sops_key_name="pagopa-p-payopt-sops-key" diff --git a/src/domains/paymentoptions-secrets/secret/itn-uat/configs.json b/src/domains/paymentoptions-secrets/secret/itn-uat/configs.json index 2c63c08510..9e26dfeeb6 100644 --- a/src/domains/paymentoptions-secrets/secret/itn-uat/configs.json +++ b/src/domains/paymentoptions-secrets/secret/itn-uat/configs.json @@ -1,2 +1 @@ -{ -} +{} \ No newline at end of file diff --git a/src/domains/paymentoptions-secrets/secret/itn-uat/noedit_secret_enc.json b/src/domains/paymentoptions-secrets/secret/itn-uat/noedit_secret_enc.json new file mode 100644 index 0000000000..878e035cff --- /dev/null +++ b/src/domains/paymentoptions-secrets/secret/itn-uat/noedit_secret_enc.json @@ -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" + } +} \ No newline at end of file diff --git a/src/domains/paymentoptions-secrets/secret/itn-uat/secret.ini b/src/domains/paymentoptions-secrets/secret/itn-uat/secret.ini index e5b5471c37..c16aa7f137 100644 --- a/src/domains/paymentoptions-secrets/secret/itn-uat/secret.ini +++ b/src/domains/paymentoptions-secrets/secret/itn-uat/secret.ini @@ -1,3 +1,3 @@ file_crypted="noedit_secret_enc.json" -kv_name="pagopa-u-itn-paymentoptions-kv" -kv_sops_key_name="pagopa-u-paymentoptions-sops-key" +kv_name="pagopa-u-itn-payopt-kv" +kv_sops_key_name="pagopa-u-payopt-sops-key" From 4f303ebc1fee4e119007f8e119bbd90612c8592b Mon Sep 17 00:00:00 2001 From: Pasquale Spica <36746022+pasqualespica@users.noreply.github.com> Date: Fri, 29 Nov 2024 08:29:39 +0100 Subject: [PATCH 4/4] chore: Rename domain payopt (#2621) rename domain payopt --- .../05_aks_middleware_tools.tf | 49 ------------------- .../.terraform.lock.hcl | 0 .../00_alerts.tf | 0 .../00_data.tf | 0 .../00_keyvault.tf | 0 .../00_monitor.tf | 0 .../00_network.tf | 0 .../01_network.tf | 0 .../02_namespace.tf | 0 .../03_serviceaccounts_azure_devops.tf | 0 .../04_apim_payment_options.tf | 0 .../04_apim_payment_options_mock.tf | 0 .../payopt-app/05_aks_middleware_tools.tf | 49 +++++++++++++++++++ .../05_subkey.tf | 0 .../06_keyvault.tf | 0 .../07_gh_runner.tf | 0 .../90_pdb.tf | 0 .../99_locals.tf | 0 .../99_main.tf | 0 .../99_variables.tf | 0 .../README.md | 0 .../api/payment-options-mock/_base_policy.xml | 0 .../_get_payment_options_policy.xml | 0 .../payment-options-mock/_openapi.json.tpl | 0 .../api_product/_base_policy.xml | 0 .../env/itn-dev/backend.ini | 0 .../env/itn-dev/backend.tfvars | 0 .../env/itn-dev/terraform.tfvars | 0 .../env/itn-prod/backend.ini | 0 .../env/itn-prod/backend.tfvars | 0 .../env/itn-prod/terraform.tfvars | 0 .../env/itn-uat/backend.ini | 0 .../env/itn-uat/backend.tfvars | 0 .../env/itn-uat/terraform.tfvars | 0 .../helm/cert-mounter.yaml.tpl | 0 .../terraform.sh | 0 .../.terraform.lock.hcl | 0 .../00_data.tf | 0 .../00_monitor.tf | 0 .../00_network.tf | 0 .../01_network.tf | 0 .../03_eventhub.tf | 0 .../10_github_identity.tf | 0 .../99_locals.tf | 0 .../99_main.tf | 0 .../99_variables.tf | 0 .../README.md | 0 .../env/itn-dev/backend.ini | 0 .../env/itn-dev/backend.tfvars | 0 .../env/itn-dev/terraform.tfvars | 0 .../env/itn-prod/backend.ini | 0 .../env/itn-prod/backend.tfvars | 0 .../env/itn-prod/terraform.tfvars | 0 .../env/itn-uat/backend.ini | 0 .../env/itn-uat/backend.tfvars | 0 .../env/itn-uat/terraform.tfvars | 0 .../terraform.sh | 0 .../.terraform.lock.hcl | 0 .../00_azuread.tf | 0 .../01_keyvault.tf | 0 .../02_azdo.tf | 0 .../02_init_sops.tf | 0 .../03_sops_secrets.tf | 0 .../99_locals.tf | 0 .../99_main.tf | 0 .../99_variables.tf | 0 .../README.md | 0 .../env/itn-dev/backend.ini | 0 .../env/itn-dev/backend.tfvars | 0 .../env/itn-dev/terraform.tfvars | 0 .../env/itn-prod/backend.ini | 0 .../env/itn-prod/backend.tfvars | 0 .../env/itn-prod/terraform.tfvars | 0 .../env/itn-uat/backend.ini | 0 .../env/itn-uat/backend.tfvars | 0 .../env/itn-uat/terraform.tfvars | 0 .../secret/itn-dev/configs.json | 0 .../secret/itn-dev/noedit_secret_enc.json | 0 .../secret/itn-dev/secret.ini | 0 .../secret/itn-prod/configs.json | 0 .../secret/itn-prod/secret.ini | 0 .../secret/itn-uat/configs.json | 0 .../secret/itn-uat/noedit_secret_enc.json | 0 .../secret/itn-uat/secret.ini | 0 .../sops.sh | 0 .../terraform.sh | 0 .../terrasops.sh | 0 87 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 src/domains/paymentoptions-app/05_aks_middleware_tools.tf rename src/domains/{paymentoptions-app => payopt-app}/.terraform.lock.hcl (100%) rename src/domains/{paymentoptions-app => payopt-app}/00_alerts.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/00_data.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/00_keyvault.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/00_monitor.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/00_network.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/01_network.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/02_namespace.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/03_serviceaccounts_azure_devops.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/04_apim_payment_options.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/04_apim_payment_options_mock.tf (100%) create mode 100644 src/domains/payopt-app/05_aks_middleware_tools.tf rename src/domains/{paymentoptions-app => payopt-app}/05_subkey.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/06_keyvault.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/07_gh_runner.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/90_pdb.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/99_locals.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/99_main.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/99_variables.tf (100%) rename src/domains/{paymentoptions-app => payopt-app}/README.md (100%) rename src/domains/{paymentoptions-app => payopt-app}/api/payment-options-mock/_base_policy.xml (100%) rename src/domains/{paymentoptions-app => payopt-app}/api/payment-options-mock/_get_payment_options_policy.xml (100%) rename src/domains/{paymentoptions-app => payopt-app}/api/payment-options-mock/_openapi.json.tpl (100%) rename src/domains/{paymentoptions-app => payopt-app}/api_product/_base_policy.xml (100%) rename src/domains/{paymentoptions-app => payopt-app}/env/itn-dev/backend.ini (100%) rename src/domains/{paymentoptions-app => payopt-app}/env/itn-dev/backend.tfvars (100%) rename src/domains/{paymentoptions-app => payopt-app}/env/itn-dev/terraform.tfvars (100%) rename src/domains/{paymentoptions-app => payopt-app}/env/itn-prod/backend.ini (100%) rename src/domains/{paymentoptions-app => payopt-app}/env/itn-prod/backend.tfvars (100%) rename src/domains/{paymentoptions-app => payopt-app}/env/itn-prod/terraform.tfvars (100%) rename src/domains/{paymentoptions-app => payopt-app}/env/itn-uat/backend.ini (100%) rename src/domains/{paymentoptions-app => payopt-app}/env/itn-uat/backend.tfvars (100%) rename src/domains/{paymentoptions-app => payopt-app}/env/itn-uat/terraform.tfvars (100%) rename src/domains/{paymentoptions-app => payopt-app}/helm/cert-mounter.yaml.tpl (100%) rename src/domains/{paymentoptions-app => payopt-app}/terraform.sh (100%) rename src/domains/{paymentoptions-common => payopt-common}/.terraform.lock.hcl (100%) rename src/domains/{paymentoptions-common => payopt-common}/00_data.tf (100%) rename src/domains/{paymentoptions-common => payopt-common}/00_monitor.tf (100%) rename src/domains/{paymentoptions-common => payopt-common}/00_network.tf (100%) rename src/domains/{paymentoptions-common => payopt-common}/01_network.tf (100%) rename src/domains/{paymentoptions-common => payopt-common}/03_eventhub.tf (100%) rename src/domains/{paymentoptions-common => payopt-common}/10_github_identity.tf (100%) rename src/domains/{paymentoptions-common => payopt-common}/99_locals.tf (100%) rename src/domains/{paymentoptions-common => payopt-common}/99_main.tf (100%) rename src/domains/{paymentoptions-common => payopt-common}/99_variables.tf (100%) rename src/domains/{paymentoptions-common => payopt-common}/README.md (100%) rename src/domains/{paymentoptions-common => payopt-common}/env/itn-dev/backend.ini (100%) rename src/domains/{paymentoptions-common => payopt-common}/env/itn-dev/backend.tfvars (100%) rename src/domains/{paymentoptions-common => payopt-common}/env/itn-dev/terraform.tfvars (100%) rename src/domains/{paymentoptions-common => payopt-common}/env/itn-prod/backend.ini (100%) rename src/domains/{paymentoptions-common => payopt-common}/env/itn-prod/backend.tfvars (100%) rename src/domains/{paymentoptions-common => payopt-common}/env/itn-prod/terraform.tfvars (100%) rename src/domains/{paymentoptions-common => payopt-common}/env/itn-uat/backend.ini (100%) rename src/domains/{paymentoptions-common => payopt-common}/env/itn-uat/backend.tfvars (100%) rename src/domains/{paymentoptions-common => payopt-common}/env/itn-uat/terraform.tfvars (100%) rename src/domains/{paymentoptions-common => payopt-common}/terraform.sh (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/.terraform.lock.hcl (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/00_azuread.tf (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/01_keyvault.tf (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/02_azdo.tf (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/02_init_sops.tf (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/03_sops_secrets.tf (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/99_locals.tf (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/99_main.tf (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/99_variables.tf (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/README.md (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/env/itn-dev/backend.ini (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/env/itn-dev/backend.tfvars (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/env/itn-dev/terraform.tfvars (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/env/itn-prod/backend.ini (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/env/itn-prod/backend.tfvars (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/env/itn-prod/terraform.tfvars (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/env/itn-uat/backend.ini (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/env/itn-uat/backend.tfvars (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/env/itn-uat/terraform.tfvars (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/secret/itn-dev/configs.json (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/secret/itn-dev/noedit_secret_enc.json (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/secret/itn-dev/secret.ini (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/secret/itn-prod/configs.json (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/secret/itn-prod/secret.ini (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/secret/itn-uat/configs.json (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/secret/itn-uat/noedit_secret_enc.json (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/secret/itn-uat/secret.ini (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/sops.sh (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/terraform.sh (100%) rename src/domains/{paymentoptions-secrets => payopt-secrets}/terrasops.sh (100%) diff --git a/src/domains/paymentoptions-app/05_aks_middleware_tools.tf b/src/domains/paymentoptions-app/05_aks_middleware_tools.tf deleted file mode 100644 index 83624cc77e..0000000000 --- a/src/domains/paymentoptions-app/05_aks_middleware_tools.tf +++ /dev/null @@ -1,49 +0,0 @@ -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" - } -} diff --git a/src/domains/paymentoptions-app/.terraform.lock.hcl b/src/domains/payopt-app/.terraform.lock.hcl similarity index 100% rename from src/domains/paymentoptions-app/.terraform.lock.hcl rename to src/domains/payopt-app/.terraform.lock.hcl diff --git a/src/domains/paymentoptions-app/00_alerts.tf b/src/domains/payopt-app/00_alerts.tf similarity index 100% rename from src/domains/paymentoptions-app/00_alerts.tf rename to src/domains/payopt-app/00_alerts.tf diff --git a/src/domains/paymentoptions-app/00_data.tf b/src/domains/payopt-app/00_data.tf similarity index 100% rename from src/domains/paymentoptions-app/00_data.tf rename to src/domains/payopt-app/00_data.tf diff --git a/src/domains/paymentoptions-app/00_keyvault.tf b/src/domains/payopt-app/00_keyvault.tf similarity index 100% rename from src/domains/paymentoptions-app/00_keyvault.tf rename to src/domains/payopt-app/00_keyvault.tf diff --git a/src/domains/paymentoptions-app/00_monitor.tf b/src/domains/payopt-app/00_monitor.tf similarity index 100% rename from src/domains/paymentoptions-app/00_monitor.tf rename to src/domains/payopt-app/00_monitor.tf diff --git a/src/domains/paymentoptions-app/00_network.tf b/src/domains/payopt-app/00_network.tf similarity index 100% rename from src/domains/paymentoptions-app/00_network.tf rename to src/domains/payopt-app/00_network.tf diff --git a/src/domains/paymentoptions-app/01_network.tf b/src/domains/payopt-app/01_network.tf similarity index 100% rename from src/domains/paymentoptions-app/01_network.tf rename to src/domains/payopt-app/01_network.tf diff --git a/src/domains/paymentoptions-app/02_namespace.tf b/src/domains/payopt-app/02_namespace.tf similarity index 100% rename from src/domains/paymentoptions-app/02_namespace.tf rename to src/domains/payopt-app/02_namespace.tf diff --git a/src/domains/paymentoptions-app/03_serviceaccounts_azure_devops.tf b/src/domains/payopt-app/03_serviceaccounts_azure_devops.tf similarity index 100% rename from src/domains/paymentoptions-app/03_serviceaccounts_azure_devops.tf rename to src/domains/payopt-app/03_serviceaccounts_azure_devops.tf diff --git a/src/domains/paymentoptions-app/04_apim_payment_options.tf b/src/domains/payopt-app/04_apim_payment_options.tf similarity index 100% rename from src/domains/paymentoptions-app/04_apim_payment_options.tf rename to src/domains/payopt-app/04_apim_payment_options.tf diff --git a/src/domains/paymentoptions-app/04_apim_payment_options_mock.tf b/src/domains/payopt-app/04_apim_payment_options_mock.tf similarity index 100% rename from src/domains/paymentoptions-app/04_apim_payment_options_mock.tf rename to src/domains/payopt-app/04_apim_payment_options_mock.tf diff --git a/src/domains/payopt-app/05_aks_middleware_tools.tf b/src/domains/payopt-app/05_aks_middleware_tools.tf new file mode 100644 index 0000000000..1caf12b260 --- /dev/null +++ b/src/domains/payopt-app/05_aks_middleware_tools.tf @@ -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" +# } +# } diff --git a/src/domains/paymentoptions-app/05_subkey.tf b/src/domains/payopt-app/05_subkey.tf similarity index 100% rename from src/domains/paymentoptions-app/05_subkey.tf rename to src/domains/payopt-app/05_subkey.tf diff --git a/src/domains/paymentoptions-app/06_keyvault.tf b/src/domains/payopt-app/06_keyvault.tf similarity index 100% rename from src/domains/paymentoptions-app/06_keyvault.tf rename to src/domains/payopt-app/06_keyvault.tf diff --git a/src/domains/paymentoptions-app/07_gh_runner.tf b/src/domains/payopt-app/07_gh_runner.tf similarity index 100% rename from src/domains/paymentoptions-app/07_gh_runner.tf rename to src/domains/payopt-app/07_gh_runner.tf diff --git a/src/domains/paymentoptions-app/90_pdb.tf b/src/domains/payopt-app/90_pdb.tf similarity index 100% rename from src/domains/paymentoptions-app/90_pdb.tf rename to src/domains/payopt-app/90_pdb.tf diff --git a/src/domains/paymentoptions-app/99_locals.tf b/src/domains/payopt-app/99_locals.tf similarity index 100% rename from src/domains/paymentoptions-app/99_locals.tf rename to src/domains/payopt-app/99_locals.tf diff --git a/src/domains/paymentoptions-app/99_main.tf b/src/domains/payopt-app/99_main.tf similarity index 100% rename from src/domains/paymentoptions-app/99_main.tf rename to src/domains/payopt-app/99_main.tf diff --git a/src/domains/paymentoptions-app/99_variables.tf b/src/domains/payopt-app/99_variables.tf similarity index 100% rename from src/domains/paymentoptions-app/99_variables.tf rename to src/domains/payopt-app/99_variables.tf diff --git a/src/domains/paymentoptions-app/README.md b/src/domains/payopt-app/README.md similarity index 100% rename from src/domains/paymentoptions-app/README.md rename to src/domains/payopt-app/README.md diff --git a/src/domains/paymentoptions-app/api/payment-options-mock/_base_policy.xml b/src/domains/payopt-app/api/payment-options-mock/_base_policy.xml similarity index 100% rename from src/domains/paymentoptions-app/api/payment-options-mock/_base_policy.xml rename to src/domains/payopt-app/api/payment-options-mock/_base_policy.xml diff --git a/src/domains/paymentoptions-app/api/payment-options-mock/_get_payment_options_policy.xml b/src/domains/payopt-app/api/payment-options-mock/_get_payment_options_policy.xml similarity index 100% rename from src/domains/paymentoptions-app/api/payment-options-mock/_get_payment_options_policy.xml rename to src/domains/payopt-app/api/payment-options-mock/_get_payment_options_policy.xml diff --git a/src/domains/paymentoptions-app/api/payment-options-mock/_openapi.json.tpl b/src/domains/payopt-app/api/payment-options-mock/_openapi.json.tpl similarity index 100% rename from src/domains/paymentoptions-app/api/payment-options-mock/_openapi.json.tpl rename to src/domains/payopt-app/api/payment-options-mock/_openapi.json.tpl diff --git a/src/domains/paymentoptions-app/api_product/_base_policy.xml b/src/domains/payopt-app/api_product/_base_policy.xml similarity index 100% rename from src/domains/paymentoptions-app/api_product/_base_policy.xml rename to src/domains/payopt-app/api_product/_base_policy.xml diff --git a/src/domains/paymentoptions-app/env/itn-dev/backend.ini b/src/domains/payopt-app/env/itn-dev/backend.ini similarity index 100% rename from src/domains/paymentoptions-app/env/itn-dev/backend.ini rename to src/domains/payopt-app/env/itn-dev/backend.ini diff --git a/src/domains/paymentoptions-app/env/itn-dev/backend.tfvars b/src/domains/payopt-app/env/itn-dev/backend.tfvars similarity index 100% rename from src/domains/paymentoptions-app/env/itn-dev/backend.tfvars rename to src/domains/payopt-app/env/itn-dev/backend.tfvars diff --git a/src/domains/paymentoptions-app/env/itn-dev/terraform.tfvars b/src/domains/payopt-app/env/itn-dev/terraform.tfvars similarity index 100% rename from src/domains/paymentoptions-app/env/itn-dev/terraform.tfvars rename to src/domains/payopt-app/env/itn-dev/terraform.tfvars diff --git a/src/domains/paymentoptions-app/env/itn-prod/backend.ini b/src/domains/payopt-app/env/itn-prod/backend.ini similarity index 100% rename from src/domains/paymentoptions-app/env/itn-prod/backend.ini rename to src/domains/payopt-app/env/itn-prod/backend.ini diff --git a/src/domains/paymentoptions-app/env/itn-prod/backend.tfvars b/src/domains/payopt-app/env/itn-prod/backend.tfvars similarity index 100% rename from src/domains/paymentoptions-app/env/itn-prod/backend.tfvars rename to src/domains/payopt-app/env/itn-prod/backend.tfvars diff --git a/src/domains/paymentoptions-app/env/itn-prod/terraform.tfvars b/src/domains/payopt-app/env/itn-prod/terraform.tfvars similarity index 100% rename from src/domains/paymentoptions-app/env/itn-prod/terraform.tfvars rename to src/domains/payopt-app/env/itn-prod/terraform.tfvars diff --git a/src/domains/paymentoptions-app/env/itn-uat/backend.ini b/src/domains/payopt-app/env/itn-uat/backend.ini similarity index 100% rename from src/domains/paymentoptions-app/env/itn-uat/backend.ini rename to src/domains/payopt-app/env/itn-uat/backend.ini diff --git a/src/domains/paymentoptions-app/env/itn-uat/backend.tfvars b/src/domains/payopt-app/env/itn-uat/backend.tfvars similarity index 100% rename from src/domains/paymentoptions-app/env/itn-uat/backend.tfvars rename to src/domains/payopt-app/env/itn-uat/backend.tfvars diff --git a/src/domains/paymentoptions-app/env/itn-uat/terraform.tfvars b/src/domains/payopt-app/env/itn-uat/terraform.tfvars similarity index 100% rename from src/domains/paymentoptions-app/env/itn-uat/terraform.tfvars rename to src/domains/payopt-app/env/itn-uat/terraform.tfvars diff --git a/src/domains/paymentoptions-app/helm/cert-mounter.yaml.tpl b/src/domains/payopt-app/helm/cert-mounter.yaml.tpl similarity index 100% rename from src/domains/paymentoptions-app/helm/cert-mounter.yaml.tpl rename to src/domains/payopt-app/helm/cert-mounter.yaml.tpl diff --git a/src/domains/paymentoptions-app/terraform.sh b/src/domains/payopt-app/terraform.sh similarity index 100% rename from src/domains/paymentoptions-app/terraform.sh rename to src/domains/payopt-app/terraform.sh diff --git a/src/domains/paymentoptions-common/.terraform.lock.hcl b/src/domains/payopt-common/.terraform.lock.hcl similarity index 100% rename from src/domains/paymentoptions-common/.terraform.lock.hcl rename to src/domains/payopt-common/.terraform.lock.hcl diff --git a/src/domains/paymentoptions-common/00_data.tf b/src/domains/payopt-common/00_data.tf similarity index 100% rename from src/domains/paymentoptions-common/00_data.tf rename to src/domains/payopt-common/00_data.tf diff --git a/src/domains/paymentoptions-common/00_monitor.tf b/src/domains/payopt-common/00_monitor.tf similarity index 100% rename from src/domains/paymentoptions-common/00_monitor.tf rename to src/domains/payopt-common/00_monitor.tf diff --git a/src/domains/paymentoptions-common/00_network.tf b/src/domains/payopt-common/00_network.tf similarity index 100% rename from src/domains/paymentoptions-common/00_network.tf rename to src/domains/payopt-common/00_network.tf diff --git a/src/domains/paymentoptions-common/01_network.tf b/src/domains/payopt-common/01_network.tf similarity index 100% rename from src/domains/paymentoptions-common/01_network.tf rename to src/domains/payopt-common/01_network.tf diff --git a/src/domains/paymentoptions-common/03_eventhub.tf b/src/domains/payopt-common/03_eventhub.tf similarity index 100% rename from src/domains/paymentoptions-common/03_eventhub.tf rename to src/domains/payopt-common/03_eventhub.tf diff --git a/src/domains/paymentoptions-common/10_github_identity.tf b/src/domains/payopt-common/10_github_identity.tf similarity index 100% rename from src/domains/paymentoptions-common/10_github_identity.tf rename to src/domains/payopt-common/10_github_identity.tf diff --git a/src/domains/paymentoptions-common/99_locals.tf b/src/domains/payopt-common/99_locals.tf similarity index 100% rename from src/domains/paymentoptions-common/99_locals.tf rename to src/domains/payopt-common/99_locals.tf diff --git a/src/domains/paymentoptions-common/99_main.tf b/src/domains/payopt-common/99_main.tf similarity index 100% rename from src/domains/paymentoptions-common/99_main.tf rename to src/domains/payopt-common/99_main.tf diff --git a/src/domains/paymentoptions-common/99_variables.tf b/src/domains/payopt-common/99_variables.tf similarity index 100% rename from src/domains/paymentoptions-common/99_variables.tf rename to src/domains/payopt-common/99_variables.tf diff --git a/src/domains/paymentoptions-common/README.md b/src/domains/payopt-common/README.md similarity index 100% rename from src/domains/paymentoptions-common/README.md rename to src/domains/payopt-common/README.md diff --git a/src/domains/paymentoptions-common/env/itn-dev/backend.ini b/src/domains/payopt-common/env/itn-dev/backend.ini similarity index 100% rename from src/domains/paymentoptions-common/env/itn-dev/backend.ini rename to src/domains/payopt-common/env/itn-dev/backend.ini diff --git a/src/domains/paymentoptions-common/env/itn-dev/backend.tfvars b/src/domains/payopt-common/env/itn-dev/backend.tfvars similarity index 100% rename from src/domains/paymentoptions-common/env/itn-dev/backend.tfvars rename to src/domains/payopt-common/env/itn-dev/backend.tfvars diff --git a/src/domains/paymentoptions-common/env/itn-dev/terraform.tfvars b/src/domains/payopt-common/env/itn-dev/terraform.tfvars similarity index 100% rename from src/domains/paymentoptions-common/env/itn-dev/terraform.tfvars rename to src/domains/payopt-common/env/itn-dev/terraform.tfvars diff --git a/src/domains/paymentoptions-common/env/itn-prod/backend.ini b/src/domains/payopt-common/env/itn-prod/backend.ini similarity index 100% rename from src/domains/paymentoptions-common/env/itn-prod/backend.ini rename to src/domains/payopt-common/env/itn-prod/backend.ini diff --git a/src/domains/paymentoptions-common/env/itn-prod/backend.tfvars b/src/domains/payopt-common/env/itn-prod/backend.tfvars similarity index 100% rename from src/domains/paymentoptions-common/env/itn-prod/backend.tfvars rename to src/domains/payopt-common/env/itn-prod/backend.tfvars diff --git a/src/domains/paymentoptions-common/env/itn-prod/terraform.tfvars b/src/domains/payopt-common/env/itn-prod/terraform.tfvars similarity index 100% rename from src/domains/paymentoptions-common/env/itn-prod/terraform.tfvars rename to src/domains/payopt-common/env/itn-prod/terraform.tfvars diff --git a/src/domains/paymentoptions-common/env/itn-uat/backend.ini b/src/domains/payopt-common/env/itn-uat/backend.ini similarity index 100% rename from src/domains/paymentoptions-common/env/itn-uat/backend.ini rename to src/domains/payopt-common/env/itn-uat/backend.ini diff --git a/src/domains/paymentoptions-common/env/itn-uat/backend.tfvars b/src/domains/payopt-common/env/itn-uat/backend.tfvars similarity index 100% rename from src/domains/paymentoptions-common/env/itn-uat/backend.tfvars rename to src/domains/payopt-common/env/itn-uat/backend.tfvars diff --git a/src/domains/paymentoptions-common/env/itn-uat/terraform.tfvars b/src/domains/payopt-common/env/itn-uat/terraform.tfvars similarity index 100% rename from src/domains/paymentoptions-common/env/itn-uat/terraform.tfvars rename to src/domains/payopt-common/env/itn-uat/terraform.tfvars diff --git a/src/domains/paymentoptions-common/terraform.sh b/src/domains/payopt-common/terraform.sh similarity index 100% rename from src/domains/paymentoptions-common/terraform.sh rename to src/domains/payopt-common/terraform.sh diff --git a/src/domains/paymentoptions-secrets/.terraform.lock.hcl b/src/domains/payopt-secrets/.terraform.lock.hcl similarity index 100% rename from src/domains/paymentoptions-secrets/.terraform.lock.hcl rename to src/domains/payopt-secrets/.terraform.lock.hcl diff --git a/src/domains/paymentoptions-secrets/00_azuread.tf b/src/domains/payopt-secrets/00_azuread.tf similarity index 100% rename from src/domains/paymentoptions-secrets/00_azuread.tf rename to src/domains/payopt-secrets/00_azuread.tf diff --git a/src/domains/paymentoptions-secrets/01_keyvault.tf b/src/domains/payopt-secrets/01_keyvault.tf similarity index 100% rename from src/domains/paymentoptions-secrets/01_keyvault.tf rename to src/domains/payopt-secrets/01_keyvault.tf diff --git a/src/domains/paymentoptions-secrets/02_azdo.tf b/src/domains/payopt-secrets/02_azdo.tf similarity index 100% rename from src/domains/paymentoptions-secrets/02_azdo.tf rename to src/domains/payopt-secrets/02_azdo.tf diff --git a/src/domains/paymentoptions-secrets/02_init_sops.tf b/src/domains/payopt-secrets/02_init_sops.tf similarity index 100% rename from src/domains/paymentoptions-secrets/02_init_sops.tf rename to src/domains/payopt-secrets/02_init_sops.tf diff --git a/src/domains/paymentoptions-secrets/03_sops_secrets.tf b/src/domains/payopt-secrets/03_sops_secrets.tf similarity index 100% rename from src/domains/paymentoptions-secrets/03_sops_secrets.tf rename to src/domains/payopt-secrets/03_sops_secrets.tf diff --git a/src/domains/paymentoptions-secrets/99_locals.tf b/src/domains/payopt-secrets/99_locals.tf similarity index 100% rename from src/domains/paymentoptions-secrets/99_locals.tf rename to src/domains/payopt-secrets/99_locals.tf diff --git a/src/domains/paymentoptions-secrets/99_main.tf b/src/domains/payopt-secrets/99_main.tf similarity index 100% rename from src/domains/paymentoptions-secrets/99_main.tf rename to src/domains/payopt-secrets/99_main.tf diff --git a/src/domains/paymentoptions-secrets/99_variables.tf b/src/domains/payopt-secrets/99_variables.tf similarity index 100% rename from src/domains/paymentoptions-secrets/99_variables.tf rename to src/domains/payopt-secrets/99_variables.tf diff --git a/src/domains/paymentoptions-secrets/README.md b/src/domains/payopt-secrets/README.md similarity index 100% rename from src/domains/paymentoptions-secrets/README.md rename to src/domains/payopt-secrets/README.md diff --git a/src/domains/paymentoptions-secrets/env/itn-dev/backend.ini b/src/domains/payopt-secrets/env/itn-dev/backend.ini similarity index 100% rename from src/domains/paymentoptions-secrets/env/itn-dev/backend.ini rename to src/domains/payopt-secrets/env/itn-dev/backend.ini diff --git a/src/domains/paymentoptions-secrets/env/itn-dev/backend.tfvars b/src/domains/payopt-secrets/env/itn-dev/backend.tfvars similarity index 100% rename from src/domains/paymentoptions-secrets/env/itn-dev/backend.tfvars rename to src/domains/payopt-secrets/env/itn-dev/backend.tfvars diff --git a/src/domains/paymentoptions-secrets/env/itn-dev/terraform.tfvars b/src/domains/payopt-secrets/env/itn-dev/terraform.tfvars similarity index 100% rename from src/domains/paymentoptions-secrets/env/itn-dev/terraform.tfvars rename to src/domains/payopt-secrets/env/itn-dev/terraform.tfvars diff --git a/src/domains/paymentoptions-secrets/env/itn-prod/backend.ini b/src/domains/payopt-secrets/env/itn-prod/backend.ini similarity index 100% rename from src/domains/paymentoptions-secrets/env/itn-prod/backend.ini rename to src/domains/payopt-secrets/env/itn-prod/backend.ini diff --git a/src/domains/paymentoptions-secrets/env/itn-prod/backend.tfvars b/src/domains/payopt-secrets/env/itn-prod/backend.tfvars similarity index 100% rename from src/domains/paymentoptions-secrets/env/itn-prod/backend.tfvars rename to src/domains/payopt-secrets/env/itn-prod/backend.tfvars diff --git a/src/domains/paymentoptions-secrets/env/itn-prod/terraform.tfvars b/src/domains/payopt-secrets/env/itn-prod/terraform.tfvars similarity index 100% rename from src/domains/paymentoptions-secrets/env/itn-prod/terraform.tfvars rename to src/domains/payopt-secrets/env/itn-prod/terraform.tfvars diff --git a/src/domains/paymentoptions-secrets/env/itn-uat/backend.ini b/src/domains/payopt-secrets/env/itn-uat/backend.ini similarity index 100% rename from src/domains/paymentoptions-secrets/env/itn-uat/backend.ini rename to src/domains/payopt-secrets/env/itn-uat/backend.ini diff --git a/src/domains/paymentoptions-secrets/env/itn-uat/backend.tfvars b/src/domains/payopt-secrets/env/itn-uat/backend.tfvars similarity index 100% rename from src/domains/paymentoptions-secrets/env/itn-uat/backend.tfvars rename to src/domains/payopt-secrets/env/itn-uat/backend.tfvars diff --git a/src/domains/paymentoptions-secrets/env/itn-uat/terraform.tfvars b/src/domains/payopt-secrets/env/itn-uat/terraform.tfvars similarity index 100% rename from src/domains/paymentoptions-secrets/env/itn-uat/terraform.tfvars rename to src/domains/payopt-secrets/env/itn-uat/terraform.tfvars diff --git a/src/domains/paymentoptions-secrets/secret/itn-dev/configs.json b/src/domains/payopt-secrets/secret/itn-dev/configs.json similarity index 100% rename from src/domains/paymentoptions-secrets/secret/itn-dev/configs.json rename to src/domains/payopt-secrets/secret/itn-dev/configs.json diff --git a/src/domains/paymentoptions-secrets/secret/itn-dev/noedit_secret_enc.json b/src/domains/payopt-secrets/secret/itn-dev/noedit_secret_enc.json similarity index 100% rename from src/domains/paymentoptions-secrets/secret/itn-dev/noedit_secret_enc.json rename to src/domains/payopt-secrets/secret/itn-dev/noedit_secret_enc.json diff --git a/src/domains/paymentoptions-secrets/secret/itn-dev/secret.ini b/src/domains/payopt-secrets/secret/itn-dev/secret.ini similarity index 100% rename from src/domains/paymentoptions-secrets/secret/itn-dev/secret.ini rename to src/domains/payopt-secrets/secret/itn-dev/secret.ini diff --git a/src/domains/paymentoptions-secrets/secret/itn-prod/configs.json b/src/domains/payopt-secrets/secret/itn-prod/configs.json similarity index 100% rename from src/domains/paymentoptions-secrets/secret/itn-prod/configs.json rename to src/domains/payopt-secrets/secret/itn-prod/configs.json diff --git a/src/domains/paymentoptions-secrets/secret/itn-prod/secret.ini b/src/domains/payopt-secrets/secret/itn-prod/secret.ini similarity index 100% rename from src/domains/paymentoptions-secrets/secret/itn-prod/secret.ini rename to src/domains/payopt-secrets/secret/itn-prod/secret.ini diff --git a/src/domains/paymentoptions-secrets/secret/itn-uat/configs.json b/src/domains/payopt-secrets/secret/itn-uat/configs.json similarity index 100% rename from src/domains/paymentoptions-secrets/secret/itn-uat/configs.json rename to src/domains/payopt-secrets/secret/itn-uat/configs.json diff --git a/src/domains/paymentoptions-secrets/secret/itn-uat/noedit_secret_enc.json b/src/domains/payopt-secrets/secret/itn-uat/noedit_secret_enc.json similarity index 100% rename from src/domains/paymentoptions-secrets/secret/itn-uat/noedit_secret_enc.json rename to src/domains/payopt-secrets/secret/itn-uat/noedit_secret_enc.json diff --git a/src/domains/paymentoptions-secrets/secret/itn-uat/secret.ini b/src/domains/payopt-secrets/secret/itn-uat/secret.ini similarity index 100% rename from src/domains/paymentoptions-secrets/secret/itn-uat/secret.ini rename to src/domains/payopt-secrets/secret/itn-uat/secret.ini diff --git a/src/domains/paymentoptions-secrets/sops.sh b/src/domains/payopt-secrets/sops.sh similarity index 100% rename from src/domains/paymentoptions-secrets/sops.sh rename to src/domains/payopt-secrets/sops.sh diff --git a/src/domains/paymentoptions-secrets/terraform.sh b/src/domains/payopt-secrets/terraform.sh similarity index 100% rename from src/domains/paymentoptions-secrets/terraform.sh rename to src/domains/payopt-secrets/terraform.sh diff --git a/src/domains/paymentoptions-secrets/terrasops.sh b/src/domains/payopt-secrets/terrasops.sh similarity index 100% rename from src/domains/paymentoptions-secrets/terrasops.sh rename to src/domains/payopt-secrets/terrasops.sh