From 07d580a8a93460d9e29dd34c59163d733f2a3a71 Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Sat, 7 Dec 2024 02:22:35 +0100 Subject: [PATCH 1/2] refactoring of code --- cmd/backup.go | 2 +- cmd/migrate.go | 2 +- cmd/restore.go | 5 +++-- cmd/root.go | 2 +- cmd/version.go | 2 +- main.go | 2 +- pkg/backup.go | 1 + pkg/config.go | 2 +- pkg/helper.go | 2 +- pkg/migrate.go | 2 +- pkg/restore.go | 6 +++--- pkg/var.go | 2 +- utils/config.go | 5 +++-- utils/constant.go | 2 +- utils/logger.go | 20 ++++++++++---------- utils/notification.go | 4 ++-- utils/utils.go | 2 +- 17 files changed, 33 insertions(+), 30 deletions(-) diff --git a/cmd/backup.go b/cmd/backup.go index fd00fc1..a17b7e2 100644 --- a/cmd/backup.go +++ b/cmd/backup.go @@ -1,4 +1,3 @@ -// Package cmd / /* MIT License @@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + package cmd import ( diff --git a/cmd/migrate.go b/cmd/migrate.go index c31129c..dcfc6fa 100644 --- a/cmd/migrate.go +++ b/cmd/migrate.go @@ -1,4 +1,3 @@ -// Package cmd / /* MIT License @@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + package cmd import ( diff --git a/cmd/restore.go b/cmd/restore.go index fd18bca..c7fca9f 100644 --- a/cmd/restore.go +++ b/cmd/restore.go @@ -1,5 +1,3 @@ -package cmd - /* MIT License @@ -23,6 +21,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + +package cmd + import ( "github.com/jkaninda/mysql-bkup/pkg" "github.com/jkaninda/mysql-bkup/utils" diff --git a/cmd/root.go b/cmd/root.go index d03cfc0..c8400bd 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,4 +1,3 @@ -// Package cmd / /* MIT License @@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + package cmd import ( diff --git a/cmd/version.go b/cmd/version.go index 52fa177..2ed5e20 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -1,4 +1,3 @@ -// Package cmd / /* MIT License @@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + package cmd import ( diff --git a/main.go b/main.go index 33e5906..e92e569 100644 --- a/main.go +++ b/main.go @@ -1,4 +1,3 @@ -// Package main / /* MIT License @@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + package main import "github.com/jkaninda/mysql-bkup/cmd" diff --git a/pkg/backup.go b/pkg/backup.go index 5e5f359..4c51bcf 100644 --- a/pkg/backup.go +++ b/pkg/backup.go @@ -22,6 +22,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + package pkg import ( diff --git a/pkg/config.go b/pkg/config.go index 50f3c4c..223dc8b 100644 --- a/pkg/config.go +++ b/pkg/config.go @@ -1,4 +1,3 @@ -// Package internal / /* MIT License @@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + package pkg import ( diff --git a/pkg/helper.go b/pkg/helper.go index 0bfac62..d8db4ba 100644 --- a/pkg/helper.go +++ b/pkg/helper.go @@ -1,4 +1,3 @@ -// Package internal / /* MIT License @@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + package pkg import ( diff --git a/pkg/migrate.go b/pkg/migrate.go index 5929596..ac77a95 100644 --- a/pkg/migrate.go +++ b/pkg/migrate.go @@ -1,4 +1,3 @@ -// Package internal / /* MIT License @@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + package pkg import ( diff --git a/pkg/restore.go b/pkg/restore.go index f4b4b1d..a8bc46f 100644 --- a/pkg/restore.go +++ b/pkg/restore.go @@ -1,6 +1,3 @@ -// Package internal / -package pkg - /* MIT License @@ -24,6 +21,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + +package pkg + import ( "github.com/jkaninda/encryptor" "github.com/jkaninda/go-storage/pkg/local" diff --git a/pkg/var.go b/pkg/var.go index a25ad57..5c7cf96 100644 --- a/pkg/var.go +++ b/pkg/var.go @@ -1,4 +1,3 @@ -// Package internal / /* MIT License @@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + package pkg const tmpPath = "/tmp/backup" diff --git a/utils/config.go b/utils/config.go index f821006..0afb6a6 100644 --- a/utils/config.go +++ b/utils/config.go @@ -1,5 +1,3 @@ -package utils - /* MIT License @@ -23,6 +21,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + +package utils + import "os" type MailConfig struct { diff --git a/utils/constant.go b/utils/constant.go index 5ec1282..6fa2b51 100644 --- a/utils/constant.go +++ b/utils/constant.go @@ -1,4 +1,3 @@ -// Package utils / /* MIT License @@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + package utils const RestoreExample = "restore --dbname database --file db_20231219_022941.sql.gz\n" + diff --git a/utils/logger.go b/utils/logger.go index ac7b2de..cfc08c0 100644 --- a/utils/logger.go +++ b/utils/logger.go @@ -1,13 +1,3 @@ -package utils - -import ( - "fmt" - "log" - "os" - "runtime" - "strings" -) - /* MIT License @@ -32,6 +22,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +package utils + +import ( + "fmt" + "log" + "os" + "runtime" + "strings" +) + // Info returns info log func Info(msg string, args ...interface{}) { log.SetOutput(getStd("/dev/stdout")) diff --git a/utils/notification.go b/utils/notification.go index a1111d8..538e10d 100644 --- a/utils/notification.go +++ b/utils/notification.go @@ -1,5 +1,3 @@ -package utils - /* MIT License @@ -24,6 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +package utils + import ( "bytes" "crypto/tls" diff --git a/utils/utils.go b/utils/utils.go index 58ffcf6..3a138a9 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -1,4 +1,3 @@ -// Package utils / /* MIT License @@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + package utils import ( From 1940ceba9a37b603551c1311761981b1034e342a Mon Sep 17 00:00:00 2001 From: Jonas Kaninda Date: Sat, 7 Dec 2024 02:25:22 +0100 Subject: [PATCH 2/2] fix: S3 remote path when backing up multiple databases --- pkg/s3.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/s3.go b/pkg/s3.go index 22bba6f..7fcab57 100644 --- a/pkg/s3.go +++ b/pkg/s3.go @@ -59,7 +59,7 @@ func s3Backup(db *dbConfig, config *BackupConfig) { Region: awsConfig.region, DisableSsl: awsConfig.disableSsl, ForcePathStyle: awsConfig.forcePathStyle, - RemotePath: awsConfig.remotePath, + RemotePath: config.remotePath, LocalPath: tmpPath, }) if err != nil { @@ -120,7 +120,7 @@ func s3Restore(db *dbConfig, conf *RestoreConfig) { Region: awsConfig.region, DisableSsl: awsConfig.disableSsl, ForcePathStyle: awsConfig.forcePathStyle, - RemotePath: awsConfig.remotePath, + RemotePath: conf.remotePath, LocalPath: tmpPath, }) if err != nil {