From 5202ff866b71eca3023088f8cdb84d07396731c1 Mon Sep 17 00:00:00 2001
From: Pierre Mavro <pmavro@qovery.com>
Date: Thu, 25 Mar 2021 23:40:56 +0100
Subject: [PATCH] fix: several aws database final snapshot issues

---
 lib/aws/services/common/providers.j2.tf | 2 +-
 lib/aws/services/mongodb/main.j2.tf     | 2 +-
 lib/aws/services/mysql/main.j2.tf       | 2 +-
 lib/aws/services/postgresql/main.j2.tf  | 2 +-
 tests/aws/aws_databases.rs              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/aws/services/common/providers.j2.tf b/lib/aws/services/common/providers.j2.tf
index 963f1412..277e6e6c 100644
--- a/lib/aws/services/common/providers.j2.tf
+++ b/lib/aws/services/common/providers.j2.tf
@@ -1,7 +1,7 @@
 provider "aws" {
   profile    = "default"
   region     = "{{ region }}"
-  version    = "~> 3.18.0"
+  version    = "~> 3.33.0"
   access_key = "{{ aws_access_key }}"
   secret_key = "{{ aws_secret_key }}"
 }
diff --git a/lib/aws/services/mongodb/main.j2.tf b/lib/aws/services/mongodb/main.j2.tf
index 2750d683..41cd0a54 100644
--- a/lib/aws/services/mongodb/main.j2.tf
+++ b/lib/aws/services/mongodb/main.j2.tf
@@ -117,5 +117,5 @@ resource "aws_docdb_cluster" "documentdb_cluster" {
   # Backups
   backup_retention_period = var.backup_retention_period
   preferred_backup_window = var.preferred_backup_window
-  skip_final_snapshot = var.delete_automated_backups
+  skip_final_snapshot = var.skip_final_snapshot
 }
diff --git a/lib/aws/services/mysql/main.j2.tf b/lib/aws/services/mysql/main.j2.tf
index a6ca45bf..0fa05824 100644
--- a/lib/aws/services/mysql/main.j2.tf
+++ b/lib/aws/services/mysql/main.j2.tf
@@ -131,7 +131,7 @@ resource "aws_db_instance" "mysql_instance" {
   # Backups
   backup_retention_period = var.backup_retention_period
   backup_window = var.backup_window
-  skip_final_snapshot = var.delete_automated_backups
+  skip_final_snapshot = var.skip_final_snapshot
   delete_automated_backups = var.delete_automated_backups
 
 }
diff --git a/lib/aws/services/postgresql/main.j2.tf b/lib/aws/services/postgresql/main.j2.tf
index 2a2a8aff..e3ebb02b 100644
--- a/lib/aws/services/postgresql/main.j2.tf
+++ b/lib/aws/services/postgresql/main.j2.tf
@@ -115,7 +115,7 @@ resource "aws_db_instance" "postgresql_instance" {
   # Backups
   backup_retention_period = var.backup_retention_period
   backup_window = var.backup_window
-  skip_final_snapshot = var.delete_automated_backups
+  skip_final_snapshot = var.skip_final_snapshot
   delete_automated_backups = var.delete_automated_backups
 
 }
diff --git a/tests/aws/aws_databases.rs b/tests/aws/aws_databases.rs
index 4ee62653..8b281fd7 100644
--- a/tests/aws/aws_databases.rs
+++ b/tests/aws/aws_databases.rs
@@ -70,7 +70,7 @@ fn postgresql_failover_dev_environment_with_all_options() {
     let span = span!(
         Level::INFO,
         "test",
-        name = "postgresql_deploy_a_working_development_environment_with_all_options"
+        name = "postgresql_failover_dev_environment_with_all_options"
     );
     let _enter = span.enter();