170237669 - Converts postgres secrets to use keyvault

This changes the configuration of the postgres master username and
password. Instead of committing to source (short term hack), this now
sources those secrets from KeyVault. Those secrets are generated and
populated via secrets-tool.
This commit is contained in:
Rob Gil 2020-01-17 13:30:00 -05:00
parent a4f2881a61
commit 9c429e35da
3 changed files with 29 additions and 9 deletions

View File

@ -75,13 +75,11 @@ variable "storage_auto_grow" {
variable "administrator_login" { variable "administrator_login" {
type = string type = string
description = "Administrator login" description = "Administrator login"
default = "atat_master" # FIXME - Remove with wrapper using KeyVault
} }
variable "administrator_login_password" { variable "administrator_login_password" {
type = string type = string
description = "Administrator password" description = "Administrator password"
default = "eI0l7yswwtuhHpwzoVjwRKdAcuGNsg" # FIXME - Remove with wrapper using KeyVault
} }
variable "postgres_version" { variable "postgres_version" {

View File

@ -1,8 +1,20 @@
module "sql" { data "azurerm_key_vault_secret" "postgres_username" {
source = "../../modules/postgres" name = "postgres-root-user"
name = var.name key_vault_id = module.operator_keyvault.id
owner = var.owner }
environment = var.environment
region = var.region data "azurerm_key_vault_secret" "postgres_password" {
subnet_id = module.vpc.subnets # FIXME - Should be a map of subnets and specify private name = "postgres-root-password"
key_vault_id = module.operator_keyvault.id
}
module "sql" {
source = "../../modules/postgres"
name = var.name
owner = var.owner
environment = var.environment
region = var.region
subnet_id = module.vpc.subnets # FIXME - Should be a map of subnets and specify private
administrator_login = data.azurerm_key_vault_secret.postgres_username.value
administrator_login_password = data.azurerm_key_vault_secret.postgres_password.value
} }

View File

@ -0,0 +1,10 @@
module "operator_keyvault" {
source = "../../modules/keyvault"
name = "operator"
region = var.region
owner = var.owner
environment = var.environment
tenant_id = var.tenant_id
principal_id = ""
admin_principals = var.admin_users
}