From ad853a5582a88b8b6985f9beee2912fb25249a5d Mon Sep 17 00:00:00 2001 From: Aman <146931382+amanravi-squareops@users.noreply.github.com> Date: Wed, 12 Mar 2025 19:18:40 +0530 Subject: [PATCH 1/7] added path module in the backup & restore module --- modules/db-backup-restore/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db-backup-restore/main.tf b/modules/db-backup-restore/main.tf index 472c2bc..a937d83 100644 --- a/modules/db-backup-restore/main.tf +++ b/modules/db-backup-restore/main.tf @@ -10,7 +10,7 @@ resource "helm_release" "postgresdb_backup" { count = var.postgresdb_backup_enabled ? 1 : 0 depends_on = [kubernetes_namespace.postgresdb] name = "postgresdb-backup" - chart = "../../modules/db-backup-restore/backup" + chart = "${path.module}/../../modules/db-backup-restore/backup" timeout = 600 namespace = var.namespace values = [ @@ -33,7 +33,7 @@ resource "helm_release" "postgresdb_restore" { count = var.postgresdb_restore_enabled ? 1 : 0 depends_on = [kubernetes_namespace.postgresdb] name = "postgresdb-restore" - chart = "../../modules/db-backup-restore/restore" + chart = "${path.module}/../../modules/db-backup-restore/restore" timeout = 600 namespace = var.namespace values = [ From e6777a14593e0677dcece3a1ef61741c5d505c3d Mon Sep 17 00:00:00 2001 From: Aman <146931382+amanravi-squareops@users.noreply.github.com> Date: Mon, 17 Mar 2025 14:32:52 +0530 Subject: [PATCH 2/7] changed the release version --- examples/complete/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 6a5c226..d0b3dba 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -103,7 +103,7 @@ module "vpc" { module "rds-pg" { source = "squareops/rds-postgresql/aws" - version = "2.0.0" + version = "2.0.1" name = local.name db_name = "test" multi_az = false From c12e6646b3ee4e951efa19e2760407d9d71c21a0 Mon Sep 17 00:00:00 2001 From: Aman <146931382+amanravi-squareops@users.noreply.github.com> Date: Wed, 19 Mar 2025 12:37:57 +0530 Subject: [PATCH 3/7] Update variables.tf --- modules/db-backup-restore/variables.tf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/db-backup-restore/variables.tf b/modules/db-backup-restore/variables.tf index 1a23f03..a5b5e83 100644 --- a/modules/db-backup-restore/variables.tf +++ b/modules/db-backup-restore/variables.tf @@ -94,10 +94,9 @@ variable "postgresdb_backup_config" { type = map(string) default = { bucket_uri = "" - s3_bucket_region = "" cron_for_full_backup = "" postgres_database_name = "" - # db_endpoint="" + } description = "configuration options for MySQL database backups. It includes properties such as the S3 bucket URI, the S3 bucket region, and the cron expression for full backups." } @@ -106,9 +105,6 @@ variable "postgresdb_restore_config" { type = any default = { bucket_uri = "" - file_name = "" - # s3_bucket_region = "" - DB_NAME = "" backup_file_name = "" } description = "Configuration options for restoring dump to the MySQL database." From 61d27f6be46c83b0bab021eed6f9077f60b6a293 Mon Sep 17 00:00:00 2001 From: Aman <146931382+amanravi-squareops@users.noreply.github.com> Date: Wed, 19 Mar 2025 12:38:29 +0530 Subject: [PATCH 4/7] Update variables.tf --- variables.tf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/variables.tf b/variables.tf index db9bf05..92ee426 100644 --- a/variables.tf +++ b/variables.tf @@ -347,10 +347,9 @@ variable "postgresdb_backup_config" { type = map(string) default = { bucket_uri = "" - # s3_bucket_region = "" cron_for_full_backup = "" postgres_database_name = "" - # db_endpoint="" + } description = "configuration options for MySQL database backups. It includes properties such as the S3 bucket URI, the S3 bucket region, and the cron expression for full backups." } @@ -360,7 +359,6 @@ variable "postgresdb_restore_config" { default = { bucket_uri = "" file_name = "" - # s3_bucket_region = "" } description = "Configuration options for restoring dump to the MySQL database." } From 70ef4119e1c0498789ac6f1f030500deddbfca65 Mon Sep 17 00:00:00 2001 From: Aman <146931382+amanravi-squareops@users.noreply.github.com> Date: Wed, 19 Mar 2025 13:08:47 +0530 Subject: [PATCH 5/7] Update variables.tf --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index 92ee426..710bcf2 100644 --- a/variables.tf +++ b/variables.tf @@ -351,7 +351,7 @@ variable "postgresdb_backup_config" { postgres_database_name = "" } - description = "configuration options for MySQL database backups. It includes properties such as the S3 bucket URI, the S3 bucket region, and the cron expression for full backups." + description = "configuration options for MySQL database backups. It includes properties such as the S3 bucket region, and the cron expression for full backups." } variable "postgresdb_restore_config" { From f0e949ab0ffbe1ae0899a4d321bebb9381230783 Mon Sep 17 00:00:00 2001 From: Aman <146931382+amanravi-squareops@users.noreply.github.com> Date: Wed, 19 Mar 2025 13:09:19 +0530 Subject: [PATCH 6/7] Update variables.tf --- modules/db-backup-restore/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/db-backup-restore/variables.tf b/modules/db-backup-restore/variables.tf index a5b5e83..e92b4ed 100644 --- a/modules/db-backup-restore/variables.tf +++ b/modules/db-backup-restore/variables.tf @@ -98,7 +98,7 @@ variable "postgresdb_backup_config" { postgres_database_name = "" } - description = "configuration options for MySQL database backups. It includes properties such as the S3 bucket URI, the S3 bucket region, and the cron expression for full backups." + description = "configuration options for MySQL database backups. It includes properties such as the S3 bucket URI, and the cron expression for full backups." } variable "postgresdb_restore_config" { From 4add7f13ce4de36b0cc1d5a3b3076896126bc80b Mon Sep 17 00:00:00 2001 From: Aman <146931382+amanravi-squareops@users.noreply.github.com> Date: Wed, 19 Mar 2025 13:09:39 +0530 Subject: [PATCH 7/7] Update variables.tf --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index 710bcf2..490a105 100644 --- a/variables.tf +++ b/variables.tf @@ -351,7 +351,7 @@ variable "postgresdb_backup_config" { postgres_database_name = "" } - description = "configuration options for MySQL database backups. It includes properties such as the S3 bucket region, and the cron expression for full backups." + description = "configuration options for MySQL database backups. It includes properties such as the S3 bucket URI, and the cron expression for full backups." } variable "postgresdb_restore_config" {