Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions infrastructure/modules/container-apps/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ variable "environment" {
type = string
}

variable "env_vars_from_yaml" {
type = map(any)
}

variable "fetch_secrets_from_app_key_vault" {
description = <<EOT
Set to false initially to create and populate the app key vault.
Expand Down Expand Up @@ -215,12 +219,9 @@ locals {
database_name = "manage_breast_screening"
# Here we expect the environment to be in format pr-XXX. For example PR 1234 would have environment pr-1234 and port 2234
database_port = var.deploy_database_as_container ? try(tonumber(regex("\\d+", var.environment)), 24) + 1000 : 5432
env_vars_from_yaml = yamldecode(
file("${path.module}/../../environments/${var.env_config}/variables.yml")
)
external_url = "https://${module.frontdoor_endpoint.custom_domains["${var.environment}-domain"].host_name}/"
external_url = "https://${module.frontdoor_endpoint.custom_domains["${var.environment}-domain"].host_name}/"
common_env = merge(
local.env_vars_from_yaml,
var.env_vars_from_yaml,
{
SSL_MODE = "require"
DJANGO_ENV = var.env_config
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/modules/infra/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ module "app_insights_audit" {
log_analytics_workspace_id = module.log_analytics_workspace_audit.id

action_group_id = module.monitor_action_group.monitor_action_group.id
enable_alerting = var.enable_alerting
enable_alerting = var.enable_alerting && try(var.env_vars_from_yaml["SERVICE_ENABLED"], true)
}

module "private_link_scoped_service_law" {
Expand Down
3 changes: 3 additions & 0 deletions infrastructure/modules/infra/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ variable "environment" {
type = string
}

variable "env_vars_from_yaml" {
type = map(any)
}
variable "resource_group_name" {
description = "Infra resource group name"
type = string
Expand Down
2 changes: 2 additions & 0 deletions infrastructure/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ module "infra" {
infra_key_vault_rg = local.infra_key_vault_rg
app_short_name = var.app_short_name
environment = var.env_config
env_vars_from_yaml = local.env_vars_from_yaml
hub = var.hub
protect_keyvault = var.protect_keyvault
vnet_address_space = var.vnet_address_space
Expand Down Expand Up @@ -60,6 +61,7 @@ module "container-apps" {
enable_entra_id_authentication = var.enable_entra_id_authentication
environment = var.environment
env_config = var.env_config
env_vars_from_yaml = local.env_vars_from_yaml
fetch_secrets_from_app_key_vault = var.fetch_secrets_from_app_key_vault
deploy_infra = var.deploy_infra
front_door_profile = var.front_door_profile
Expand Down
4 changes: 4 additions & 0 deletions infrastructure/terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -210,4 +210,8 @@ locals {
resource_group_name = "rg-${var.app_short_name}-${var.env_config}-uks"
infra_key_vault_name = "kv-${var.app_short_name}-${var.env_config}-inf"
infra_key_vault_rg = "rg-${var.app_short_name}-${var.env_config}-infra"

env_vars_from_yaml = yamldecode(
file("${path.module}/../environments/${var.env_config}/variables.yml")
)
}
Loading