Skip to content

feat: Azure Postgresql Flexible Server deployment #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patrickmoore-nc merged 1 commit into from
Oct 2, 2025
Merged

feat: Azure Postgresql Flexible Server deployment #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion infrastructure/environments/poc/variables.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ENV_CONFIG=poc
AZURE_SUBSCRIPTION="Lung Cancer Screening - Dev"
HUB_SUBSCRIPTION="Lung Cancer Screening - Dev"
STORAGE_ACCOUNT_RG=rg-tfstate-poc-uks
TERRAFORM_MODULES_REF=feat/public-container-app-env
TERRAFORM_MODULES_REF=main
ENABLE_SOFT_DELETE=false
DOCKER_IMAGE=docker.io/nginxdemos/hello
DOCKER_IMAGE_TAG=latest
2 changes: 1 addition & 1 deletion infrastructure/environments/poc/variables.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
deploy_database_as_container = true
deploy_database_as_container = false
features = {
front_door = false
hub_and_spoke = false
Expand Down
6 changes: 3 additions & 3 deletions infrastructure/modules/container-apps/data.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
data "azurerm_client_config" "current" {}

# data "azuread_group" "postgres_sql_admin_group" {
# display_name = var.postgres_sql_admin_group
# }
data "azuread_group" "postgres_sql_admin_group" {
display_name = var.postgres_sql_admin_group
}

data "azurerm_private_dns_zone" "storage" {
count = var.features.private_networking ? 1 : 0
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/modules/container-apps/output.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ output "internal_url" {
}

output "external_url" {
value = var.features.front_door ? "https://${module.frontdoor_endpoint.custom_domains["${var.environment}-domain"].host_name}/" : null
value = var.features.front_door ? "https://${module.frontdoor_endpoint[0].custom_domains["${var.environment}-domain"].host_name}/" : null
}
2 changes: 1 addition & 1 deletion infrastructure/modules/container-apps/postgres.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module "postgres" {

backup_retention_days = var.postgres_backup_retention_days
geo_redundant_backup_enabled = var.postgres_geo_redundant_backup_enabled
postgresql_admin_object_id = "" #data.azuread_group.postgres_sql_admin_group.object_id
postgresql_admin_object_id = data.azuread_group.postgres_sql_admin_group.object_id
postgresql_admin_principal_name = var.postgres_sql_admin_group
postgresql_admin_principal_type = "Group"
administrator_login = local.database_user
Expand Down
15 changes: 7 additions & 8 deletions infrastructure/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,11 @@ module "container-apps" {
postgres_backup_retention_days = var.postgres_backup_retention_days
postgres_geo_redundant_backup_enabled = var.postgres_geo_redundant_backup_enabled
postgres_sku_name = var.postgres_sku_name
# postgres_sql_admin_group = "postgres_${var.app_short_name}_${var.env_config}_uks_admin"
postgres_sql_admin_group = "Azure-Lung-Cancer-Screening---Dev-Owner"
postgres_storage_mb = var.postgres_storage_mb
postgres_storage_tier = var.postgres_storage_tier
postgres_subnet_id = var.deploy_infra ? module.infra[0].postgres_subnet_id : data.azurerm_subnet.postgres[0].id
main_subnet_id = var.deploy_infra ? module.infra[0].main_subnet_id : data.azurerm_subnet.main[0].id
seed_demo_data = var.seed_demo_data
use_apex_domain = var.use_apex_domain
postgres_sql_admin_group = "postgres_${var.app_short_name}_${var.env_config}_uks_admin"
postgres_storage_mb = var.postgres_storage_mb
postgres_storage_tier = var.postgres_storage_tier
postgres_subnet_id = var.deploy_infra ? module.infra[0].postgres_subnet_id : data.azurerm_subnet.postgres[0].id
main_subnet_id = var.deploy_infra ? module.infra[0].main_subnet_id : data.azurerm_subnet.main[0].id
seed_demo_data = var.seed_demo_data
use_apex_domain = var.use_apex_domain
}
Loading