Merge pull request #7 from Datatamer/DEV-14200

DEV-14200 Add aws_db_subnet_group resource and variable changes

Author: daniosim

CHANGELOG.md

@@ -1,4 +1,10 @@
 # Tamr Terraform Template Repo
+
+## v0.3.0 - Sep 10th 2020
+* Adds creation of aws_db_subnet_group resource
+  * Adds variable rds_subnet_ids to specify subnet IDs in subnet group
+* Renames variable subnet_name to subnet_group_name
+
 ## v0.2.1 - Jun 22nd 2020
 * Adds variable "engine_version" to set the postgres version
 * Formatting and documentation updates

README.md

@@ -7,14 +7,15 @@ This repo follows the [terraform standard module structure](https://www.terrafor
 Inline example implementation of the module.  This is the most basic example of what it would look like to use this module.
 ```
 module "rds_postgres" {
-    source = "git::https://github.com/Datatamer/terraform-rds-postgres.git?ref=0.1.0"
+    source = "git::https://github.com/Datatamer/terraform-rds-postgres.git?ref=0.3.0"
     postgres_name = "example_rds_postgres"
     parameter_group_name = "example-rds-postgres-pg"
     identifier_prefix = "example-rds-"
     username = "exampleUsername"
     password = "examplePassword"
 
-    subnet_name = "example_subnet"
+    subnet_group_name = "example_subnet"
+    rds_subnet_ids = ["example-subnet-1", "example-subnet-2"]
     spark_cluster_sg_ids = ["sg-examplesecuritygroup1", "sg-examplesecuritygroup2"]
     tamr_vm_sg_id = "sg-exampletamrsecuritygroup"
     vpc_id = "vpc-examplevpcnetworkid"
@@ -48,6 +49,8 @@ This terraform module will create:
 | spark\_cluster\_sg\_ids | Security group is attached to the ec2 instances of EMR Spark | `list(string)` | n/a | yes |
 | tamr\_vm\_sg\_id | Security group id attached to the tamr vm | `string` | n/a | yes |
 | vpc\_id | VPC ID for the rds security group | `string` | n/a | yes |
+| subnet\_group\_name | The name of the subnet group to add the RDS instance to | `string` | n/a | yes |
+| rds\_subnet\_ids | List of subnet IDs to add to subnet group | `list(string)` | n/a | yes |
 | additional\_cidrs | Additional CIDR to connect to RDS Postgres instance | `list(string)` | `[]` | no |
 | additional\_tags | Additional tags to set on the RDS instance | `map` | `{}` | no |
 | allocated\_storage | Allocate storage | `number` | `20` | no |
@@ -66,7 +69,6 @@ This terraform module will create:
 | security\_group\_name | Name for the security group for the rds instance | `string` | `"tamr_rds_sg"` | no |
 | skip\_final\_snapshot | Skip final snapshot | `bool` | `true` | no |
 | storage\_type | Storage type (e.g. gp2, io1) | `string` | `"gp2"` | no |
-| subnet\_name | The name of the subnet to add the RDS instance to | `string` | `null` | no |
 | username | The postgres username | `string` | `"tamr"` | no |
 
 ## Outputs

VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

examples/minimal/main.tf

@@ -1,13 +1,14 @@
 module "rds_postgres" {
-  source               = "git::https://github.com/Datatamer/terraform-rds-postgres.git?ref=0.1.0"
+  source               = "git::https://github.com/Datatamer/terraform-rds-postgres.git?ref=0.3.0"
   postgres_name        = "example_rds_postgres"
   parameter_group_name = "example-rds-postgres-pg"
   identifier_prefix    = "example-rds-"
 
   username = "exampleUsername"
   password = "examplePassword"
 
-  subnet_name          = "example_subnet"
+  subnet_group_name    = "example_subnet"
+  rds_subnet_ids       = ["example-subnet-1", "example-subnet-2"]
   spark_cluster_sg_ids = ["sg-examplesecuritygroup1", "sg-examplesecuritygroup2"]
   tamr_vm_sg_id        = "sg-exampletamrsecuritygroup"
   vpc_id               = "vpc-examplevpcnetworkid"

main.tf

@@ -5,6 +5,11 @@ resource "aws_db_parameter_group" "rds_postgres_pg" {
   tags        = var.additional_tags
 }
 
+resource "aws_db_subnet_group" "rds_postgres_subnet_group" {
+  name       = var.subnet_group_name
+  subnet_ids = var.rds_subnet_ids
+}
+
 module "rds_sg" {
   source               = "./modules/rds-postgres-sg"
   spark_cluster_sg_ids = var.spark_cluster_sg_ids
@@ -31,7 +36,7 @@ resource "aws_db_instance" "rds_postgres" {
   username = var.username
   password = var.password
 
-  db_subnet_group_name   = var.subnet_name
+  db_subnet_group_name   = aws_db_subnet_group.rds_postgres_subnet_group.name
   multi_az               = true
   publicly_accessible    = false
   vpc_security_group_ids = [module.rds_sg.rds_sg_id]

variables.tf

@@ -81,10 +81,14 @@ variable "apply_immediately" {
   default     = false
 }
 
-variable "subnet_name" {
-  description = "The name of the subnet to add the RDS instance to"
+variable "subnet_group_name" {
+  description = "The name of the subnet group to add the RDS instance to"
   type        = string
-  default     = null
+}
+
+variable "rds_subnet_ids" {
+  description = "VPC subnet IDs in subnet group"
+  type        = list(string)
 }
 
 variable "copy_tags_to_snapshot" {