diff --git a/src/common/_modules/app_backend/app_settings.tf b/src/common/_modules/app_backend/app_settings.tf index 025dac23b..fc0d1841a 100644 --- a/src/common/_modules/app_backend/app_settings.tf +++ b/src/common/_modules/app_backend/app_settings.tf @@ -44,8 +44,8 @@ locals { CGN_OPERATOR_SEARCH_API_KEY = data.azurerm_key_vault_secret.app_backend_CGN_OPERATOR_SEARCH_API_KEY_PROD.value EUCOVIDCERT_API_URL = "https://${var.backend_hostnames.eucovidcert}/api/v1" EUCOVIDCERT_API_KEY = data.azurerm_key_vault_secret.fn_eucovidcert_API_KEY_APPBACKEND.value - APP_MESSAGES_API_URL = "https://${var.backend_hostnames.app_messages[(var.index - 1) % local.app_messages_count]}/api/v1" - APP_MESSAGES_API_KEY = data.azurerm_key_vault_secret.app_backend_APP_MESSAGES_API_KEY[(var.index - 1) % local.app_messages_count].value + APP_MESSAGES_API_URL = "https://${var.backend_hostnames.com_citizen_func}/api/v1" + APP_MESSAGES_API_KEY = data.azurerm_key_vault_secret.app_backend_COM_CITIZEN_FUNC_API_KEY.value LOLLIPOP_API_URL = "https://${var.backend_hostnames.lollipop}" LOLLIPOP_API_KEY = data.azurerm_key_vault_secret.app_backend_LOLLIPOP_ITN_API_KEY.value TRIAL_SYSTEM_API_URL = "https://ts-p-itn-api-func-01.azurewebsites.net" # not working anymore diff --git a/src/common/_modules/app_backend/data_kv.tf b/src/common/_modules/app_backend/data_kv.tf index 7b6e0f124..a5e69e9c7 100644 --- a/src/common/_modules/app_backend/data_kv.tf +++ b/src/common/_modules/app_backend/data_kv.tf @@ -65,9 +65,8 @@ data "azurerm_key_vault_secret" "app_backend_PECSERVER_ARUBA_TOKEN_SECRET" { key_vault_id = var.key_vault_common.id } -data "azurerm_key_vault_secret" "app_backend_APP_MESSAGES_API_KEY" { - count = local.app_messages_count - name = count.index % local.app_messages_count == 0 ? "appbackend-APP-MESSAGES-API-KEY" : format("appbackend-APP-MESSAGES-API-KEY-%02d", (count.index % local.app_messages_count) + 1) +data "azurerm_key_vault_secret" "app_backend_COM_CITIZEN_FUNC_API_KEY" { + name = "appbackend-COM-CITIZEN-FUNC-API-KEY" key_vault_id = var.key_vault_common.id } diff --git a/src/common/_modules/app_backend/locals.tf b/src/common/_modules/app_backend/locals.tf index 68e8fe909..2576a6c02 100644 --- a/src/common/_modules/app_backend/locals.tf +++ b/src/common/_modules/app_backend/locals.tf @@ -30,7 +30,6 @@ locals { citizen_auth_revoke_queue_name = "pubkeys-revoke-v2" function_app_count = length(var.backend_hostnames.app) - app_messages_count = length(var.backend_hostnames.app_messages) nonstandard = { weu = { diff --git a/src/common/_modules/app_backend/variables.tf b/src/common/_modules/app_backend/variables.tf index 44afdd42b..5ca202816 100644 --- a/src/common/_modules/app_backend/variables.tf +++ b/src/common/_modules/app_backend/variables.tf @@ -191,7 +191,7 @@ variable "app_settings_override" { variable "backend_hostnames" { type = object({ app = list(string) - app_messages = list(string) + com_citizen_func = string assets_cdn = string services_app_backend = string lollipop = string diff --git a/src/common/prod/README.md b/src/common/prod/README.md index 1c9451250..d28593030 100644 --- a/src/common/prod/README.md +++ b/src/common/prod/README.md @@ -53,7 +53,7 @@ | [azuread_service_principal.apim_client_svc](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/data-sources/service_principal) | data source | | [azuread_service_principal.dev_portal_svc](https://registry.terraform.io/providers/hashicorp/azuread/latest/docs/data-sources/service_principal) | data source | | [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config) | data source | -| [azurerm_linux_function_app.app_messages_xl](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/linux_function_app) | data source | +| [azurerm_linux_function_app.com_citizen_func](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/linux_function_app) | data source | | [azurerm_linux_function_app.eucovidcert](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/linux_function_app) | data source | | [azurerm_linux_function_app.function_assets_cdn](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/linux_function_app) | data source | | [azurerm_linux_function_app.function_profile](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/linux_function_app) | data source | diff --git a/src/common/prod/data.tf b/src/common/prod/data.tf index 4d452f25a..e2fff64d2 100644 --- a/src/common/prod/data.tf +++ b/src/common/prod/data.tf @@ -83,10 +83,9 @@ data "azurerm_linux_function_app" "function_profile" { resource_group_name = "${local.project_itn}-profile-rg-01" } -data "azurerm_linux_function_app" "app_messages_xl" { - count = local.app_messages_count - name = "${local.project_weu_legacy}-weu-com-citizen-func-0${count.index + 1}" - resource_group_name = "${local.project_weu_legacy}-weu-com-rg-01" +data "azurerm_linux_function_app" "com_citizen_func" { + name = "${local.project_itn}-com-citizen-func-01" + resource_group_name = "${local.project_itn}-com-rg-01" } data "azurerm_linux_function_app" "services_app_backend_function_app" { diff --git a/src/common/prod/locals.tf b/src/common/prod/locals.tf index f1a816698..f5b6a8e68 100644 --- a/src/common/prod/locals.tf +++ b/src/common/prod/locals.tf @@ -66,7 +66,7 @@ locals { backend_hostnames = { app = [data.azurerm_linux_function_app.function_profile.default_hostname] - app_messages = [for key, value in data.azurerm_linux_function_app.app_messages_xl : value.default_hostname] + com_citizen_func = data.azurerm_linux_function_app.com_citizen_func.default_hostname assets_cdn = data.azurerm_linux_function_app.function_assets_cdn.default_hostname services_app_backend = data.azurerm_linux_function_app.services_app_backend_function_app.default_hostname lollipop = data.azurerm_linux_function_app.lollipop_function.default_hostname