Merge pull request #46 from commitdev/fix-secret

davidcheung · web-flow · commit 46bd2574976e · 2020-06-26T10:55:37.000-04:00
secrets: remove name_prefix fixes
diff --git a/templates/terraform/modules/database/main.tf b/templates/terraform/modules/database/main.tf
@@ -32,8 +32,7 @@ data "aws_caller_identity" "current" {
 module "db_password" {
   source      = "../secret"
   type        = "random"
-  ## note: secret name_prefix has a limitation of 32 characters 
-  name_prefix = "${var.project}-${var.environment}-rds"
+  name = "${var.project}-${var.environment}-rds-<% index .Params `randomSeed` %>"
 }
 
 # secret declared so secret version waits for rds-secret to be ready
diff --git a/templates/terraform/modules/secret/main.tf b/templates/terraform/modules/secret/main.tf
@@ -1,6 +1,5 @@
 # Add the keys to AWS secrets manager
 resource "aws_secretsmanager_secret" "secret" {
-  name_prefix = var.name_prefix
   name = var.name
   tags = var.tags
 }
@@ -26,7 +25,7 @@ resource "aws_secretsmanager_secret_version" "random_secret" {
 resource "random_password" "random" {
   # this allows terraform state to have an identifier for generated passwords
   keepers = {
-    aws_secret = var.name_prefix
+    aws_secret = var.name
   }
   count             = var.type == "random" ? 1 : 0
   length            = var.random_length
diff --git a/templates/terraform/modules/secret/variables.tf b/templates/terraform/modules/secret/variables.tf
@@ -2,10 +2,6 @@ variable "name" {
   default = ""
   description = "The name of the secret in Secrets Manager (only one of name or name_prefix can be specified)"
 }
-variable "name_prefix" {
-  default = ""
-  description = "The name prefix of the secret in Secrets Manager - a random suffix will be appended (only one of name or name_prefix can be specified)"
-}
 
 variable type {
   description = "The type of data to hold in this secret (map, string, random)"

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,7 @@ data "aws_caller_identity" "current" {`
`32`	`32`	`module "db_password" {`
`33`	`33`	`source = "../secret"`
`34`	`34`	`type = "random"`
`35`		`- ## note: secret name_prefix has a limitation of 32 characters`
`36`		`- name_prefix = "${var.project}-${var.environment}-rds"`
	`35`	+ name = "${var.project}-${var.environment}-rds-<% index .Params `randomSeed` %>"
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`# secret declared so secret version waits for rds-secret to be ready`