fix(aurora): fix db param group name (#50)

Young-ook · Aug 7, 2023 · 18ba13b · 18ba13b
1 parent 6a99fa3
commit 18ba13b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/label.tf b/label.tf
@@ -12,7 +12,7 @@ resource "random_string" "iid" {
 ### frigga name
 module "frigga" {
   source  = "Young-ook/spinnaker/aws//modules/frigga"
-  version = "2.3.5"
+  version = "3.0.0"
   name    = var.name == null || var.name == "" ? "rds" : var.name
   petname = var.name == null || var.name == "" ? true : false
 }

diff --git a/main.tf b/main.tf
@@ -41,16 +41,15 @@ resource "aws_security_group" "db" {
 
 ### network/subnets
 resource "aws_db_subnet_group" "db" {
-  name       = format("%s-db", local.name)
+  name       = local.name
   subnet_ids = var.subnets
   tags       = merge(local.default-tags, var.tags)
 }
 
 ### database/parameters
 resource "aws_rds_cluster_parameter_group" "db" {
-  name = format("%s-db-cluster-params", local.name)
-  tags = merge(local.default-tags, var.tags)
-
+  name   = local.name
+  tags   = merge(local.default-tags, var.tags)
   family = lookup(var.aurora_cluster, "family", local.default_cluster.family)
   dynamic "parameter" {
     for_each = lookup(var.aurora_cluster, "cluster_parameters", local.default_cluster.cluster_parameters)
@@ -67,11 +66,9 @@ resource "aws_rds_cluster_parameter_group" "db" {
 
 resource "aws_db_parameter_group" "db" {
   for_each = { for key, val in var.aurora_instances : key => val }
-  name     = format("%s-db-instance-%s-params", local.name, each.key)
+  name     = join("-", [local.name, random_string.iid[each.key].result])
   tags     = merge(local.default-tags, var.tags)
-
-
-  family = lookup(var.aurora_cluster, "family", local.default_cluster.family)
+  family   = lookup(var.aurora_cluster, "family", local.default_cluster.family)
   dynamic "parameter" {
     for_each = lookup(var.aurora_instances[each.key], "instance_parameters", local.default_instances.0.instance_parameters)
     content {