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.

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

feat(rds): psql Connection Command as Output #1036

Merged
merged 5 commits into from
May 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions modules/rds/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ Example - I want a new instance `rds-example-new` to be provisioned from a snaps
| Name | Description |
|------|-------------|
| <a name="output_exports"></a> [exports](#output\_exports) | Map of exports for use in deployment configuration templates |
| <a name="output_psql_helper"></a> [psql\_helper](#output\_psql\_helper) | A helper output to use with psql for connecting to this RDS instance. |
| <a name="output_rds_address"></a> [rds\_address](#output\_rds\_address) | Address of the instance |
| <a name="output_rds_arn"></a> [rds\_arn](#output\_rds\_arn) | ARN of the instance |
| <a name="output_rds_database_ssm_key_prefix"></a> [rds\_database\_ssm\_key\_prefix](#output\_rds\_database\_ssm\_key\_prefix) | SSM prefix |
Expand Down
2 changes: 2 additions & 0 deletions modules/rds/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ locals {
local.eks_security_groups,
var.security_group_ids
)

psql_access_enabled = local.enabled && (var.engine == "postgres")
}

module "rds_client_sg" {
Expand Down
17 changes: 17 additions & 0 deletions modules/rds/outputs.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
locals {
ssm_path_as_list = split("/", local.rds_database_password_path)
ssm_path_app = trim(join("/", slice(local.ssm_path_as_list, 0, length(local.ssm_path_as_list) - 1)), "/")
ssm_path_password_value = element(local.ssm_path_as_list, length(local.ssm_path_as_list) - 1)
psql_message = <<EOT
Use the following to connect to this RDS instance:
(You must have access to read the SSM parameter, have access to the private network if necessary, and have security group access)

PGPASSWORD=$(chamber read ${local.ssm_path_app} ${local.ssm_path_password_value} -q) psql --host=${module.rds_instance.instance_address} --port=${var.database_port} --username=${local.database_user} --dbname=${var.database_name}
EOT
}

output "rds_name" {
value = local.enabled ? var.database_name : null
description = "RDS DB name"
Expand Down Expand Up @@ -66,3 +78,8 @@ output "exports" {
}
description = "Map of exports for use in deployment configuration templates"
}

output "psql_helper" {
value = local.psql_access_enabled ? local.psql_message : ""
description = "A helper output to use with psql for connecting to this RDS instance."
}
5 changes: 3 additions & 2 deletions modules/rds/systems-manager.tf
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ variable "ssm_key_port" {
}

locals {
ssm_enabled = local.enabled && var.ssm_enabled
ssm_enabled = local.enabled && var.ssm_enabled
rds_database_password_path = format(var.ssm_key_format, var.ssm_key_prefix, var.name, var.ssm_key_password)
}

resource "aws_ssm_parameter" "rds_database_user" {
Expand All @@ -64,7 +65,7 @@ resource "aws_ssm_parameter" "rds_database_user" {
resource "aws_ssm_parameter" "rds_database_password" {
count = local.ssm_enabled ? 1 : 0

name = format(var.ssm_key_format, var.ssm_key_prefix, var.name, var.ssm_key_password)
name = local.rds_database_password_path
value = local.database_password
description = "RDS DB password"
type = "SecureString"
Expand Down
Loading