Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
anmolnagpal committed Aug 19, 2020
1 parent 3b00854 commit f57e6a6
Showing 1 changed file with 3 additions and 37 deletions.
40 changes: 3 additions & 37 deletions main.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
locals {
db_subnet_group_name = var.db_subnet_group_name != "" ? var.db_subnet_group_name : element(concat(aws_db_subnet_group.main.*.id, [""]), 0)
parameter_group_name_id = var.parameter_group_name != "" ? var.parameter_group_name : element(concat(aws_db_parameter_group.main.*.id, aws_db_parameter_group.main_no_prefix.*.id, [""]), 0)
option_group_name = var.option_group_name != "" ? var.option_group_name : element(concat(aws_db_option_group.main.*.id, [""]), 0)
}


#Module : label
#Description : This terraform module is designed to generate consistent label names and
Expand Down Expand Up @@ -33,34 +27,6 @@ resource "aws_db_subnet_group" "main" {
)
}

resource "aws_db_parameter_group" "main_no_prefix" {
count = var.enabled ? 1 : 0

name = format("%s%sparameter-no-prefix", module.labels.id, var.delimiter)
description = format("Database parameter group for%s%s",var.delimiter,module.labels.id)
family = var.family

dynamic "parameter" {
for_each = var.parameters
content {
name = parameter.value.name
value = parameter.value.value
apply_method = lookup(parameter.value, "apply_method", null)
}
}

tags = merge(
module.labels.tags,
{
"Name" = format("%s%sparameter-no-prefix", module.labels.id, var.delimiter)
}
)

lifecycle {
create_before_destroy = true
}
}

resource "aws_db_parameter_group" "main" {
count = var.enabled ? 1 : 0

Expand Down Expand Up @@ -159,9 +125,9 @@ resource "aws_db_instance" "this" {
snapshot_identifier = var.snapshot_identifier

vpc_security_group_ids = var.vpc_security_group_ids
db_subnet_group_name = local.db_subnet_group_name
parameter_group_name = local.parameter_group_name_id
option_group_name = local.option_group_name
db_subnet_group_name = join("", aws_db_subnet_group.main.*.id)
parameter_group_name = join("", aws_db_parameter_group.main.*.id)
option_group_name = join("",aws_db_option_group.main.*.id)

availability_zone = var.availability_zone
multi_az = var.multi_az
Expand Down

0 comments on commit f57e6a6

Please sign in to comment.