Skip to content

Commit f57e6a6

Browse files
committed
update
1 parent 3b00854 commit f57e6a6

File tree

1 file changed

+3
-37
lines changed

1 file changed

+3
-37
lines changed

main.tf

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
locals {
2-
db_subnet_group_name = var.db_subnet_group_name != "" ? var.db_subnet_group_name : element(concat(aws_db_subnet_group.main.*.id, [""]), 0)
3-
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)
4-
option_group_name = var.option_group_name != "" ? var.option_group_name : element(concat(aws_db_option_group.main.*.id, [""]), 0)
5-
}
6-
71

82
#Module : label
93
#Description : This terraform module is designed to generate consistent label names and
@@ -33,34 +27,6 @@ resource "aws_db_subnet_group" "main" {
3327
)
3428
}
3529

36-
resource "aws_db_parameter_group" "main_no_prefix" {
37-
count = var.enabled ? 1 : 0
38-
39-
name = format("%s%sparameter-no-prefix", module.labels.id, var.delimiter)
40-
description = format("Database parameter group for%s%s",var.delimiter,module.labels.id)
41-
family = var.family
42-
43-
dynamic "parameter" {
44-
for_each = var.parameters
45-
content {
46-
name = parameter.value.name
47-
value = parameter.value.value
48-
apply_method = lookup(parameter.value, "apply_method", null)
49-
}
50-
}
51-
52-
tags = merge(
53-
module.labels.tags,
54-
{
55-
"Name" = format("%s%sparameter-no-prefix", module.labels.id, var.delimiter)
56-
}
57-
)
58-
59-
lifecycle {
60-
create_before_destroy = true
61-
}
62-
}
63-
6430
resource "aws_db_parameter_group" "main" {
6531
count = var.enabled ? 1 : 0
6632

@@ -159,9 +125,9 @@ resource "aws_db_instance" "this" {
159125
snapshot_identifier = var.snapshot_identifier
160126

161127
vpc_security_group_ids = var.vpc_security_group_ids
162-
db_subnet_group_name = local.db_subnet_group_name
163-
parameter_group_name = local.parameter_group_name_id
164-
option_group_name = local.option_group_name
128+
db_subnet_group_name = join("", aws_db_subnet_group.main.*.id)
129+
parameter_group_name = join("", aws_db_parameter_group.main.*.id)
130+
option_group_name = join("",aws_db_option_group.main.*.id)
165131

166132
availability_zone = var.availability_zone
167133
multi_az = var.multi_az

0 commit comments

Comments
 (0)