Merge branch 'main' of https://github.com/hashicorp/terraform-aws-ter…

…raform-enterprise into redis

main.tf

@@ -135,6 +135,8 @@ module "database" {
   network_subnets_private      = local.network_private_subnets
   tfe_instance_sg              = module.vm.tfe_instance_sg
   kms_key_arn                  = local.kms_key_arn
+  allow_major_version_upgrade  = var.allow_major_version_upgrade
+  allow_multiple_azs           = var.allow_multiple_azs
 }
 
 # -----------------------------------------------------------------------------

modules/database/main.tf

@@ -62,7 +62,7 @@ resource "aws_db_instance" "postgresql" {
   # no special characters allowed
   username = var.db_username
 
-  allow_major_version_upgrade = false
+  allow_major_version_upgrade = var.allow_major_version_upgrade
   apply_immediately           = true
   auto_minor_version_upgrade  = true
   backup_retention_period     = var.db_backup_retention
@@ -73,7 +73,7 @@ resource "aws_db_instance" "postgresql" {
   engine_version              = var.engine_version
   identifier_prefix           = "${var.friendly_name_prefix}-tfe"
   max_allocated_storage       = 0
-  multi_az                    = true
+  multi_az                    = var.allow_multiple_azs
   # no special characters allowed
   db_name                = var.db_name
   port                   = 5432

modules/database/variables.tf

@@ -65,3 +65,15 @@ variable "kms_key_arn" {
   description = "The Amazon Resource Name of the KMS key which will be used by the Redis Elasticache replication group to encrypt data at rest."
   type        = string
 }
+
+variable "allow_major_version_upgrade" {
+  type        = bool
+  description = "Determine whether postgres major version upgrade is required or not."
+  default     = false
+}
+
+variable "allow_multiple_azs" {
+  type        = bool
+  description = "Determine Amazon RDS Postgres deployment strategy."
+  default     = true
+}

outputs.tf

@@ -85,3 +85,8 @@ output "key" {
   value       = data.aws_kms_key.main.id
   description = "The KMS key used to encrypt data."
 }
+
+output "s3_bucket" {
+  value       = local.object_storage.s3_bucket
+  description = "S3 bucket name"
+}

variables.tf

@@ -196,6 +196,18 @@ variable "postgres_engine_version" {
   description = "PostgreSQL version."
 }
 
+variable "allow_major_version_upgrade" {
+  type        = bool
+  description = "Determine whether postgres major version upgrade is required or not."
+  default     = false
+}
+
+variable "allow_multiple_azs" {
+  type        = bool
+  description = "Determine Amazon RDS Postgres deployment strategy."
+  default     = true
+}
+
 # Aurora
 # ------
 variable "enable_aurora" {