Skip to content

secrets: remove name_prefix fixes #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidcheung merged 1 commit into from
Jun 26, 2020
Merged

secrets: remove name_prefix fixes #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions templates/terraform/modules/database/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions templates/terraform/modules/secret/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
Expand All @@ -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
Expand Down
4 changes: 0 additions & 4 deletions templates/terraform/modules/secret/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down