From d148e26aeedb37680fd878dd34d8fb4e31869573 Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Fri, 19 Jan 2024 06:49:29 +0100 Subject: [PATCH] refactor: refactoring of code --- main.go | 8 ++++---- pkg/backup.go | 4 ++-- pkg/restore.go | 4 ++-- pkg/s3fs.go | 6 ++---- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/main.go b/main.go index 34fd4d3..aac2f42 100644 --- a/main.go +++ b/main.go @@ -160,7 +160,7 @@ func start() { if operation != "backup" { if storage != "s3" { utils.Info("Restore from local") - pkg.Restore(file) + pkg.RestoreDatabase(file) } else { utils.Info("Restore from s3") s3Restore() @@ -168,7 +168,7 @@ func start() { } else { if storage != "s3" { utils.Info("Backup to local storage") - pkg.Backup(disableCompression) + pkg.BackupDatabase(disableCompression) } else { utils.Info("Backup to s3 storage") s3Backup() @@ -182,7 +182,7 @@ func start() { } func s3Backup() { pkg.MountS3Storage(s3Path) - pkg.Backup(disableCompression) + pkg.BackupDatabase(disableCompression) } // Run in scheduled mode @@ -215,5 +215,5 @@ func scheduledMode() { func s3Restore() { // Restore database from S3 pkg.MountS3Storage(s3Path) - pkg.Restore(file) + pkg.RestoreDatabase(file) } diff --git a/pkg/backup.go b/pkg/backup.go index c70cbe1..4398a8e 100644 --- a/pkg/backup.go +++ b/pkg/backup.go @@ -22,8 +22,8 @@ var ( storagePath = "/backup" ) -// Backup backup database -func Backup(disableCompression bool) { +// BackupDatabase backup database +func BackupDatabase(disableCompression bool) { dbHost = os.Getenv("DB_HOST") dbPassword = os.Getenv("DB_PASSWORD") dbUserName = os.Getenv("DB_USERNAME") diff --git a/pkg/restore.go b/pkg/restore.go index 2fd7a73..ee8950e 100644 --- a/pkg/restore.go +++ b/pkg/restore.go @@ -8,8 +8,8 @@ import ( "path/filepath" ) -// Restore restore database -func Restore(file string) { +// RestoreDatabase restore database +func RestoreDatabase(file string) { dbHost = os.Getenv("DB_HOST") dbPassword = os.Getenv("DB_PASSWORD") dbUserName = os.Getenv("DB_USERNAME") diff --git a/pkg/s3fs.go b/pkg/s3fs.go index 42ffa26..a40dd81 100644 --- a/pkg/s3fs.go +++ b/pkg/s3fs.go @@ -21,15 +21,13 @@ var ( s3Endpoint = "" ) -func init() { +// MountS3Storage Mount s3 storage using s3fs +func MountS3Storage(s3Path string) { accessKey = os.Getenv("ACCESS_KEY") secretKey = os.Getenv("SECRET_KEY") bucketName = os.Getenv("BUCKETNAME") s3Endpoint = os.Getenv("S3_ENDPOINT") -} -// MountS3Storage Mount s3 storage using s3fs -func MountS3Storage(s3Path string) { if accessKey == "" || secretKey == "" || bucketName == "" { utils.Fatal("Please make sure all environment variables are set") } else {