fixed restore database

amanravi-squareops · amanravi-squareops · commit aa63d18628f2 · 2025-02-07T17:02:49.000+05:30
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -6,7 +6,7 @@ locals {
   environment             = "prod"
   create_namespace        = true
   namespace               = "pg"
-  engine_version          = "15.4"
+  engine_version          = "15.7"
   instance_class          = "db.t4g.micro"
   storage_type            = "gp3"
   cluster_name            = ""
@@ -92,7 +92,7 @@ module "vpc" {
   name                    = local.name
   vpc_cidr                = local.vpc_cidr
   environment             = local.environment
-  availability_zones      = ["us-east-1a", "us-east-1b"]
+  availability_zones      = ["us-east-2a", "us-east-2b"]
   public_subnet_enabled   = true
   auto_assign_public_ip   = true
   intra_subnet_enabled    = false
@@ -104,14 +104,14 @@ module "vpc" {
 module "rds-pg" {
   source                           = "squareops/rds-postgresql/aws"
   version                          = "2.0.0"
-  name                             = local.name
-  db_name                          = "test"
-  multi_az                         = false
-  family                           = local.family
+  name     = local.name
+  db_name  = "test"
+  multi_az = false
+  family   = local.family
   vpc_id                           = module.vpc.vpc_id
-  allowed_security_groups          = local.allowed_security_groups
+  allowed_security_groups = local.allowed_security_groups
   subnet_ids                       = module.vpc.database_subnets
-  environment                      = local.environment
+  environment = local.environment
   kms_key_arn                      = module.kms.key_arn
   storage_type                     = local.storage_type
   engine_version                   = local.engine_version
@@ -141,13 +141,14 @@ module "rds-pg" {
   create_namespace          = local.create_namespace
   postgresdb_backup_enabled = false
   postgresdb_backup_config = {
-    postgres_database_name = ""                              # Specify the database name or Leave empty if you wish to backup all databases
-    cron_for_full_backup   = "*/2 * * * *"                   # set cronjob for backup
-    bucket_uri             = "s3://postgres-backups-atmosly" # s3 bucket uri
+    postgres_database_name = ""                    # Specify the database name or Leave empty if you wish to backup all databases
+    cron_for_full_backup   = "*/2 * * * *"                    # set cronjob for backup
+    bucket_uri             = "s3://my-backup-dumps-databases" # s3 bucket uri
   }
-  postgresdb_restore_enabled = false
+  postgresdb_restore_enabled = true
   postgresdb_restore_config = {
-    bucket_uri       = "s3://postgres-backups-atmosly" #S3 bucket URI (without a trailing slash /) containing the backup dump file.
-    backup_file_name = "db5_20241114111607.sql"        #Give .sql or .zip file for restore
+    bucket_uri       = "s3://my-backup-dumps-databases" #S3 bucket URI (without a trailing slash /) containing the backup dump file.
+    backup_file_name = "atmosly_db1.sql"                #Give .sql or .zip file for restore
   }
 }
+
diff --git a/examples/complete/provider.tf b/examples/complete/provider.tf
@@ -5,11 +5,11 @@ provider "aws" {
   }
 }
 data "aws_eks_cluster" "cluster" {
-  name = ""
+  name = local.cluster_name
 
 }
 data "aws_eks_cluster_auth" "cluster" {
-  name = ""
+  name = local.cluster_name
 }
 
 provider "kubernetes" {
diff --git a/main.tf b/main.tf
@@ -323,6 +323,7 @@ resource "aws_lambda_permission" "sns_lambda_slack_invoke" {
 module "backup_restore" {
   depends_on                = [module.db]
   source                    = "./modules/db-backup-restore"
+  name                      = var.name
   cluster_name              = var.cluster_name
   namespace                 = var.namespace
   create_namespace          = var.create_namespace
@@ -331,20 +332,17 @@ module "backup_restore" {
     db_username            = var.master_username
     db_password            = var.custom_user_password != "" ? var.custom_user_password : nonsensitive(random_password.master[0].result)
     postgres_database_name = var.postgresdb_backup_config.postgres_database_name
-    # s3_bucket_region     = var.postgresdb_backup_config.s3_bucket_region
-    cron_for_full_backup = var.postgresdb_backup_config.cron_for_full_backup
-    bucket_uri           = var.postgresdb_backup_config.bucket_uri
-    db_endpoint          = replace(var.replica_enable ? module.db_replica[0].db_instance_endpoint : module.db.db_instance_endpoint, ":5432", "")
+    cron_for_full_backup   = var.postgresdb_backup_config.cron_for_full_backup
+    bucket_uri             = var.postgresdb_backup_config.bucket_uri
+    db_endpoint            = replace(var.replica_enable ? module.db_replica[0].db_instance_endpoint : module.db.db_instance_endpoint, ":5432", "")
   }
 
   postgresdb_restore_enabled = var.postgresdb_restore_enabled
   postgresdb_restore_config = {
-    db_endpoint = replace(var.replica_enable ? module.db_replica[0].db_instance_endpoint : module.db.db_instance_endpoint, ":5432", "")
-    db_username = var.master_username
-    db_password = var.custom_user_password != "" ? var.custom_user_password : nonsensitive(random_password.master[0].result)
-    bucket_uri  = var.postgresdb_restore_config.bucket_uri
-    # s3_bucket_region = var.postgresdb_restore_config.s3_bucket_region
-    # DB_NAME          = var.postgresdb_restore_config.DB_NAME,
+    db_endpoint      = replace(var.replica_enable ? module.db_replica[0].db_instance_endpoint : module.db.db_instance_endpoint, ":5432", "")
+    db_username      = var.master_username
+    db_password      = var.custom_user_password != "" ? var.custom_user_password : nonsensitive(random_password.master[0].result)
+    bucket_uri       = var.postgresdb_restore_config.bucket_uri
     backup_file_name = var.postgresdb_restore_config.backup_file_name,
   }
 }
diff --git a/modules/db-backup-restore/backup/templates/cronjob.yaml b/modules/db-backup-restore/backup/templates/cronjob.yaml
@@ -18,7 +18,7 @@ spec:
           serviceAccountName: sa-postgres-backup
           containers:
           - name: backup-postgresdb
-            image: squareops01/rds-postgresql-backup:v1
+            image: squareops01/rds-postgresql-backup:v2
             imagePullPolicy: Always
             command: ["/backup/backup_script.sh"]
             env:
diff --git a/modules/db-backup-restore/main.tf b/modules/db-backup-restore/main.tf
@@ -22,7 +22,7 @@ resource "helm_release" "postgresdb_backup" {
       db_username            = var.postgresdb_backup_config.db_username,
       # s3_bucket_region           = var.postgresdb_backup_config.s3_bucket_region ,
       cron_for_full_backup = var.postgresdb_backup_config.cron_for_full_backup,
-      annotations          = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn: ${aws_iam_role.postgres_backup_role.arn}" : "iam.gke.io/gcp-service-account: ${var.service_account_backup}"
+      annotations          = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn: ${aws_iam_role.postgres_backup_role[count.index].arn}" : "iam.gke.io/gcp-service-account: ${var.service_account_backup}"
     })
   ]
 }
@@ -43,7 +43,7 @@ resource "helm_release" "postgresdb_restore" {
       db_password      = var.postgresdb_restore_config.db_password,
       db_username      = var.postgresdb_restore_config.db_username,
       backup_file_name = var.postgresdb_restore_config.backup_file_name,
-      annotations      = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn: ${aws_iam_role.postgres_restore_role.arn}" : "iam.gke.io/gcp-service-account: ${var.service_account_restore}"
+      annotations      = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn: ${aws_iam_role.postgres_restore_role[count.index].arn}" : "iam.gke.io/gcp-service-account: ${var.service_account_restore}"
     })
   ]
 }
diff --git a/modules/db-backup-restore/restore/templates/job.yaml b/modules/db-backup-restore/restore/templates/job.yaml
@@ -9,7 +9,7 @@ spec:
       serviceAccountName: sa-postgres-restore
       containers:
         - name: restore-postgresdb
-          image: squareops01/rds-postgresql-restore:v1
+          image: squareops01/rds-postgresql-restore:v2
           imagePullPolicy: Always
           command: ["/restore/restore_script.sh"]
           env:
diff --git a/modules/db-backup-restore/roles.tf b/modules/db-backup-restore/roles.tf
@@ -13,7 +13,8 @@ data "aws_eks_cluster" "kubernetes_cluster" {
 }
 
 resource "aws_iam_role" "postgres_backup_role" {
-  name = format("%s-%s-%s", var.cluster_name, var.name, "postgres-backup-rds")
+  count = var.postgresdb_backup_enabled ? 1 : 0
+  name  = format("%s-%s-%s", var.cluster_name, var.name, "postgres-backup-rds")
   assume_role_policy = jsonencode({
     Version = "2012-10-17",
     Statement = [
@@ -56,6 +57,7 @@ resource "aws_iam_role" "postgres_backup_role" {
 
 
 resource "aws_iam_role" "postgres_restore_role" {
+  count = var.postgresdb_restore_enabled ? 1 : 0
   name = format("%s-%s-%s", var.cluster_name, var.name, "postgres-restore")
   assume_role_policy = jsonencode({
     Version = "2012-10-17",
@@ -95,4 +97,4 @@ resource "aws_iam_role" "postgres_restore_role" {
       ]
     })
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@ provider "aws" {`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`	`data "aws_eks_cluster" "cluster" {`
`8`		`- name = ""`
	`8`	`+ name = local.cluster_name`
`9`	`9`
`10`	`10`	`}`
`11`	`11`	`data "aws_eks_cluster_auth" "cluster" {`
`12`		`- name = ""`
	`12`	`+ name = local.cluster_name`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`provider "kubernetes" {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ resource "helm_release" "postgresdb_backup" {`
`22`	`22`	`db_username = var.postgresdb_backup_config.db_username,`
`23`	`23`	`# s3_bucket_region = var.postgresdb_backup_config.s3_bucket_region ,`
`24`	`24`	`cron_for_full_backup = var.postgresdb_backup_config.cron_for_full_backup,`
`25`		`- annotations = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn: ${aws_iam_role.postgres_backup_role.arn}" : "iam.gke.io/gcp-service-account: ${var.service_account_backup}"`
	`25`	`+ annotations = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn: ${aws_iam_role.postgres_backup_role[count.index].arn}" : "iam.gke.io/gcp-service-account: ${var.service_account_backup}"`
`26`	`26`	`})`
`27`	`27`	`]`
`28`	`28`	`}`
`@@ -43,7 +43,7 @@ resource "helm_release" "postgresdb_restore" {`
`43`	`43`	`db_password = var.postgresdb_restore_config.db_password,`
`44`	`44`	`db_username = var.postgresdb_restore_config.db_username,`
`45`	`45`	`backup_file_name = var.postgresdb_restore_config.backup_file_name,`
`46`		`- annotations = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn: ${aws_iam_role.postgres_restore_role.arn}" : "iam.gke.io/gcp-service-account: ${var.service_account_restore}"`
	`46`	`+ annotations = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn: ${aws_iam_role.postgres_restore_role[count.index].arn}" : "iam.gke.io/gcp-service-account: ${var.service_account_restore}"`
`47`	`47`	`})`
`48`	`48`	`]`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@ data "aws_eks_cluster" "kubernetes_cluster" {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`resource "aws_iam_role" "postgres_backup_role" {`
`16`		`- name = format("%s-%s-%s", var.cluster_name, var.name, "postgres-backup-rds")`
	`16`	`+ count = var.postgresdb_backup_enabled ? 1 : 0`
	`17`	`+ name = format("%s-%s-%s", var.cluster_name, var.name, "postgres-backup-rds")`
`17`	`18`	`assume_role_policy = jsonencode({`
`18`	`19`	`Version = "2012-10-17",`
`19`	`20`	`Statement = [`
`@@ -56,6 +57,7 @@ resource "aws_iam_role" "postgres_backup_role" {`
`56`	`57`
`57`	`58`
`58`	`59`	`resource "aws_iam_role" "postgres_restore_role" {`
	`60`	`+ count = var.postgresdb_restore_enabled ? 1 : 0`
`59`	`61`	`name = format("%s-%s-%s", var.cluster_name, var.name, "postgres-restore")`
`60`	`62`	`assume_role_policy = jsonencode({`
`61`	`63`	`Version = "2012-10-17",`
`@@ -95,4 +97,4 @@ resource "aws_iam_role" "postgres_restore_role" {`
`95`	`97`	`]`
`96`	`98`	`})`
`97`	`99`	`}`
`98`		`-}`
	`100`	`+}`