Merge pull request #24 from datarootsio/ISSUE-23/rds_versioning

Allowed custom RDS versioning

Author: dpfeif

README.md

@@ -122,6 +122,7 @@ For now the only authentication option is 'RBAC'. When enabling this, this modul
 | rds\_skip\_final\_snapshot | Whether or not to skip the final snapshot before deleting (mainly for tests) | `bool` | `false` | no |
 | rds\_storage\_type | One of `"standard"` (magnetic), `"gp2"` (general purpose SSD), or `"io1"` (provisioned IOPS SSD) | `string` | `"standard"` | no |
 | rds\_username | Username of rds | `string` | `"airflow"` | no |
+| rds\_version | The DB version to use for the RDS instance | `string` | `"12.7"` | no |
 | region | The region to deploy your solution to | `string` | `"eu-west-1"` | no |
 | resource\_prefix | A prefix for the create resources, example your company name (be aware of the resource name length) | `string` | n/a | yes |
 | resource\_suffix | A suffix for the created resources, example the environment for airflow to run in (be aware of the resource name length) | `string` | n/a | yes |

rds.tf

@@ -1,22 +1,23 @@
 resource "aws_db_instance" "airflow" {
-  count                     = var.postgres_uri != "" || var.airflow_executor == "Sequential" ? 0 : 1
-  name                      = replace(title(local.rds_name), "-", "")
-  allocated_storage         = var.rds_allocated_storage
-  storage_type              = var.rds_storage_type
-  engine                    = var.rds_engine
-  engine_version            = "11.8"
-  instance_class            = var.rds_instance_class
-  username                  = var.rds_username
-  password                  = var.rds_password
-  multi_az                  = false
-  availability_zone         = var.rds_availability_zone
-  publicly_accessible       = false
-  deletion_protection       = var.rds_deletion_protection
-  skip_final_snapshot       = var.rds_skip_final_snapshot
-  final_snapshot_identifier = "${var.resource_prefix}-airflow-${var.resource_suffix}-${local.timestamp_sanitized}"
-  identifier                = local.rds_name
-  vpc_security_group_ids    = [aws_security_group.airflow.id]
-  db_subnet_group_name      = aws_db_subnet_group.airflow[0].name
+  count                      = var.postgres_uri != "" || var.airflow_executor == "Sequential" ? 0 : 1
+  name                       = replace(title(local.rds_name), "-", "")
+  allocated_storage          = var.rds_allocated_storage
+  storage_type               = var.rds_storage_type
+  engine                     = var.rds_engine
+  engine_version             = var.rds_version
+  auto_minor_version_upgrade = false
+  instance_class             = var.rds_instance_class
+  username                   = var.rds_username
+  password                   = var.rds_password
+  multi_az                   = false
+  availability_zone          = var.rds_availability_zone
+  publicly_accessible        = false
+  deletion_protection        = var.rds_deletion_protection
+  skip_final_snapshot        = var.rds_skip_final_snapshot
+  final_snapshot_identifier  = "${var.resource_prefix}-airflow-${var.resource_suffix}-${local.timestamp_sanitized}"
+  identifier                 = local.rds_name
+  vpc_security_group_ids     = [aws_security_group.airflow.id]
+  db_subnet_group_name       = aws_db_subnet_group.airflow[0].name
 
   tags = local.common_tags
 }

variables.tf

@@ -264,6 +264,12 @@ variable "rds_deletion_protection" {
   default     = false
 }
 
+variable "rds_version" {
+  type        = string
+  description = "The DB version to use for the RDS instance"
+  default     = "12.7"
+}
+
 // S3 Bucket
 variable "s3_bucket_name" {
   type        = string