From 48bae8697c2763a79e07b8f91ac2818b095c75f6 Mon Sep 17 00:00:00 2001 From: manuraf Date: Tue, 12 Mar 2024 15:29:30 +0100 Subject: [PATCH 1/5] add JWT_TOKEN_PUBLIC_KEY --- infra/container_apps/env/dev-pnpg/terraform.tfvars | 1 + infra/container_apps/env/dev/terraform.tfvars | 1 + infra/container_apps/env/prod-pnpg/terraform.tfvars | 1 + infra/container_apps/env/prod/terraform.tfvars | 1 + infra/container_apps/env/uat-pnpg/terraform.tfvars | 1 + infra/container_apps/env/uat/terraform.tfvars | 1 + 6 files changed, 6 insertions(+) diff --git a/infra/container_apps/env/dev-pnpg/terraform.tfvars b/infra/container_apps/env/dev-pnpg/terraform.tfvars index b1e92bc3..441abffa 100644 --- a/infra/container_apps/env/dev-pnpg/terraform.tfvars +++ b/infra/container_apps/env/dev-pnpg/terraform.tfvars @@ -115,4 +115,5 @@ secrets_names = { "SUPPORT_API_KEY" = "zendesk-support-api-key" "JWT_TOKEN_EXCHANGE_PRIVATE_KEY" = "jwt-exchange-private-key" "JWT_TOKEN_EXCHANGE_KID" = "jwt-exchange-kid" + "JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key" } diff --git a/infra/container_apps/env/dev/terraform.tfvars b/infra/container_apps/env/dev/terraform.tfvars index 17fa5a84..e7cb6c37 100644 --- a/infra/container_apps/env/dev/terraform.tfvars +++ b/infra/container_apps/env/dev/terraform.tfvars @@ -115,4 +115,5 @@ secrets_names = { "SUPPORT_API_KEY" = "zendesk-support-api-key" "JWT_TOKEN_EXCHANGE_PRIVATE_KEY" = "jwt-exchange-private-key" "JWT_TOKEN_EXCHANGE_KID" = "jwt-exchange-kid" + "JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key" } diff --git a/infra/container_apps/env/prod-pnpg/terraform.tfvars b/infra/container_apps/env/prod-pnpg/terraform.tfvars index 6a2c7b82..51c01508 100644 --- a/infra/container_apps/env/prod-pnpg/terraform.tfvars +++ b/infra/container_apps/env/prod-pnpg/terraform.tfvars @@ -128,4 +128,5 @@ secrets_names = { "SUPPORT_API_KEY" = "zendesk-support-api-key" "JWT_TOKEN_EXCHANGE_PRIVATE_KEY" = "jwt-exchange-private-key" "JWT_TOKEN_EXCHANGE_KID" = "jwt-exchange-kid" + "JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key" } \ No newline at end of file diff --git a/infra/container_apps/env/prod/terraform.tfvars b/infra/container_apps/env/prod/terraform.tfvars index dea1627d..585ca7f9 100644 --- a/infra/container_apps/env/prod/terraform.tfvars +++ b/infra/container_apps/env/prod/terraform.tfvars @@ -128,4 +128,5 @@ secrets_names = { "SUPPORT_API_KEY" = "zendesk-support-api-key" "JWT_TOKEN_EXCHANGE_PRIVATE_KEY" = "jwt-exchange-private-key" "JWT_TOKEN_EXCHANGE_KID" = "jwt-exchange-kid" + "JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key" } \ No newline at end of file diff --git a/infra/container_apps/env/uat-pnpg/terraform.tfvars b/infra/container_apps/env/uat-pnpg/terraform.tfvars index c535c8a1..59b1eb5b 100644 --- a/infra/container_apps/env/uat-pnpg/terraform.tfvars +++ b/infra/container_apps/env/uat-pnpg/terraform.tfvars @@ -115,4 +115,5 @@ secrets_names = { "SUPPORT_API_KEY" = "zendesk-support-api-key" "JWT_TOKEN_EXCHANGE_PRIVATE_KEY" = "jwt-exchange-private-key" "JWT_TOKEN_EXCHANGE_KID" = "jwt-exchange-kid" + "JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key" } diff --git a/infra/container_apps/env/uat/terraform.tfvars b/infra/container_apps/env/uat/terraform.tfvars index a8454fae..75be9282 100644 --- a/infra/container_apps/env/uat/terraform.tfvars +++ b/infra/container_apps/env/uat/terraform.tfvars @@ -115,4 +115,5 @@ secrets_names = { "SUPPORT_API_KEY" = "zendesk-support-api-key" "JWT_TOKEN_EXCHANGE_PRIVATE_KEY" = "jwt-exchange-private-key" "JWT_TOKEN_EXCHANGE_KID" = "jwt-exchange-kid" + "JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key" } From 9fad813168f9fa2a08dcca2a542e34bf2b864b84 Mon Sep 17 00:00:00 2001 From: manuraf Date: Tue, 12 Mar 2024 15:30:06 +0100 Subject: [PATCH 2/5] min replica to 1 --- infra/container_apps/env/dev-pnpg/terraform.tfvars | 2 +- infra/container_apps/env/dev/terraform.tfvars | 2 +- infra/container_apps/env/uat-pnpg/terraform.tfvars | 2 +- infra/container_apps/env/uat/terraform.tfvars | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infra/container_apps/env/dev-pnpg/terraform.tfvars b/infra/container_apps/env/dev-pnpg/terraform.tfvars index 441abffa..61db676e 100644 --- a/infra/container_apps/env/dev-pnpg/terraform.tfvars +++ b/infra/container_apps/env/dev-pnpg/terraform.tfvars @@ -10,7 +10,7 @@ tags = { } container_app = { - min_replicas = 0 + min_replicas = 1 max_replicas = 1 scale_rules = [] cpu = 0.5 diff --git a/infra/container_apps/env/dev/terraform.tfvars b/infra/container_apps/env/dev/terraform.tfvars index e7cb6c37..ad9e3753 100644 --- a/infra/container_apps/env/dev/terraform.tfvars +++ b/infra/container_apps/env/dev/terraform.tfvars @@ -9,7 +9,7 @@ tags = { } container_app = { - min_replicas = 0 + min_replicas = 1 max_replicas = 1 scale_rules = [] cpu = 0.5 diff --git a/infra/container_apps/env/uat-pnpg/terraform.tfvars b/infra/container_apps/env/uat-pnpg/terraform.tfvars index 59b1eb5b..d4c3bd3d 100644 --- a/infra/container_apps/env/uat-pnpg/terraform.tfvars +++ b/infra/container_apps/env/uat-pnpg/terraform.tfvars @@ -10,7 +10,7 @@ tags = { } container_app = { - min_replicas = 0 + min_replicas = 1 max_replicas = 2 scale_rules = [] cpu = 0.5 diff --git a/infra/container_apps/env/uat/terraform.tfvars b/infra/container_apps/env/uat/terraform.tfvars index 75be9282..f0117037 100644 --- a/infra/container_apps/env/uat/terraform.tfvars +++ b/infra/container_apps/env/uat/terraform.tfvars @@ -9,7 +9,7 @@ tags = { } container_app = { - min_replicas = 0 + min_replicas = 1 max_replicas = 2 scale_rules = [] cpu = 0.5 From a34317b8df95a24d200c15d9c5d390665900bf88 Mon Sep 17 00:00:00 2001 From: manuraf Date: Tue, 12 Mar 2024 15:54:55 +0100 Subject: [PATCH 3/5] fix selc.internal --- infra/container_apps/env/dev/terraform.tfvars | 2 +- infra/container_apps/env/prod/terraform.tfvars | 2 +- infra/container_apps/env/uat/terraform.tfvars | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infra/container_apps/env/dev/terraform.tfvars b/infra/container_apps/env/dev/terraform.tfvars index ad9e3753..7fcb7697 100644 --- a/infra/container_apps/env/dev/terraform.tfvars +++ b/infra/container_apps/env/dev/terraform.tfvars @@ -83,7 +83,7 @@ app_settings = [ }, { name = "MS_PRODUCT_URL" - value = "https://selc.internal.dev.pagopa.it/ms-product/v1" + value = "https://selc.internal.dev.selfcare.pagopa.it/ms-product/v1" }, { name = "MS_USER_GROUP_URL" diff --git a/infra/container_apps/env/prod/terraform.tfvars b/infra/container_apps/env/prod/terraform.tfvars index 585ca7f9..1e387314 100644 --- a/infra/container_apps/env/prod/terraform.tfvars +++ b/infra/container_apps/env/prod/terraform.tfvars @@ -96,7 +96,7 @@ app_settings = [ }, { name = "MS_PRODUCT_URL" - value = "https://selc.internal.pagopa.it/ms-product/v1" + value = "https://selc.internal.selfcare.pagopa.it/ms-product/v1" }, { name = "MS_USER_GROUP_URL" diff --git a/infra/container_apps/env/uat/terraform.tfvars b/infra/container_apps/env/uat/terraform.tfvars index f0117037..4bcd5fff 100644 --- a/infra/container_apps/env/uat/terraform.tfvars +++ b/infra/container_apps/env/uat/terraform.tfvars @@ -83,7 +83,7 @@ app_settings = [ }, { name = "MS_PRODUCT_URL" - value = "https://selc.internal.uat.pagopa.it/ms-product/v1" + value = "https://selc.internal.uat.selfcare.pagopa.it/ms-product/v1" }, { name = "MS_USER_GROUP_URL" From e8f75a6b16d20929b0444e970d42883c37dfb5b1 Mon Sep 17 00:00:00 2001 From: manuraf Date: Tue, 12 Mar 2024 16:11:59 +0100 Subject: [PATCH 4/5] USERVICE_USER_REGISTRY_API_KEY --- infra/container_apps/env/dev-pnpg/terraform.tfvars | 1 + infra/container_apps/env/dev/terraform.tfvars | 1 + infra/container_apps/env/prod-pnpg/terraform.tfvars | 1 + infra/container_apps/env/prod/terraform.tfvars | 1 + infra/container_apps/env/uat-pnpg/terraform.tfvars | 1 + infra/container_apps/env/uat/terraform.tfvars | 1 + 6 files changed, 6 insertions(+) diff --git a/infra/container_apps/env/dev-pnpg/terraform.tfvars b/infra/container_apps/env/dev-pnpg/terraform.tfvars index 61db676e..d195ab5c 100644 --- a/infra/container_apps/env/dev-pnpg/terraform.tfvars +++ b/infra/container_apps/env/dev-pnpg/terraform.tfvars @@ -116,4 +116,5 @@ secrets_names = { "JWT_TOKEN_EXCHANGE_PRIVATE_KEY" = "jwt-exchange-private-key" "JWT_TOKEN_EXCHANGE_KID" = "jwt-exchange-kid" "JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key" + "USERVICE_USER_REGISTRY_API_KEY" = "user-registry-api-key" } diff --git a/infra/container_apps/env/dev/terraform.tfvars b/infra/container_apps/env/dev/terraform.tfvars index 7fcb7697..872c67e9 100644 --- a/infra/container_apps/env/dev/terraform.tfvars +++ b/infra/container_apps/env/dev/terraform.tfvars @@ -116,4 +116,5 @@ secrets_names = { "JWT_TOKEN_EXCHANGE_PRIVATE_KEY" = "jwt-exchange-private-key" "JWT_TOKEN_EXCHANGE_KID" = "jwt-exchange-kid" "JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key" + "USERVICE_USER_REGISTRY_API_KEY" = "user-registry-api-key" } diff --git a/infra/container_apps/env/prod-pnpg/terraform.tfvars b/infra/container_apps/env/prod-pnpg/terraform.tfvars index 51c01508..047f7e36 100644 --- a/infra/container_apps/env/prod-pnpg/terraform.tfvars +++ b/infra/container_apps/env/prod-pnpg/terraform.tfvars @@ -129,4 +129,5 @@ secrets_names = { "JWT_TOKEN_EXCHANGE_PRIVATE_KEY" = "jwt-exchange-private-key" "JWT_TOKEN_EXCHANGE_KID" = "jwt-exchange-kid" "JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key" + "USERVICE_USER_REGISTRY_API_KEY" = "user-registry-api-key" } \ No newline at end of file diff --git a/infra/container_apps/env/prod/terraform.tfvars b/infra/container_apps/env/prod/terraform.tfvars index 1e387314..d1e3797e 100644 --- a/infra/container_apps/env/prod/terraform.tfvars +++ b/infra/container_apps/env/prod/terraform.tfvars @@ -129,4 +129,5 @@ secrets_names = { "JWT_TOKEN_EXCHANGE_PRIVATE_KEY" = "jwt-exchange-private-key" "JWT_TOKEN_EXCHANGE_KID" = "jwt-exchange-kid" "JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key" + "USERVICE_USER_REGISTRY_API_KEY" = "user-registry-api-key" } \ No newline at end of file diff --git a/infra/container_apps/env/uat-pnpg/terraform.tfvars b/infra/container_apps/env/uat-pnpg/terraform.tfvars index d4c3bd3d..366d2236 100644 --- a/infra/container_apps/env/uat-pnpg/terraform.tfvars +++ b/infra/container_apps/env/uat-pnpg/terraform.tfvars @@ -116,4 +116,5 @@ secrets_names = { "JWT_TOKEN_EXCHANGE_PRIVATE_KEY" = "jwt-exchange-private-key" "JWT_TOKEN_EXCHANGE_KID" = "jwt-exchange-kid" "JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key" + "USERVICE_USER_REGISTRY_API_KEY" = "user-registry-api-key" } diff --git a/infra/container_apps/env/uat/terraform.tfvars b/infra/container_apps/env/uat/terraform.tfvars index 4bcd5fff..88814110 100644 --- a/infra/container_apps/env/uat/terraform.tfvars +++ b/infra/container_apps/env/uat/terraform.tfvars @@ -116,4 +116,5 @@ secrets_names = { "JWT_TOKEN_EXCHANGE_PRIVATE_KEY" = "jwt-exchange-private-key" "JWT_TOKEN_EXCHANGE_KID" = "jwt-exchange-kid" "JWT_TOKEN_PUBLIC_KEY" = "jwt-public-key" + "USERVICE_USER_REGISTRY_API_KEY" = "user-registry-api-key" } From 352d8cc64d7e6ee84b9e9966949d1fb291fe0abf Mon Sep 17 00:00:00 2001 From: manuraf Date: Tue, 12 Mar 2024 16:42:34 +0100 Subject: [PATCH 5/5] fix MS_USER_GROUP_URL --- infra/container_apps/env/dev-pnpg/terraform.tfvars | 2 +- infra/container_apps/env/dev/terraform.tfvars | 2 +- infra/container_apps/env/prod-pnpg/terraform.tfvars | 2 +- infra/container_apps/env/prod/terraform.tfvars | 2 +- infra/container_apps/env/uat-pnpg/terraform.tfvars | 2 +- infra/container_apps/env/uat/terraform.tfvars | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/infra/container_apps/env/dev-pnpg/terraform.tfvars b/infra/container_apps/env/dev-pnpg/terraform.tfvars index d195ab5c..c6287518 100644 --- a/infra/container_apps/env/dev-pnpg/terraform.tfvars +++ b/infra/container_apps/env/dev-pnpg/terraform.tfvars @@ -88,7 +88,7 @@ app_settings = [ }, { name = "MS_USER_GROUP_URL" - value = "https://selc-d-pnpg-ms-user-group-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + value = "https://selc-d-pnpg-user-group-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" }, { name = "USERVICE_USER_REGISTRY_URL" diff --git a/infra/container_apps/env/dev/terraform.tfvars b/infra/container_apps/env/dev/terraform.tfvars index 872c67e9..2dd12b5a 100644 --- a/infra/container_apps/env/dev/terraform.tfvars +++ b/infra/container_apps/env/dev/terraform.tfvars @@ -87,7 +87,7 @@ app_settings = [ }, { name = "MS_USER_GROUP_URL" - value = "https://selc-d-ms-user-group-ca.gentleflower-c63e62fe.westeurope.azurecontainerapps.io" + value = "https://selc-d-user-group-ca.gentleflower-c63e62fe.westeurope.azurecontainerapps.io" }, { name = "USERVICE_USER_REGISTRY_URL" diff --git a/infra/container_apps/env/prod-pnpg/terraform.tfvars b/infra/container_apps/env/prod-pnpg/terraform.tfvars index 047f7e36..090a580a 100644 --- a/infra/container_apps/env/prod-pnpg/terraform.tfvars +++ b/infra/container_apps/env/prod-pnpg/terraform.tfvars @@ -101,7 +101,7 @@ app_settings = [ }, { name = "MS_USER_GROUP_URL" - value = "https://selc-p-pnpg-ms-user-group-ca.salmonpond-602699235.westeurope.azurecontainerapps.io" + value = "https://selc-p-pnpg-user-group-ca.salmonpond-602699235.westeurope.azurecontainerapps.io" }, { name = "USERVICE_USER_REGISTRY_URL" diff --git a/infra/container_apps/env/prod/terraform.tfvars b/infra/container_apps/env/prod/terraform.tfvars index d1e3797e..37c1c9c3 100644 --- a/infra/container_apps/env/prod/terraform.tfvars +++ b/infra/container_apps/env/prod/terraform.tfvars @@ -100,7 +100,7 @@ app_settings = [ }, { name = "MS_USER_GROUP_URL" - value = "https://selc-p-ms-user-group-ca.bluedune-cc0f8752.westeurope.azurecontainerapps.io" + value = "https://selc-p-user-group-ca.bluedune-cc0f8752.westeurope.azurecontainerapps.io" }, { name = "USERVICE_USER_REGISTRY_URL" diff --git a/infra/container_apps/env/uat-pnpg/terraform.tfvars b/infra/container_apps/env/uat-pnpg/terraform.tfvars index 366d2236..bef29673 100644 --- a/infra/container_apps/env/uat-pnpg/terraform.tfvars +++ b/infra/container_apps/env/uat-pnpg/terraform.tfvars @@ -88,7 +88,7 @@ app_settings = [ }, { name = "MS_USER_GROUP_URL" - value = "https://selc-u-pnpg-ms-user-group-ca.redground-be752d1f5.westeurope.azurecontainerapps.io" + value = "https://selc-u-pnpg-user-group-ca.redground-be752d1f5.westeurope.azurecontainerapps.io" }, { name = "USERVICE_USER_REGISTRY_URL" diff --git a/infra/container_apps/env/uat/terraform.tfvars b/infra/container_apps/env/uat/terraform.tfvars index 88814110..9da40fe4 100644 --- a/infra/container_apps/env/uat/terraform.tfvars +++ b/infra/container_apps/env/uat/terraform.tfvars @@ -87,7 +87,7 @@ app_settings = [ }, { name = "MS_USER_GROUP_URL" - value = "https://selc-u-ms-user-group-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" + value = "https://selc-u-user-group-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" }, { name = "USERVICE_USER_REGISTRY_URL"