Merge pull request #14 from Datatamer/DEV-14396.p2

DEV-14396 Make DB port configurable

Author: daniosim

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Tamr Terraform Template Repo
 
+## v0.4.1 - Nov 6th 2020
+* Adds input `db_port` to configure port that postgres database accepts connections on
+* Fixes example so it accepts `ingress_sg_ids` as input
+
 ## v0.4.0 - Oct 27th 2020
 * Consolidates inputs `tamr_vm_sg_id` and `spark_cluster_sg_ids` into one input, `ingress_sg_ids`
 

README.md

@@ -61,6 +61,7 @@ This terraform module will create:
 | backup\_retention\_period | Backup retention period in days | `number` | `14` | no |
 | backup\_window | Backup window | `string` | `"03:29-03:59"` | no |
 | copy\_tags\_to\_snapshot | Copy tags to snapshots | `bool` | `true` | no |
+| db\_port | The port on which the database accepts connections. | `number` | `5432` | no |
 | engine\_version | Version of RDS Postgres | `string` | `"12.3"` | no |
 | identifier\_prefix | Identifier prefix for the RDS instance | `string` | `"tamr-rds-"` | no |
 | instance\_class | Instance class | `string` | `"db.m4.large"` | no |
@@ -78,6 +79,7 @@ This terraform module will create:
 
 | Name | Description |
 |------|-------------|
+| rds\_db\_port | n/a |
 | rds\_dbname | n/a |
 | rds\_hostname | n/a |
 | rds\_postgres\_id | ID of the of the RDS instance |

VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

examples/minimal/README.md

@@ -11,9 +11,8 @@ No provider.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| spark\_service\_access\_sg\_ids | List of Spark service access security group IDs to allow ingress from | `list(string)` | n/a | yes |
+| ingress\_sg\_ids | List of security group IDs to allow ingress from (i.e. Spark cluster SG IDs, Tamr VM SG ID) | `list(string)` | n/a | yes |
 | subnet\_ids | List of at least 2 subnets in different AZs for DB subnet group | `list(string)` | n/a | yes |
-| tamr\_vm\_sg\_id | Security group ID of Tamr VM to allow ingress from | `string` | n/a | yes |
 | vpc\_id | VPC ID of network. | `string` | n/a | yes |
 
 ## Outputs

examples/minimal/variables.tf

@@ -8,12 +8,7 @@ variable "subnet_ids" {
   description = "List of at least 2 subnets in different AZs for DB subnet group"
 }
 
-variable "spark_service_access_sg_ids" {
+variable "ingress_sg_ids" {
+  description = "List of security group IDs to allow ingress from (i.e. Spark cluster SG IDs, Tamr VM SG ID)"
   type        = list(string)
-  description = "List of Spark service access security group IDs to allow ingress from"
-}
-
-variable "tamr_vm_sg_id" {
-  type        = string
-  description = "Security group ID of Tamr VM to allow ingress from"
 }

main.tf

@@ -34,6 +34,7 @@ resource "aws_db_instance" "rds_postgres" {
 
   username = var.username
   password = var.password
+  port     = var.db_port
 
   db_subnet_group_name   = aws_db_subnet_group.rds_postgres_subnet_group.name
   multi_az               = true

outputs.tf

@@ -17,6 +17,10 @@ output "rds_hostname" {
   value = aws_db_instance.rds_postgres.address
 }
 
+output "rds_db_port" {
+  value = aws_db_instance.rds_postgres.port
+}
+
 output "rds_username" {
   value = aws_db_instance.rds_postgres.username
 }

variables.tf

@@ -9,6 +9,12 @@ variable "username" {
   default     = "tamr"
 }
 
+variable "db_port" {
+  description = "The port on which the database accepts connections."
+  type        = number
+  default     = 5432
+}
+
 variable "postgres_name" {
   description = "The name of the postgres database to create on the DB instance"
   type        = string