Skip to content
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

Allows special characters for db password #325

Closed
wants to merge 9 commits into from
Closed

Allows special characters for db password #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d12270a
creates special character db pwds
theoskolnik Mar 27, 2024
71eee64
adds escapes for heredoc to compose
theoskolnik Mar 28, 2024
d859734
moves replace to config
theoskolnik Mar 28, 2024
8c9970c
removes try and adds index
theoskolnik Mar 28, 2024
a5765c4
try with index
theoskolnik Mar 28, 2024
d020c18
makes special chars change further down
theoskolnik Mar 28, 2024
f2608ec
sanity check
theoskolnik Mar 28, 2024
46aca28
adds back special chars
theoskolnik Mar 28, 2024
acb2557
forces dollar sign
theoskolnik Mar 28, 2024
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
2 changes: 1 addition & 1 deletion main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ module "database" {
# Docker Compose File Config for TFE on instance(s) using Flexible Deployment Options
# ------------------------------------------------------------------------------------
module "runtime_container_engine_config" {
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/runtime_container_engine_config?ref=main"
source = "git::https://github.com/hashicorp/terraform-random-tfe-utility//modules/runtime_container_engine_config?ref=special-db"
count = var.is_replicated_deployment ? 0 : 1

tfe_license = var.hc_license
Expand Down
24 changes: 13 additions & 11 deletions modules/database/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
# SPDX-License-Identifier: MPL-2.0

resource "random_string" "postgresql_password" {
length = 128
special = false
length = 128
special = true
min_special = 4
override_special = "$"
}

resource "aws_security_group" "postgresql" {
Expand Down Expand Up @@ -59,7 +61,7 @@ resource "aws_db_instance" "postgresql" {
instance_class = var.db_size
password = random_string.postgresql_password.result
# no special characters allowed
username = var.db_username
username = var.db_username

allow_major_version_upgrade = false
apply_immediately = true
Expand All @@ -74,12 +76,12 @@ resource "aws_db_instance" "postgresql" {
max_allocated_storage = 0
multi_az = true
# no special characters allowed
db_name = var.db_name
port = 5432
publicly_accessible = false
skip_final_snapshot = true
storage_encrypted = true
kms_key_id = var.kms_key_arn
storage_type = "gp2"
vpc_security_group_ids = [aws_security_group.postgresql.id]
db_name = var.db_name
port = 5432
publicly_accessible = false
skip_final_snapshot = true
storage_encrypted = true
kms_key_id = var.kms_key_arn
storage_type = "gp2"
vpc_security_group_ids = [aws_security_group.postgresql.id]
}
Loading