diff --git a/.github/workflows/release_open_api.yml b/.github/workflows/release_open_api.yml index ea2f1cf1..4c97c46f 100644 --- a/.github/workflows/release_open_api.yml +++ b/.github/workflows/release_open_api.yml @@ -2,7 +2,7 @@ name: Swagger Detect Conflict and Update on: pull_request: branches: - - release-dev + - main types: [ opened, synchronize, reopened ] permissions: @@ -18,4 +18,4 @@ jobs: uses: pagopa/selfcare-commons/github-actions-template/swagger-detect-conflict-spring@main with: path_openapi_docs: app/src/main/resources/swagger/api-docs.json - branch_ref: release-dev \ No newline at end of file + branch_ref: main \ No newline at end of file diff --git a/helm/pnpg/values-dev.yaml b/helm/pnpg/values-dev.yaml index 01d5871f..3128d93c 100644 --- a/helm/pnpg/values-dev.yaml +++ b/helm/pnpg/values-dev.yaml @@ -28,4 +28,4 @@ configEnvSpecific: APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF" B4F_ONBOARDING_LOG_LEVEL: "DEBUG" REST_CLIENT_LOGGER_LEVEL: "FULL" - MS_ONBOARDING_URL: "https://selc-d-pnpg-onboarding-ms-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" \ No newline at end of file + MS_ONBOARDING_URL: "https://selc-d-pnpg-onboarding-ms-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io" \ No newline at end of file diff --git a/helm/pnpg/values-uat.yaml b/helm/pnpg/values-uat.yaml index 7a58fc16..1f182eb0 100644 --- a/helm/pnpg/values-uat.yaml +++ b/helm/pnpg/values-uat.yaml @@ -29,4 +29,4 @@ configEnvSpecific: APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF" B4F_ONBOARDING_LOG_LEVEL: "DEBUG" REST_CLIENT_LOGGER_LEVEL: "FULL" - MS_ONBOARDING_URL: "https://selc-u-pnpg-onboarding-ms-ca.redground-be752d1f.westeurope.azurecontainerapps.io" \ No newline at end of file + MS_ONBOARDING_URL: "https://selc-u-pnpg-onboarding-ms-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io" \ No newline at end of file diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml index df1e8a6c..d87bc6d2 100644 --- a/helm/values-uat.yaml +++ b/helm/values-uat.yaml @@ -40,5 +40,5 @@ configEnvSpecific: APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF" B4F_ONBOARDING_LOG_LEVEL: "DEBUG" REST_CLIENT_LOGGER_LEVEL: "FULL" - MS_ONBOARDING_URL: "https://selc-u-onboarding-ms-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" + MS_ONBOARDING_URL: "https://selc-u-onboarding-ms-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io" ONBOARDING_ALLOWED_INSTITUTIONS_PRODUCTS: "{'prod-interop':{'*'},'prod-pn':{'*'},'prod-io':{'*'},'prod-io-premium':{'*'},'prod-pagopa':{'*'},'prod-pn-coll':{'*'},'prod-fd':{'*'},'prod-fd-garantito':{'*'},'prod-io-sign':{'*'},'prod-pn-dev':{'*'},'prod-sendino':{'*'}}" diff --git a/infra/container_apps/env/dev-pnpg/terraform.tfvars b/infra/container_apps/env/dev-pnpg/terraform.tfvars index 20314291..e53e2568 100644 --- a/infra/container_apps/env/dev-pnpg/terraform.tfvars +++ b/infra/container_apps/env/dev-pnpg/terraform.tfvars @@ -1,6 +1,6 @@ is_pnpg = true env_short = "d" -private_dns_name = "selc-d-pnpg-onboardingbackend-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" +private_dns_name = "selc-d-pnpg-onboardingbackend-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io" dns_zone_prefix = "pnpg.dev.selfcare" api_dns_zone_prefix = "api-pnpg.dev.selfcare" @@ -33,8 +33,6 @@ container_app = { memory = "1Gi" } -workload_profile_name = null - app_settings = [ { name = "APPLICATIONINSIGHTS_ROLE_NAME" @@ -58,7 +56,7 @@ app_settings = [ }, { name = "MS_ONBOARDING_URL" - value = "https://selc-d-pnpg-onboarding-ms-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io", + value = "https://selc-d-pnpg-onboarding-ms-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io", }, { name = "ONBOARDING_ALLOWED_INSTITUTIONS_PRODUCTS" @@ -66,23 +64,23 @@ app_settings = [ }, { name = "MS_CORE_URL" - value = "https://selc-d-pnpg-ms-core-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + value = "https://selc-d-pnpg-ms-core-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io" }, { name = "MS_EXTERNAL_INTERCEPTOR_URL" - value = "https://selc-d-pnpg-ext-interceptor-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + value = "https://selc-d-pnpg-ext-interceptor-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io" }, { name = "USERVICE_PARTY_PROCESS_URL" - value = "https://selc-d-pnpg-ms-core-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + value = "https://selc-d-pnpg-ms-core-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io" }, { name = "USERVICE_PARTY_REGISTRY_PROXY_URL" - value = "https://selc-d-pnpg-party-reg-proxy-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + value = "https://selc-d-pnpg-party-reg-proxy-ca.yellowdesert-85d3792d.westeurope.azurecontainerapps.io" }, { name = "MS_PRODUCT_URL" - value = "https://selc-d-pnpg-product-ca.whiteglacier-211c4885.westeurope.azurecontainerapps.io" + value = "https://selc-d-pnpg-product-ca.yellowdesert-85d3792d.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 40f7413a..13d3a479 100644 --- a/infra/container_apps/env/prod-pnpg/terraform.tfvars +++ b/infra/container_apps/env/prod-pnpg/terraform.tfvars @@ -34,8 +34,6 @@ container_app = { memory = "2.5Gi" } -workload_profile_name = null - app_settings = [ { name = "APPLICATIONINSIGHTS_ROLE_NAME" diff --git a/infra/container_apps/env/uat-pnpg/terraform.tfvars b/infra/container_apps/env/uat-pnpg/terraform.tfvars index 09ce9e3a..7d76e47b 100644 --- a/infra/container_apps/env/uat-pnpg/terraform.tfvars +++ b/infra/container_apps/env/uat-pnpg/terraform.tfvars @@ -1,6 +1,6 @@ is_pnpg = true env_short = "u" -private_dns_name = "selc-u-pnpg-onboardingbackend-ca.redground-be752d1f.westeurope.azurecontainerapps.io" +private_dns_name = "selc-u-pnpg-onboardingbackend-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io" dns_zone_prefix = "imprese.uat.notifichedigitali" api_dns_zone_prefix = "api-pnpg.uat.selfcare" external_domain = "it" @@ -21,8 +21,6 @@ container_app = { memory = "1Gi" } -workload_profile_name = null - app_settings = [ { name = "APPLICATIONINSIGHTS_ROLE_NAME" @@ -46,7 +44,7 @@ app_settings = [ }, { name = "MS_ONBOARDING_URL" - value = "https://selc-u-pnpg-onboarding-ms-ca.redground-be752d1f.westeurope.azurecontainerapps.io", + value = "https://selc-u-pnpg-onboarding-ms-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io", }, { name = "ONBOARDING_ALLOWED_INSTITUTIONS_PRODUCTS" @@ -54,19 +52,19 @@ app_settings = [ }, { name = "MS_CORE_URL" - value = "https://selc-u-pnpg-ms-core-ca.redground-be752d1f.westeurope.azurecontainerapps.io" + value = "https://selc-u-pnpg-ms-core-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io" }, { name = "MS_EXTERNAL_INTERCEPTOR_URL" - value = "https://selc-u-pnpg-ext-interceptor-ca.redground-be752d1f.westeurope.azurecontainerapps.io" + value = "https://selc-u-pnpg-ext-interceptor-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io" }, { name = "USERVICE_PARTY_PROCESS_URL" - value = "https://selc-u-pnpg-ms-core-ca.redground-be752d1f.westeurope.azurecontainerapps.io" + value = "https://selc-u-pnpg-ms-core-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io" }, { name = "USERVICE_PARTY_REGISTRY_PROXY_URL" - value = "https://selc-u-pnpg-party-reg-proxy-ca.redground-be752d1f.westeurope.azurecontainerapps.io" + value = "https://selc-u-pnpg-party-reg-proxy-ca.calmforest-ffe47bf1.westeurope.azurecontainerapps.io" }, { name = "MS_PRODUCT_URL" diff --git a/infra/container_apps/env/uat/terraform.tfvars b/infra/container_apps/env/uat/terraform.tfvars index 6e238e88..d7806c4c 100644 --- a/infra/container_apps/env/uat/terraform.tfvars +++ b/infra/container_apps/env/uat/terraform.tfvars @@ -1,5 +1,5 @@ env_short = "u" -private_dns_name = "selc-u-onboardingbackend-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" +private_dns_name = "selc-u-onboardingbackend-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io" dns_zone_prefix = "uat.selfcare" api_dns_zone_prefix = "api.uat.selfcare" @@ -42,7 +42,7 @@ app_settings = [ }, { name = "MS_ONBOARDING_URL" - value = "https://selc-u-onboarding-ms-ca.calmsky-143987c1.westeurope.azurecontainerapps.io", + value = "https://selc-u-onboarding-ms-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io", }, { name = "ONBOARDING_ALLOWED_INSTITUTIONS_PRODUCTS" @@ -50,7 +50,7 @@ app_settings = [ }, { name = "MS_CORE_URL" - value = "https://selc-u-ms-core-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" + value = "https://selc-u-ms-core-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io" }, { name = "MS_EXTERNAL_INTERCEPTOR_URL" @@ -58,11 +58,11 @@ app_settings = [ }, { name = "USERVICE_PARTY_PROCESS_URL" - value = "https://selc-u-ms-core-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" + value = "https://selc-u-ms-core-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io" }, { name = "USERVICE_PARTY_REGISTRY_PROXY_URL" - value = "https://selc-u-party-reg-proxy-ca.calmsky-143987c1.westeurope.azurecontainerapps.io" + value = "https://selc-u-party-reg-proxy-ca.agreeablesky-f71e6306.westeurope.azurecontainerapps.io" }, { name = "MS_PRODUCT_URL" diff --git a/infra/container_apps/main.tf b/infra/container_apps/main.tf index a6f4c2d3..cff9ccaf 100644 --- a/infra/container_apps/main.tf +++ b/infra/container_apps/main.tf @@ -20,7 +20,6 @@ module "container_app_onboarding_backend" { image_tag = var.image_tag app_settings = var.app_settings secrets_names = var.secrets_names - workload_profile_name = var.workload_profile_name tags = var.tags } diff --git a/infra/container_apps/variables.tf b/infra/container_apps/variables.tf index 75d15571..086ceb4a 100644 --- a/infra/container_apps/variables.tf +++ b/infra/container_apps/variables.tf @@ -77,9 +77,3 @@ variable "api_dns_zone_prefix" { default = "api.selfcare" description = "The dns subdomain." } - -variable "workload_profile_name" { - type = string - description = "Workload Profile name to use" - default = "Consumption" -}