From 23edaff2c4dc8fdba3dc57ba6423f85c8358ee94 Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <me@jonaskaninda.com>
Date: Wed, 23 Oct 2024 11:59:48 +0200
Subject: [PATCH 1/2] refactor: update logger, fix warning message

---
 pkg/backup.go  | 8 ++++----
 pkg/restore.go | 2 +-
 utils/utils.go | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkg/backup.go b/pkg/backup.go
index ab54a63..6c5f140 100644
--- a/pkg/backup.go
+++ b/pkg/backup.go
@@ -245,7 +245,7 @@ func localBackup(db *dbConfig, config *BackupConfig) {
 	}
 	fileInfo, err := os.Stat(filepath.Join(tmpPath, finalFileName))
 	if err != nil {
-		utils.Error("Error:", err)
+		utils.Error("Error: %s", err)
 	}
 	backupSize = fileInfo.Size()
 	utils.Info("Backup name is %s", finalFileName)
@@ -319,7 +319,7 @@ func s3Backup(db *dbConfig, config *BackupConfig) {
 	//Get backup info
 	fileInfo, err := os.Stat(filepath.Join(tmpPath, finalFileName))
 	if err != nil {
-		utils.Error("Error:", err)
+		utils.Error("Error: %s", err)
 	}
 	backupSize = fileInfo.Size()
 
@@ -388,7 +388,7 @@ func sshBackup(db *dbConfig, config *BackupConfig) {
 	//Get backup info
 	fileInfo, err := os.Stat(filepath.Join(tmpPath, finalFileName))
 	if err != nil {
-		utils.Error("Error:", err)
+		utils.Error("Error: %s", err)
 	}
 	backupSize = fileInfo.Size()
 	utils.Info("Backup saved in %s", filepath.Join(config.remotePath, finalFileName))
@@ -455,7 +455,7 @@ func ftpBackup(db *dbConfig, config *BackupConfig) {
 	//Get backup info
 	fileInfo, err := os.Stat(filepath.Join(tmpPath, finalFileName))
 	if err != nil {
-		utils.Error("Error:", err)
+		utils.Error("Error: %s", err)
 	}
 	backupSize = fileInfo.Size()
 	//Delete backup file from tmp folder
diff --git a/pkg/restore.go b/pkg/restore.go
index 0fa87ee..888d473 100644
--- a/pkg/restore.go
+++ b/pkg/restore.go
@@ -101,7 +101,7 @@ func restoreFromRemote(db *dbConfig, conf *RestoreConfig) {
 	}
 	err = sshStorage.CopyFrom(conf.file)
 	if err != nil {
-		utils.Fatal("Error copying backup file: %w", err)
+		utils.Fatal("Error copying backup file: %s", err)
 	}
 	RestoreDatabase(db, conf)
 }
diff --git a/utils/utils.go b/utils/utils.go
index dffbbf4..2898057 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -203,7 +203,7 @@ func CronNextTime(cronExpr string) time.Time {
 	// Parse the cron expression
 	schedule, err := cron.ParseStandard(cronExpr)
 	if err != nil {
-		Error("Error parsing cron expression:", err)
+		Error("Error parsing cron expression: %s", err)
 		return time.Time{}
 	}
 	// Get the current time

From 37b2fb6303903b0dce604300590e165f009cfb56 Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <me@jonaskaninda.com>
Date: Wed, 23 Oct 2024 12:00:41 +0200
Subject: [PATCH 2/2] refactor: clean up

---
 pkg/restore.go | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkg/restore.go b/pkg/restore.go
index 888d473..56918b3 100644
--- a/pkg/restore.go
+++ b/pkg/restore.go
@@ -7,6 +7,10 @@
 package pkg
 
 import (
+	"os"
+	"os/exec"
+	"path/filepath"
+
 	"github.com/jkaninda/encryptor"
 	"github.com/jkaninda/go-storage/pkg/ftp"
 	"github.com/jkaninda/go-storage/pkg/local"
@@ -14,9 +18,6 @@ import (
 	"github.com/jkaninda/go-storage/pkg/ssh"
 	"github.com/jkaninda/pg-bkup/utils"
 	"github.com/spf13/cobra"
-	"os"
-	"os/exec"
-	"path/filepath"
 )
 
 func StartRestore(cmd *cobra.Command) {
@@ -52,10 +53,6 @@ func localRestore(dbConf *dbConfig, restoreConf *RestoreConfig) {
 }
 func restoreFromS3(db *dbConfig, conf *RestoreConfig) {
 	utils.Info("Restore database from s3")
-	//err := DownloadFile(tmpPath, conf.file, conf.bucket, conf.s3Path)
-	//if err != nil {
-	//	utils.Fatal("Error download file from s3 %s %v ", conf.file, err)
-	//}
 	awsConfig := initAWSConfig()
 	if conf.remotePath == "" {
 		conf.remotePath = awsConfig.remotePath