Skip to content

Commit

Permalink
Merge branch 'main' into IOPID-2550-disable-handlepkrevoke-old-lollipop
Browse files Browse the repository at this point in the history
  • Loading branch information
arcogabbo authored Dec 16, 2024
2 parents b3b41c4 + fd32eb2 commit 9538f85
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/common/prod/data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ data "azurerm_linux_function_app" "services_app_backend_function_app" {
}

data "azurerm_linux_function_app" "lollipop_function" {
name = "${local.project_itn}-lollipop-fn-01"
resource_group_name = "${local.project_itn}-lollipop-rg-01"
name = "${local.project_itn}-auth-lollipop-func-02"
resource_group_name = "${local.project_itn}-auth-lollipop-rg-02"
}

data "azurerm_linux_function_app" "eucovidcert" {
Expand Down
7 changes: 6 additions & 1 deletion src/domains/citizen-auth-app/07_data.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
data "azurerm_linux_function_app" "function_web_profile" {
name = format("%s-webprof-func-01", local.short_project_itn)
resource_group_name = format("%s-webprof-rg-01", local.short_project_itn)
}
}

data "azurerm_linux_function_app" "function_lollipop_itn_v2" {
name = format("%s-lollipop-func-02", local.short_project_itn)
resource_group_name = format("%s-lollipop-rg-02", local.short_project_itn)
}
2 changes: 1 addition & 1 deletion src/domains/citizen-auth-app/08_session_manager.tf
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ locals {

# Functions Lollipop config
LOLLIPOP_API_BASE_PATH = "/api/v1"
LOLLIPOP_API_URL = "https://${module.function_lollipop_itn.default_hostname}"
LOLLIPOP_API_URL = "https://${data.azurerm_linux_function_app.function_lollipop_itn_v2.default_hostname}"
LOLLIPOP_API_KEY = data.azurerm_key_vault_secret.functions_lollipop_api_key.value

LOLLIPOP_REVOKE_STORAGE_CONNECTION_STRING = data.azurerm_storage_account.lollipop_assertion_storage.primary_connection_string
Expand Down
1 change: 1 addition & 0 deletions src/domains/citizen-auth-app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
| [azurerm_key_vault_secret.session_manager_JWT_ZENDESK_SUPPORT_TOKEN_SECRET](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/key_vault_secret) | data source |
| [azurerm_key_vault_secret.session_manager_TEST_LOGIN_PASSWORD](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/key_vault_secret) | data source |
| [azurerm_key_vault_secret.session_manager_UNIQUE_EMAIL_ENFORCEMENT_USER](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/key_vault_secret) | data source |
| [azurerm_linux_function_app.function_lollipop_itn_v2](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/linux_function_app) | data source |
| [azurerm_linux_function_app.function_web_profile](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/linux_function_app) | data source |
| [azurerm_linux_function_app.itn_auth_lv_func](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/linux_function_app) | data source |
| [azurerm_log_analytics_workspace.log_analytics](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/log_analytics_workspace) | data source |
Expand Down
6 changes: 3 additions & 3 deletions src/domains/citizen-auth-common/06_data.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ data "azurerm_user_assigned_identity" "managed_identity_auth_n_identity_infra_cd

# ITN LOLLIPOP FUNCTION
data "azurerm_resource_group" "lollipop_function_rg" {
name = format("%s-itn-lollipop-rg-01", local.product)
name = format("%s-auth-lollipop-rg-02", local.common_project_itn)
}

data "azurerm_linux_function_app" "lollipop_function" {
name = format("%s-itn-lollipop-fn-01", local.product)
name = format("%s-auth-lollipop-func-02", local.common_project_itn)
resource_group_name = data.azurerm_resource_group.lollipop_function_rg.name
}
#######################
Expand Down Expand Up @@ -66,4 +66,4 @@ data "azurerm_linux_function_app" "functions_fast_login" {
data "azurerm_key_vault_secret" "functions_fast_login_api_key" {
name = "io-fn-weu-fast-login-KEY-APIM"
key_vault_id = module.key_vault.id
}
}

0 comments on commit 9538f85

Please sign in to comment.