diff --git a/cmd/backup.go b/cmd/backup.go index 15acfc2..a9b3fc7 100644 --- a/cmd/backup.go +++ b/cmd/backup.go @@ -7,7 +7,7 @@ package cmd import ( - "github.com/jkaninda/pg-bkup/pkg" + "github.com/jkaninda/pg-bkup/internal" "github.com/jkaninda/pg-bkup/utils" "github.com/spf13/cobra" ) @@ -18,7 +18,7 @@ var BackupCmd = &cobra.Command{ Example: utils.BackupExample, Run: func(cmd *cobra.Command, args []string) { if len(args) == 0 { - pkg.StartBackup(cmd) + internal.StartBackup(cmd) } else { utils.Fatal(`"backup" accepts no argument %q`, args) diff --git a/cmd/migrate.go b/cmd/migrate.go index 9201d00..4cf0d34 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -7,7 +7,7 @@ package cmd import ( - "github.com/jkaninda/pg-bkup/pkg" + "github.com/jkaninda/pg-bkup/internal" "github.com/jkaninda/pg-bkup/utils" "github.com/spf13/cobra" ) @@ -17,7 +17,7 @@ var MigrateCmd = &cobra.Command{ Short: "Migrate database from a source database to a target database", Run: func(cmd *cobra.Command, args []string) { if len(args) == 0 { - pkg.StartMigration(cmd) + internal.StartMigration(cmd) } else { utils.Fatal(`"migrate" accepts no argument %q`, args) diff --git a/cmd/restore.go b/cmd/restore.go index 6e4069a..dc47b79 100644 --- a/cmd/restore.go +++ b/cmd/restore.go @@ -7,7 +7,7 @@ package cmd import ( - "github.com/jkaninda/pg-bkup/pkg" + "github.com/jkaninda/pg-bkup/internal" "github.com/jkaninda/pg-bkup/utils" "github.com/spf13/cobra" ) @@ -18,7 +18,7 @@ var RestoreCmd = &cobra.Command{ Example: utils.RestoreExample, Run: func(cmd *cobra.Command, args []string) { if len(args) == 0 { - pkg.StartRestore(cmd) + internal.StartRestore(cmd) } else { utils.Fatal(`"restore" accepts no argument %q`, args) diff --git a/internal/backup.go b/internal/backup.go index 6c5f140..93ef84d 100644 --- a/internal/backup.go +++ b/internal/backup.go @@ -1,10 +1,10 @@ -// Package pkg / +// Package internal / /***** @author Jonas Kaninda @license MIT License @Copyright © 2024 Jonas Kaninda **/ -package pkg +package internal import ( "fmt" diff --git a/internal/config.go b/internal/config.go index 2091260..0dbe6cb 100644 --- a/internal/config.go +++ b/internal/config.go @@ -1,10 +1,10 @@ -// Package pkg / +// Package internal / /***** @author Jonas Kaninda @license MIT License @Copyright © 2024 Jonas Kaninda **/ -package pkg +package internal import ( "fmt" diff --git a/internal/helper.go b/internal/helper.go index 4dbaa93..6865f33 100644 --- a/internal/helper.go +++ b/internal/helper.go @@ -1,10 +1,10 @@ -// Package pkg / +// Package internal / /***** @author Jonas Kaninda @license MIT License @Copyright © 2024 Jonas Kaninda **/ -package pkg +package internal import ( "bytes" diff --git a/internal/migrate.go b/internal/migrate.go index 7536aad..2e77048 100644 --- a/internal/migrate.go +++ b/internal/migrate.go @@ -1,10 +1,10 @@ -// Package pkg / +// Package internal / /***** @author Jonas Kaninda @license MIT License @Copyright © 2024 Jonas Kaninda **/ -package pkg +package internal import ( "fmt" diff --git a/internal/restore.go b/internal/restore.go index 56918b3..935090c 100644 --- a/internal/restore.go +++ b/internal/restore.go @@ -1,10 +1,10 @@ -// Package pkg / +// Package internal / /***** @author Jonas Kaninda @license MIT License @Copyright © 2024 Jonas Kaninda **/ -package pkg +package internal import ( "os" diff --git a/internal/var.go b/internal/var.go index 434f194..195efd9 100644 --- a/internal/var.go +++ b/internal/var.go @@ -1,10 +1,10 @@ -// Package pkg / +// Package internal / /***** @author Jonas Kaninda @license MIT License @Copyright © 2024 Jonas Kaninda **/ -package pkg +package internal const tmpPath = "/tmp/backup" const gpgHome = "/config/gnupg" diff --git a/utils/constant.go b/utils/constant.go index 4cf7fe6..36fa603 100644 --- a/utils/constant.go +++ b/utils/constant.go @@ -6,6 +6,8 @@ **/ package utils +import "os" + const RestoreExample = "restore --dbname database --file db_20231219_022941.sql.gz\n" + "restore --dbname database --storage s3 --path /custom-path --file db_20231219_022941.sql.gz" const BackupExample = "backup --dbname database --disable-compression\n" + @@ -14,3 +16,20 @@ const BackupExample = "backup --dbname database --disable-compression\n" + const MainExample = "backup --dbname database --disable-compression\n" + "backup --dbname database --storage s3 --path /custom-path\n" + "restore --dbname database --file db_20231219_022941.sql.gz" + +var Version string + +func VERSION(def string) string { + build := os.Getenv("VERSION") + if build == "" { + return def + } + return build +} +func FullVersion() string { + ver := Version + if b := VERSION(""); b != "" { + return b + } + return ver +} diff --git a/utils/logger.go b/utils/logger.go index 219196b..d9d1668 100644 --- a/utils/logger.go +++ b/utils/logger.go @@ -8,51 +8,52 @@ package utils import ( "fmt" + "log" "os" - "time" ) // Info message func Info(msg string, args ...any) { - var currentTime = time.Now().Format("2006/01/02 15:04:05") + log.SetOutput(os.Stdout) formattedMessage := fmt.Sprintf(msg, args...) if len(args) == 0 { - fmt.Printf("%s INFO: %s\n", currentTime, msg) + log.Printf("INFO: %s\n", msg) } else { - fmt.Printf("%s INFO: %s\n", currentTime, formattedMessage) + log.Printf("INFO: %s\n", formattedMessage) } } -// Warn Warning message +// Warn a Warning message func Warn(msg string, args ...any) { - var currentTime = time.Now().Format("2006/01/02 15:04:05") + log.SetOutput(os.Stdout) formattedMessage := fmt.Sprintf(msg, args...) if len(args) == 0 { - fmt.Printf("%s WARN: %s\n", currentTime, msg) + log.Printf("WARN: %s\n", msg) } else { - fmt.Printf("%s WARN: %s\n", currentTime, formattedMessage) + log.Printf("WARN: %s\n", formattedMessage) } } // Error error message func Error(msg string, args ...any) { - var currentTime = time.Now().Format("2006/01/02 15:04:05") + log.SetOutput(os.Stdout) formattedMessage := fmt.Sprintf(msg, args...) if len(args) == 0 { - fmt.Printf("%s ERROR: %s\n", currentTime, msg) + log.Printf("ERROR: %s\n", msg) } else { - fmt.Printf("%s ERROR: %s\n", currentTime, formattedMessage) + log.Printf("ERROR: %s\n", formattedMessage) + } } func Fatal(msg string, args ...any) { - var currentTime = time.Now().Format("2006/01/02 15:04:05") + log.SetOutput(os.Stdout) // Fatal logs an error message and exits the program. formattedMessage := fmt.Sprintf(msg, args...) if len(args) == 0 { - fmt.Printf("%s ERROR: %s\n", currentTime, msg) + log.Printf("ERROR: %s\n", msg) NotifyError(msg) } else { - fmt.Printf("%s ERROR: %s\n", currentTime, formattedMessage) + log.Printf("ERROR: %s\n", formattedMessage) NotifyError(formattedMessage) }