From 3d8b942b1cb4ddd4c3c83fa4f301a54ef18aff8f Mon Sep 17 00:00:00 2001 From: Sandra Maria Peter <83961684+sandrampeter@users.noreply.github.com> Date: Mon, 15 Jul 2024 14:22:10 -0400 Subject: [PATCH] Revert "Enable db param for RPO for RDS Aurora (#338)" (#339) This reverts commit 8786a7b72679ceeda8398884bc97dbb1bb87196f. --- examples/standalone-aurora/main.tf | 2 -- examples/standalone-aurora/variables.tf | 12 ------------ main.tf | 2 -- modules/aurora_database_cluster/main.tf | 11 ----------- modules/aurora_database_cluster/variables.tf | 12 ------------ variables.tf | 12 ------------ 6 files changed, 51 deletions(-) diff --git a/examples/standalone-aurora/main.tf b/examples/standalone-aurora/main.tf index 5ec14f55..705ed80a 100644 --- a/examples/standalone-aurora/main.tf +++ b/examples/standalone-aurora/main.tf @@ -44,8 +44,6 @@ module "standalone_aurora" { aurora_cluster_instance_enable_single = var.aurora_cluster_instance_enable_single aurora_db_password = var.aurora_db_password aurora_db_username = var.aurora_db_username - aurora_parameter_group_family = var.aurora_parameter_group_family - aurora_global_db_rpo = var.aurora_global_db_rpo ami_id = data.aws_ami.ubuntu.id bypass_preflight_checks = true diff --git a/examples/standalone-aurora/variables.tf b/examples/standalone-aurora/variables.tf index 0f6da1b2..c6cf1e21 100644 --- a/examples/standalone-aurora/variables.tf +++ b/examples/standalone-aurora/variables.tf @@ -50,15 +50,3 @@ variable "aurora_cluster_instance_replica_count" { type = number description = "Number of extra cluster instances to create. Should be 0 if `aurora_cluster_instance_enable_single` is set to `true`." } - -variable "aurora_global_db_rpo" { - type = string - description = "Value of the RPO for the Aurora global database." - default = "55" -} - -variable "aurora_parameter_group_family" { - type = string - description = "RDS cluster parameter group" - default = "aurora-postgresql16" -} diff --git a/main.tf b/main.tf index bcd6b71c..5f1d1df8 100644 --- a/main.tf +++ b/main.tf @@ -126,8 +126,6 @@ module "aurora_database" { aurora_db_password = var.aurora_db_password aurora_cluster_instance_replica_count = var.aurora_cluster_instance_replica_count aurora_cluster_instance_enable_single = var.aurora_cluster_instance_enable_single - aurora_global_db_rpo = var.aurora_global_db_rpo - aurora_parameter_group_family = var.aurora_parameter_group_family db_backup_retention = var.aurora_db_backup_retention db_backup_window = var.db_backup_window diff --git a/modules/aurora_database_cluster/main.tf b/modules/aurora_database_cluster/main.tf index 9561b3ed..a7cd4b87 100644 --- a/modules/aurora_database_cluster/main.tf +++ b/modules/aurora_database_cluster/main.tf @@ -96,14 +96,3 @@ resource "aws_rds_cluster_instance" "cluster_instances_n" { engine = aws_rds_cluster.aurora_postgresql.engine engine_version = aws_rds_cluster.aurora_postgresql.engine_version } - -resource "aws_rds_cluster_parameter_group" "default" { - name = "aurora-postgresql" - family = var.aurora_parameter_group_family - description = "RDS cluster parameter group" - - parameter { - name = "rds.global_db_rpo" - value = var.aurora_global_db_rpo - } -} diff --git a/modules/aurora_database_cluster/variables.tf b/modules/aurora_database_cluster/variables.tf index 8ec1e2bb..86d12c49 100644 --- a/modules/aurora_database_cluster/variables.tf +++ b/modules/aurora_database_cluster/variables.tf @@ -29,18 +29,6 @@ variable "aurora_cluster_instance_enable_single" { description = "Creates a single rds cluster instance." } -variable "aurora_global_db_rpo" { - type = string - description = "Value of the RPO for the Aurora global database." - default = "55" -} - -variable "aurora_parameter_group_family" { - type = string - description = "RDS cluster parameter group" - default = "aurora-postgresql16" -} - variable "engine_version" { type = string description = "PostgreSQL version." diff --git a/variables.tf b/variables.tf index 66e285bd..00d7e299 100644 --- a/variables.tf +++ b/variables.tf @@ -237,18 +237,6 @@ variable "aurora_db_username" { } } -variable "aurora_global_db_rpo" { - type = string - description = "Value of the RPO for the Aurora global database." - default = "55" -} - -variable "aurora_parameter_group_family" { - type = string - description = "RDS cluster parameter group" - default = "aurora-postgresql16" -} - variable "aurora_postgres_engine_version" { type = string default = "16.2"