From 15f4f465b32ec8091643abdcd2a2c2d0d9efd47f Mon Sep 17 00:00:00 2001 From: AngeloCaporaso Date: Tue, 21 May 2024 14:32:06 +0200 Subject: [PATCH 1/4] [PAGOPA-1678] chore: Update cache_generator_hostname --- src/domains/shared-app/05_authorizer_functions.tf | 15 +++++++-------- src/domains/shared-app/99_locals.tf | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/domains/shared-app/05_authorizer_functions.tf b/src/domains/shared-app/05_authorizer_functions.tf index 38bd13068f..71083eac6b 100644 --- a/src/domains/shared-app/05_authorizer_functions.tf +++ b/src/domains/shared-app/05_authorizer_functions.tf @@ -1,6 +1,5 @@ - +// todo: remove and destroy locals { - authorizer_functions_app_settings = { linux_fx_version = "JAVA|11" FUNCTIONS_WORKER_RUNTIME = "java" @@ -22,7 +21,7 @@ locals { IS_EC_ENROLLED_SQL_QUERY = "SELECT VALUE COUNT(i) FROM c JOIN i IN c.authorization WHERE c.domain = {domain} AND ARRAY_CONTAINS(c.authorization, {organizationFiscalCode})" } } - +// todo: remove and destroy # Subnet to host authorizer function module "authorizer_functions_snet" { source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//subnet?ref=v6.6.0" @@ -44,11 +43,11 @@ module "authorizer_functions_snet" { } } } - +// todo: remove and destroy data "azurerm_resource_group" "shared_rg" { name = "${local.project}-rg" } - +// todo: remove and destroy module "authorizer_function_app" { source = "git::https://github.com/pagopa/terraform-azurerm-v3.git//function_app?ref=v7.29.0" @@ -105,7 +104,7 @@ module "authorizer_function_app" { tags = var.tags } - +// todo: remove and destroy module "authorizer_function_app_slot_staging" { count = var.env_short == "p" ? 1 : 0 @@ -140,7 +139,7 @@ module "authorizer_function_app_slot_staging" { tags = var.tags } - +// todo: remove and destroy resource "azurerm_monitor_autoscale_setting" "authorizer_function" { count = var.env_short != "d" ? 1 : 0 @@ -203,7 +202,7 @@ resource "azurerm_monitor_autoscale_setting" "authorizer_function" { } } } - +// todo: remove and destroy data "azurerm_container_registry" "acr" { name = local.acr_name resource_group_name = local.acr_resource_group_name diff --git a/src/domains/shared-app/99_locals.tf b/src/domains/shared-app/99_locals.tf index af5b4d63b4..3b5d438998 100644 --- a/src/domains/shared-app/99_locals.tf +++ b/src/domains/shared-app/99_locals.tf @@ -38,8 +38,8 @@ locals { apim_hostname = "api.${var.apim_dns_zone_prefix}.${var.external_domain}" shared_hostname = var.env == "prod" ? "weuprod.shared.internal.platform.pagopa.it" : "weu${var.env}.shared.internal.${var.env}.platform.pagopa.it" - cache_generator_hostname = "${var.prefix}-${var.env_short}-${var.location_short}-shared-authorizer-fn.azurewebsites.net/api" - cache_generator_hostname_2 = "${var.prefix}-${var.env_short}-${var.location_short}-shared-authorizer-fn.azurewebsites.net" + cache_generator_hostname = "${local.shared_hostname}/authorizer-functions/api" + cache_generator_hostname_2 = "${local.shared_hostname}/authorizer-functions" authorizer_config_hostname = "${local.shared_hostname}/authorizer-config" From 0352f4799c1bdb973a353017c9491d102800ad37 Mon Sep 17 00:00:00 2001 From: AngeloCaporaso Date: Wed, 22 May 2024 09:56:05 +0200 Subject: [PATCH 2/4] [PAGOPA-1678] feat(shared): Add authorizer federated identity --- src/domains/shared-common/10_github_identity.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/domains/shared-common/10_github_identity.tf b/src/domains/shared-common/10_github_identity.tf index ffa17210f5..53ac1125a7 100644 --- a/src/domains/shared-common/10_github_identity.tf +++ b/src/domains/shared-common/10_github_identity.tf @@ -11,6 +11,8 @@ data "azurerm_kubernetes_cluster" "aks" { locals { repos_01 = [ "pagopa-shared-toolbox", + "pagopa-platform-authorizer", + "pagopa-platform-authorizer-config" ] federations_01 = [ From 90d13836f6a254374a3d0af30daca935524b4e72 Mon Sep 17 00:00:00 2001 From: AngeloCaporaso Date: Wed, 22 May 2024 14:29:14 +0200 Subject: [PATCH 3/4] [PAGOPA-1678] chore(shared): Update status-page --- src/domains/shared-app/04_apim_statuspage.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/domains/shared-app/04_apim_statuspage.tf b/src/domains/shared-app/04_apim_statuspage.tf index b6df76cf63..f3d7090d25 100644 --- a/src/domains/shared-app/04_apim_statuspage.tf +++ b/src/domains/shared-app/04_apim_statuspage.tf @@ -124,7 +124,7 @@ module "apim_api_statuspage_api_v1" { "apiconfigcacheo" = format("%s/api-config-cache/o", format(local.aks_path, "apiconfig")) "apiconfigcachep" = format("%s/api-config-cache/p", format(local.aks_path, "apiconfig")) "apiconfigselfcare" = format("%s/pagopa-api-config-selfcare-integration", format(local.aks_path, "apiconfig")) - "authorizer" = format("%s/", data.azurerm_function_app.authorizer.default_hostname) + "authorizer" = format("%s//authorizer-functions", format(local.aks_path, "shared")) "authorizerconfig" = format("%s//authorizer-config", format(local.aks_path, "shared")) "bizevents" = format("%s/pagopa-biz-events-service", format(local.aks_path, "bizevents")) "bizeventsdatastoreneg" = format("%s/pagopa-negative-biz-events-datastore-service", format(local.aks_path, "bizevents")) From d56fb21176172726dbfcb0ed4929dd9594170b6d Mon Sep 17 00:00:00 2001 From: AngeloCaporaso Date: Wed, 22 May 2024 18:53:48 +0200 Subject: [PATCH 4/4] [PAGOPA-1678] chore(shared): Update --- src/domains/shared-common/.terraform.lock.hcl | 16 ---------------- src/domains/shared-common/10_github_identity.tf | 3 ++- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/domains/shared-common/.terraform.lock.hcl b/src/domains/shared-common/.terraform.lock.hcl index 993f776a67..6f097ee15a 100644 --- a/src/domains/shared-common/.terraform.lock.hcl +++ b/src/domains/shared-common/.terraform.lock.hcl @@ -5,10 +5,6 @@ provider "registry.terraform.io/hashicorp/azuread" { version = "2.21.0" constraints = "2.21.0" hashes = [ - "h1:9gG6SWoUZZmmXbYBv6ra2RF5NYpamB9tGjsuBxrasFQ=", - "h1:KbY8dRdbfTwTzEBcdOFdD50JX8CUG5Mni25D2+k1rGc=", - "h1:akcofWscEl0ecIbf7lyEqRvPfOdA5q75EZvK8uSum1c=", - "h1:p9epRqujcxIMeT9THP0oNLGe4jjMBLjT5a7RntnFDaA=", "h1:qHYbB6LJsYPVUcd7QkZ5tU+IX+10VcUG4NzsmIuWdlE=", "zh:18c56e0478e8b3849f6d52f7e0ee495538e7fce66f22fc84a79599615e50ad1c", "zh:1b95ba8dddc46c744b2d2be7da6fafaa8ebd8368d46ff77416a95cb7d622251e", @@ -29,10 +25,6 @@ provider "registry.terraform.io/hashicorp/azurerm" { version = "3.84.0" constraints = ">= 3.30.0, <= 3.84.0, <= 3.85.0" hashes = [ - "h1:1Ucponuagrx5kNeIlcZwG2urqoRXBCTddDKqL265+xM=", - "h1:3KYwbI62e6u2f7ob9Ps8yahnIaNHkE56UsF0130zRzE=", - "h1:UJ3cVk6rVnpRjicml3wP66rYnsrdR5gkkmLpQw8wb/4=", - "h1:aoqNC2sfLKyblgQh0SfQW0BHl3UP1mMAUJLYLGG3PxE=", "h1:y/NWRLvnJmyJ5lf/AnLFy25jfyJqp6xwwxLxZnvovAs=", "zh:14a96daf672541dbc27137d9cc0a96a737710597262ecaaa64a328eb1174e5df", "zh:16d8e794fdd87ed8e64291fe8a617f420d8263f21672033333a020d06f4c9618", @@ -53,11 +45,7 @@ provider "registry.terraform.io/hashicorp/null" { version = "3.1.1" constraints = "3.1.1" hashes = [ - "h1:1J3nqAREzuaLE7x98LEELCCaMV6BRiawHSg9MmFvfQo=", - "h1:71sNUDvmiJcijsvfXpiLCz0lXIBSsEJjMxljt7hxMhw=", "h1:Pctug/s/2Hg5FJqjYcTM0kPyx3AoYK1MpRWO0T9V2ns=", - "h1:YvH6gTaQzGdNv+SKTZujU1O0bO+Pw6vJHOPhqgN8XNs=", - "h1:ZD4wyZ0KJzt5s2mD0xD7paJlVONNicLvZKdgtezz02I=", "zh:063466f41f1d9fd0dd93722840c1314f046d8760b1812fa67c34de0afcba5597", "zh:08c058e367de6debdad35fc24d97131c7cf75103baec8279aba3506a08b53faf", "zh:73ce6dff935150d6ddc6ac4a10071e02647d10175c173cfe5dca81f3d13d8afe", @@ -77,10 +65,6 @@ provider "registry.terraform.io/integrations/github" { version = "5.18.3" constraints = "5.18.3" hashes = [ - "h1:+WUsuR5XPYdbKwQi13GxEVKRV+JgkRa3Bw/HaCG/oeM=", - "h1:EKpGchrcouicFulbwG00s3NmXWsDDnlhffWqnGANSQQ=", - "h1:WbZvLB2qXKVoh4BvOOwFfEds+SZQrkINfSAWPnWFxGo=", - "h1:Z/0vjFX80YzM3Oeq0mBbn4XYwb1POggjsu3RVQcbjNc=", "h1:rv3mwpUeJ0n13sY+KZMI25WAVCSeipX4n8JMWKD1XcE=", "zh:050b37d96628cb7451137755929ca8d21ea546bc46d11a715652584070e83ff2", "zh:053051061f1b7f7673b0ceffac1f239ba28b0e5b375999206fd39976e85d9f2b", diff --git a/src/domains/shared-common/10_github_identity.tf b/src/domains/shared-common/10_github_identity.tf index 53ac1125a7..611ebb24e5 100644 --- a/src/domains/shared-common/10_github_identity.tf +++ b/src/domains/shared-common/10_github_identity.tf @@ -12,7 +12,8 @@ locals { repos_01 = [ "pagopa-shared-toolbox", "pagopa-platform-authorizer", - "pagopa-platform-authorizer-config" + "pagopa-platform-authorizer-config", + "pagopa-infra" ] federations_01 = [