Merge release-uat (#283)

Co-authored-by: Giulia Tremolada <[email protected]>
pagopa · Mar 28, 2024 · 1fe2410 · 1fe2410
1 parent e19645f
commit 1fe2410
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 155 deletions.
diff --git a/.devops/code-review-pipelines.yml b/.devops/code-review-pipelines.yml
diff --git a/.devops/deploy-pipelines.yml b/.devops/deploy-pipelines.yml
@@ -11,7 +11,6 @@ parameters:
 trigger:
   branches:
     include:
-      - main
       - release-*
   paths:
     include:

diff --git a/.devops/pnpg-code-review-pipelines.yml b/.devops/pnpg-code-review-pipelines.yml
diff --git a/.devops/pnpg-deploy-pipelines.yml b/.devops/pnpg-deploy-pipelines.yml
@@ -11,7 +11,6 @@ parameters:
 trigger:
   branches:
     include:
-      - main
       - release-*
   paths:
     include:

diff --git a/connector/rest/src/main/resources/config/ms-onboarding-rest-client.properties b/connector/rest/src/main/resources/config/ms-onboarding-rest-client.properties
@@ -6,4 +6,9 @@ feign.client.config.ms-onboarding-api.requestInterceptors[0]=it.pagopa.selfcare.
 feign.client.config.ms-onboarding-api.errorDecoder=it.pagopa.selfcare.onboarding.connector.rest.decoder.FeignErrorDecoder
 feign.client.config.ms-onboarding-api.readTimeout=${USERVICE_PARTY_PROCESS_REST_CLIENT_READ_TIMEOUT:${REST_CLIENT_READ_TIMEOUT:5000}}
 feign.client.config.ms-onboarding-api.loggerLevel=${USERVICE_PARTY_PROCESS_REST_CLIENT_LOGGER_LEVEL:${REST_CLIENT_LOGGER_LEVEL:FULL}}
-feign.client.config.ms-onboarding-api.connectTimeout=${USERVICE_PARTY_PROCESS_REST_CLIENT_CONNECT_TIMEOUT:${REST_CLIENT_CONNECT_TIMEOUT:5000}}
+feign.client.config.ms-onboarding-api.connectTimeout=${USERVICE_PARTY_PROCESS_REST_CLIENT_CONNECT_TIMEOUT:${REST_CLIENT_CONNECT_TIMEOUT:5000}}
+feign.client.config.ms-onboarding-token-api.requestInterceptors[0]=it.pagopa.selfcare.commons.connector.rest.interceptor.AuthorizationHeaderInterceptor
+feign.client.config.ms-onboarding-token-api.errorDecoder=it.pagopa.selfcare.onboarding.connector.rest.decoder.FeignErrorDecoder
+feign.client.config.ms-onboarding-token-api.readTimeout=${USERVICE_PARTY_PROCESS_REST_CLIENT_READ_TIMEOUT:${REST_CLIENT_READ_TIMEOUT:5000}}
+feign.client.config.ms-onboarding-token-api.loggerLevel=${USERVICE_PARTY_PROCESS_REST_CLIENT_LOGGER_LEVEL:${REST_CLIENT_LOGGER_LEVEL:FULL}}
+feign.client.config.ms-onboarding-token-api.connectTimeout=${USERVICE_PARTY_PROCESS_REST_CLIENT_CONNECT_TIMEOUT:${REST_CLIENT_CONNECT_TIMEOUT:5000}}
diff --git a/infra/container_apps/env/dev/terraform.tfvars b/infra/container_apps/env/dev/terraform.tfvars
@@ -54,7 +54,7 @@ app_settings = [
   },
   {
     name  = "MS_EXTERNAL_INTERCEPTOR_URL"
-    value = "https://selc-d-ext-interceptor-ca.gentleflower-c63e62fe.westeurope.azurecontainerapps.io"
+    value = "http://selc.internal.dev.selfcare.pagopa.it//ms-external-interceptor/v1"
   },
   {
     name  = "USERVICE_PARTY_PROCESS_URL"

diff --git a/infra/container_apps/env/prod/terraform.tfvars b/infra/container_apps/env/prod/terraform.tfvars
@@ -59,15 +59,15 @@ app_settings = [
   },
   {
     name  = "ONBOARDING_ALLOWED_INSTITUTIONS_PRODUCTS"
-    value = "{'prod-interop':{'*'},'prod-pn':{'*'},'prod-io':{'*'},'prod-io-premium':{'*'},'prod-pagopa':{'*'},'prod-io-sign':{'*'},'prod-sendino':{'*'}}"
+    value = "{'prod-interop':{'*'},'prod-pn':{'*'},'prod-io':{'*'},'prod-io-premium':{'*'},'prod-pagopa':{'*'},'prod-io-sign':{'*'},'prod-sendino':{'*'},'prod-fd':{'*'},'prod-fd-garantito':{'*'}}"
   },
   {
     name  = "MS_CORE_URL"
     value = "https://selc-p-ms-core-ca.bluedune-cc0f8752.westeurope.azurecontainerapps.io"
   },
   {
     name  = "MS_EXTERNAL_INTERCEPTOR_URL"
-    value = "https://selc-p-ext-interceptor-ca.bluedune-cc0f8752.westeurope.azurecontainerapps.io"
+    value = "http://selc.internal.selfcare.pagopa.it//ms-external-interceptor/v1"
   },
   {
     name  = "USERVICE_PARTY_PROCESS_URL"

diff --git a/infra/container_apps/env/uat/terraform.tfvars b/infra/container_apps/env/uat/terraform.tfvars
@@ -54,7 +54,7 @@ app_settings = [
   },
   {
     name  = "MS_EXTERNAL_INTERCEPTOR_URL"
-    value = "https://selc-u-ext-interceptor-ca.calmsky-143987c1.westeurope.azurecontainerapps.io"
+    value = "http://selc.internal.uat.selfcare.pagopa.it//ms-external-interceptor/v1"
   },
   {
     name  = "USERVICE_PARTY_PROCESS_URL"