Commit 04656f70 authored by Bryant Biggs's avatar Bryant Biggs Committed by GitHub

chore: correct examples and scenario where replicas are used (#317)

parent 07cb0b96
...@@ -89,7 +89,8 @@ module "master" { ...@@ -89,7 +89,8 @@ module "master" {
port = local.port port = local.port
multi_az = true multi_az = true
subnet_ids = module.vpc.database_subnets create_db_subnet_group = false
db_subnet_group_name = module.vpc.database_subnet_group_name
vpc_security_group_ids = [module.security_group.this_security_group_id] vpc_security_group_ids = [module.security_group.this_security_group_id]
maintenance_window = "Mon:00:00-Mon:03:00" maintenance_window = "Mon:00:00-Mon:03:00"
...@@ -101,9 +102,6 @@ module "master" { ...@@ -101,9 +102,6 @@ module "master" {
skip_final_snapshot = true skip_final_snapshot = true
deletion_protection = false deletion_protection = false
create_db_option_group = false
create_db_parameter_group = false
tags = local.tags tags = local.tags
} }
...@@ -130,12 +128,11 @@ module "replica" { ...@@ -130,12 +128,11 @@ module "replica" {
storage_encrypted = false storage_encrypted = false
# Username and password should not be set for replicas # Username and password should not be set for replicas
username = "" username = null
password = "" password = null
port = local.port port = local.port
multi_az = false multi_az = false
subnet_ids = module.vpc.database_subnets
vpc_security_group_ids = [module.security_group.this_security_group_id] vpc_security_group_ids = [module.security_group.this_security_group_id]
maintenance_window = "Tue:00:00-Tue:03:00" maintenance_window = "Tue:00:00-Tue:03:00"
...@@ -143,13 +140,11 @@ module "replica" { ...@@ -143,13 +140,11 @@ module "replica" {
enabled_cloudwatch_logs_exports = ["general"] enabled_cloudwatch_logs_exports = ["general"]
backup_retention_period = 0 backup_retention_period = 0
final_snapshot_identifier = local.name skip_final_snapshot = true
deletion_protection = false deletion_protection = false
# Not allowed to specify a subnet group for replicas in the same region # Not allowed to specify a subnet group for replicas in the same region
create_db_subnet_group = false create_db_subnet_group = false
create_db_option_group = false
create_db_parameter_group = false
tags = local.tags tags = local.tags
} }
...@@ -89,7 +89,8 @@ module "master" { ...@@ -89,7 +89,8 @@ module "master" {
port = local.port port = local.port
multi_az = true multi_az = true
subnet_ids = module.vpc.database_subnets create_db_subnet_group = false
db_subnet_group_name = module.vpc.database_subnet_group_name
vpc_security_group_ids = [module.security_group.this_security_group_id] vpc_security_group_ids = [module.security_group.this_security_group_id]
maintenance_window = "Mon:00:00-Mon:03:00" maintenance_window = "Mon:00:00-Mon:03:00"
...@@ -127,12 +128,11 @@ module "replica" { ...@@ -127,12 +128,11 @@ module "replica" {
storage_encrypted = false storage_encrypted = false
# Username and password should not be set for replicas # Username and password should not be set for replicas
username = "" username = null
password = "" password = null
port = local.port port = local.port
multi_az = false multi_az = false
subnet_ids = module.vpc.database_subnets
vpc_security_group_ids = [module.security_group.this_security_group_id] vpc_security_group_ids = [module.security_group.this_security_group_id]
maintenance_window = "Tue:00:00-Tue:03:00" maintenance_window = "Tue:00:00-Tue:03:00"
......
locals { locals {
db_subnet_group_name = coalesce(var.db_subnet_group_name, module.db_subnet_group.this_db_subnet_group_id) db_subnet_group_name = var.replicate_source_db != null ? null : coalesce(var.db_subnet_group_name, module.db_subnet_group.this_db_subnet_group_id)
parameter_group_name_id = var.create_db_parameter_group ? module.db_parameter_group.this_db_parameter_group_id : var.parameter_group_name parameter_group_name_id = var.create_db_parameter_group ? module.db_parameter_group.this_db_parameter_group_id : var.parameter_group_name
......
...@@ -60,8 +60,8 @@ resource "aws_db_instance" "this" { ...@@ -60,8 +60,8 @@ resource "aws_db_instance" "this" {
final_snapshot_identifier = var.skip_final_snapshot ? null : coalesce(var.final_snapshot_identifier, "${var.final_snapshot_identifier_prefix}-${var.identifier}-${random_id.snapshot_identifier[0].hex}") final_snapshot_identifier = var.skip_final_snapshot ? null : coalesce(var.final_snapshot_identifier, "${var.final_snapshot_identifier_prefix}-${var.identifier}-${random_id.snapshot_identifier[0].hex}")
performance_insights_enabled = var.performance_insights_enabled performance_insights_enabled = var.performance_insights_enabled
performance_insights_retention_period = var.performance_insights_enabled == true ? var.performance_insights_retention_period : null performance_insights_retention_period = var.performance_insights_enabled ? var.performance_insights_retention_period : null
performance_insights_kms_key_id = var.performance_insights_enabled == true ? var.performance_insights_kms_key_id : null performance_insights_kms_key_id = var.performance_insights_enabled ? var.performance_insights_kms_key_id : null
replicate_source_db = var.replicate_source_db replicate_source_db = var.replicate_source_db
backup_retention_period = var.backup_retention_period backup_retention_period = var.backup_retention_period
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment