Merge pull request #21 from souza-dan/engine-version

DEV-14965 - Removes patch version from the engine version

Author: souza-dan

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Tamr Terraform Template Repo
 
+## v3.0.0 - July 27th 2021
+* Updates default engine version to not specify a minor version
+* Adds new variable `auto_minor_version_upgrade` to allow AWS to upgrade RDS minor versions
+
 ## v2.1.0 - July 12nd 2021
 * Adds tags for RDS Subnet Group.
 * Adds new variable `tags` to set tags for all resources

README.md

@@ -7,7 +7,7 @@ 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-aws-rds-postgres.git?ref=2.0.0"
+  source               = "git::https://github.com/Datatamer/terraform-aws-rds-postgres.git?ref=x.y.z"
   postgres_name        = "example_rds_postgres"
   parameter_group_name = "example-rds-postgres-pg"
   identifier_prefix    = "example-rds-"
@@ -50,18 +50,19 @@ This terraform module will create:
 |------|-------------|------|---------|:--------:|
 | password | The password for the master DB user. | `string` | n/a | yes |
 | rds\_subnet\_ids | VPC subnet IDs in subnet group | `list(string)` | n/a | yes |
-| security\_group\_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 |
+| security\_group\_ids | List of security group IDs to associate | `list(string)` | n/a | yes |
 | subnet\_group\_name | The name of the subnet group to add the RDS instance to | `string` | n/a | yes |
 | vpc\_id | VPC ID for the rds security group | `string` | n/a | yes |
 | additional\_cidrs | Additional CIDR to connect to RDS Postgres instance | `list(string)` | `[]` | no |
 | additional\_tags | [DEPRECATED: Use `tags` instead] Additional tags to set on the RDS instance. | `map(string)` | `{}` | no |
 | allocated\_storage | Allocate storage | `number` | `20` | no |
 | apply\_immediately | Apply immediately, do not set this to true for production | `bool` | `false` | no |
+| auto\_minor\_version\_upgrade | Indicates that minor engine upgrades will be applied automatically to the DB instance during the maintenance window | `bool` | `true` | no |
 | 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 |
+| engine\_version | Version of RDS Postgres | `string` | `"12"` | no |
 | identifier\_prefix | Identifier prefix for the RDS instance | `string` | `"tamr-rds-"` | no |
 | instance\_class | Instance class | `string` | `"db.m4.large"` | no |
 | maintenance\_window | Maintenance window | `string` | `"sun:04:32-sun:05:02"` | no |

VERSION

@@ -1 +1 @@
-2.1.0
+3.0.0

examples/minimal/main.tf

@@ -1,5 +1,5 @@
 module "rds_postgres" {
-  # source               = "git::https://github.com/Datatamer/terraform-aws-rds-postgres.git?ref=2.0.0"
+  # source               = "git::https://github.com/Datatamer/terraform-aws-rds-postgres.git?ref=3.0.0"
   source = "../.."
 
   identifier_prefix    = "example-rds-pg-"
@@ -8,27 +8,27 @@ module "rds_postgres" {
   username             = "exampleUsername"
   password             = "examplePassword" #tfsec:ignore:GEN003
 
-  vpc_id             = var.vpc_id
-  subnet_group_name  = "example_subnet_group"
+  vpc_id            = var.vpc_id
+  subnet_group_name = "example_subnet_group"
   # Network requirement: DB subnet group needs a subnet in at least two Availability Zones
-  rds_subnet_ids = var.subnet_ids
+  rds_subnet_ids     = var.subnet_ids
   security_group_ids = module.rds-postgres-sg.security_group_ids
   tags               = var.tags
 }
 
 module "sg-ports" {
-  # source               = "git::https://github.com/Datatamer/terraform-aws-rds-postgres.git//modules/rds-postgres-ports?ref=2.0.0"
+  # source               = "git::https://github.com/Datatamer/terraform-aws-rds-postgres.git//modules/rds-postgres-ports?ref=3.0.0"
   source = "../../modules/rds-postgres-ports"
 }
 
 module "rds-postgres-sg" {
-  source = "git::[email protected]:Datatamer/terraform-aws-security-groups.git?ref=1.0.0"
-  vpc_id = var.vpc_id
+  source              = "git::[email protected]:Datatamer/terraform-aws-security-groups.git?ref=1.0.0"
+  vpc_id              = var.vpc_id
   ingress_cidr_blocks = var.ingress_cidr_blocks
-  egress_cidr_blocks = var.egress_cidr_blocks
-  ingress_ports  = module.sg-ports.ingress_ports
-  sg_name_prefix = var.name_prefix
-  egress_protocol = "all"
-  ingress_protocol = "tcp"
-  tags = var.tags
+  egress_cidr_blocks  = var.egress_cidr_blocks
+  ingress_ports       = module.sg-ports.ingress_ports
+  sg_name_prefix      = var.name_prefix
+  egress_protocol     = "all"
+  ingress_protocol    = "tcp"
+  tags                = var.tags
 }

examples/minimal/outputs.tf

@@ -1,5 +1,5 @@
 output "ingress_ports" {
-  value = module.sg-ports
+  value       = module.sg-ports
   description = "List of ingress ports"
 }
 

examples/minimal/variables.tf

@@ -19,21 +19,20 @@ variable "name_prefix" {
 
 variable "ingress_cidr_blocks" {
   description = "CIDR blocks to attach to security groups for ingress"
-  type = list(string)
+  type        = list(string)
 }
 
 variable "egress_cidr_blocks" {
   description = "CIDR blocks to attach to security groups for egress"
-  type = list(string)
-  default = ["0.0.0.0/0"]
+  type        = list(string)
+  default     = ["0.0.0.0/0"]
 }
 
 variable "tags" {
   type        = map(string)
   description = "A map of tags to add to all resources created by this example."
-  default     = { 
-    Author = "Tamr"
+  default = {
+    Author      = "Tamr"
     Environment = "Example"
   }
 }
-

main.tf

@@ -24,9 +24,10 @@ resource "aws_db_instance" "rds_postgres" {
   storage_type          = var.storage_type
   storage_encrypted     = true
 
-  engine         = "postgres"
-  engine_version = var.engine_version
-  instance_class = var.instance_class
+  engine                     = "postgres"
+  engine_version             = var.engine_version
+  instance_class             = var.instance_class
+  auto_minor_version_upgrade = var.auto_minor_version_upgrade
 
   username = var.username
   password = var.password

modules/rds-postgres-ports/outputs.tf

@@ -1,7 +1,7 @@
 output "ingress_ports" {
   value = concat(
-  var.ports,
-  var.additional_ports,
+    var.ports,
+    var.additional_ports,
   )
   description = "List of ingress ports"
 }

variables.tf

@@ -140,11 +140,17 @@ variable "additional_cidrs" {
 variable "engine_version" {
   description = "Version of RDS Postgres"
   type        = string
-  default     = "12.3"
+  default     = "12"
 }
 
 variable "parameter_group_family" {
   description = "The family of the DB parameter group"
   type        = string
   default     = "postgres12"
 }
+
+variable "auto_minor_version_upgrade" {
+  default     = true
+  type        = bool
+  description = "Indicates that minor engine upgrades will be applied automatically to the DB instance during the maintenance window"
+}