Skip to content

Commit fd44429

Browse files
authored
Merge pull request #153 from jkaninda/refactor
fix: S3 remote path when backing up multiple databases
2 parents 9a261b2 + 1940ceb commit fd44429

18 files changed

+35
-32
lines changed

cmd/backup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Package cmd /
21
/*
32
MIT License
43
@@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2221
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2322
SOFTWARE.
2423
*/
24+
2525
package cmd
2626

2727
import (

cmd/migrate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Package cmd /
21
/*
32
MIT License
43
@@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2221
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2322
SOFTWARE.
2423
*/
24+
2525
package cmd
2626

2727
import (

cmd/restore.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package cmd
2-
31
/*
42
MIT License
53
@@ -23,6 +21,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2321
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2422
SOFTWARE.
2523
*/
24+
25+
package cmd
26+
2627
import (
2728
"github.com/jkaninda/mysql-bkup/pkg"
2829
"github.com/jkaninda/mysql-bkup/utils"

cmd/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Package cmd /
21
/*
32
MIT License
43
@@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2221
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2322
SOFTWARE.
2423
*/
24+
2525
package cmd
2626

2727
import (

cmd/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Package cmd /
21
/*
32
MIT License
43
@@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2221
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2322
SOFTWARE.
2423
*/
24+
2525
package cmd
2626

2727
import (

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Package main /
21
/*
32
MIT License
43
@@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2221
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2322
SOFTWARE.
2423
*/
24+
2525
package main
2626

2727
import "github.com/jkaninda/mysql-bkup/cmd"

pkg/backup.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2222
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2323
SOFTWARE.
2424
*/
25+
2526
package pkg
2627

2728
import (

pkg/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Package internal /
21
/*
32
MIT License
43
@@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2221
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2322
SOFTWARE.
2423
*/
24+
2525
package pkg
2626

2727
import (

pkg/helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Package internal /
21
/*
32
MIT License
43
@@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2221
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2322
SOFTWARE.
2423
*/
24+
2525
package pkg
2626

2727
import (

pkg/migrate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Package internal /
21
/*
32
MIT License
43
@@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2221
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2322
SOFTWARE.
2423
*/
24+
2525
package pkg
2626

2727
import (

pkg/restore.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// Package internal /
2-
package pkg
3-
41
/*
52
MIT License
63
@@ -24,6 +21,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2421
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2522
SOFTWARE.
2623
*/
24+
25+
package pkg
26+
2727
import (
2828
"github.com/jkaninda/encryptor"
2929
"github.com/jkaninda/go-storage/pkg/local"

pkg/s3.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func s3Backup(db *dbConfig, config *BackupConfig) {
5959
Region: awsConfig.region,
6060
DisableSsl: awsConfig.disableSsl,
6161
ForcePathStyle: awsConfig.forcePathStyle,
62-
RemotePath: awsConfig.remotePath,
62+
RemotePath: config.remotePath,
6363
LocalPath: tmpPath,
6464
})
6565
if err != nil {
@@ -120,7 +120,7 @@ func s3Restore(db *dbConfig, conf *RestoreConfig) {
120120
Region: awsConfig.region,
121121
DisableSsl: awsConfig.disableSsl,
122122
ForcePathStyle: awsConfig.forcePathStyle,
123-
RemotePath: awsConfig.remotePath,
123+
RemotePath: conf.remotePath,
124124
LocalPath: tmpPath,
125125
})
126126
if err != nil {

pkg/var.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Package internal /
21
/*
32
MIT License
43
@@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2221
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2322
SOFTWARE.
2423
*/
24+
2525
package pkg
2626

2727
const tmpPath = "/tmp/backup"

utils/config.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package utils
2-
31
/*
42
MIT License
53
@@ -23,6 +21,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2321
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2422
SOFTWARE.
2523
*/
24+
25+
package utils
26+
2627
import "os"
2728

2829
type MailConfig struct {

utils/constant.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Package utils /
21
/*
32
MIT License
43
@@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2221
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2322
SOFTWARE.
2423
*/
24+
2525
package utils
2626

2727
const RestoreExample = "restore --dbname database --file db_20231219_022941.sql.gz\n" +

utils/logger.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
package utils
2-
3-
import (
4-
"fmt"
5-
"log"
6-
"os"
7-
"runtime"
8-
"strings"
9-
)
10-
111
/*
122
MIT License
133
@@ -32,6 +22,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3222
SOFTWARE.
3323
*/
3424

25+
package utils
26+
27+
import (
28+
"fmt"
29+
"log"
30+
"os"
31+
"runtime"
32+
"strings"
33+
)
34+
3535
// Info returns info log
3636
func Info(msg string, args ...interface{}) {
3737
log.SetOutput(getStd("/dev/stdout"))

utils/notification.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package utils
2-
31
/*
42
MIT License
53
@@ -24,6 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2422
SOFTWARE.
2523
*/
2624

25+
package utils
26+
2727
import (
2828
"bytes"
2929
"crypto/tls"

utils/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Package utils /
21
/*
32
MIT License
43
@@ -22,6 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2221
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2322
SOFTWARE.
2423
*/
24+
2525
package utils
2626

2727
import (

0 commit comments

Comments
 (0)