Merge pull request #153 from jkaninda/refactor

fix: S3 remote path when backing up multiple databases
jkaninda · Dec 7, 2024 · fd44429 · fd44429
2 parents 9a261b2 + 1940ceb
commit fd44429
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 32 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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 {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 (