Use port from the AppBinding (#234) (#243)

/cherry-pick Signed-off-by: Emruz Hossain <emruz@appscode.com> Ref: stashed/stash#1272
stashed · Dec 17, 2020 · 7b380f0 · 7b380f0
1 parent 3ea5fc8
commit 7b380f0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/pkg/backup.go b/pkg/backup.go
@@ -18,6 +18,7 @@ package pkg
 
 import (
 	"context"
+	"fmt"
 	"path/filepath"
 	"strings"
 
@@ -212,6 +213,10 @@ func (opt *mysqlOptions) backupMySQL(targetRef api_v1beta1.TargetRef) (*restic.B
 			"-h", appBinding.Spec.ClientConfig.Service.Name,
 		},
 	}
+	// if port is specified, append port in the arguments
+	if appBinding.Spec.ClientConfig.Service.Port != 0 {
+		opt.backupOptions.StdinPipeCommand.Args = append(opt.backupOptions.StdinPipeCommand.Args, fmt.Sprintf("--port=%d", appBinding.Spec.ClientConfig.Service.Port))
+	}
 	for _, arg := range strings.Fields(opt.myArgs) {
 		opt.backupOptions.StdinPipeCommand.Args = append(opt.backupOptions.StdinPipeCommand.Args, arg)
 	}

diff --git a/pkg/restore.go b/pkg/restore.go
@@ -18,6 +18,7 @@ package pkg
 
 import (
 	"context"
+	"fmt"
 	"path/filepath"
 	"strings"
 
@@ -181,6 +182,10 @@ func (opt *mysqlOptions) restoreMySQL(targetRef api_v1beta1.TargetRef) (*restic.
 			"-h", appBinding.Spec.ClientConfig.Service.Name,
 		},
 	}
+	// if port is specified, append port in the arguments
+	if appBinding.Spec.ClientConfig.Service.Port != 0 {
+		opt.dumpOptions.StdoutPipeCommand.Args = append(opt.dumpOptions.StdoutPipeCommand.Args, fmt.Sprintf("--port=%d", appBinding.Spec.ClientConfig.Service.Port))
+	}
 	for _, arg := range strings.Fields(opt.myArgs) {
 		opt.dumpOptions.StdoutPipeCommand.Args = append(opt.dumpOptions.StdoutPipeCommand.Args, arg)
 	}

diff --git a/pkg/utils.go b/pkg/utils.go
@@ -66,5 +66,8 @@ func waitForDBReady(appBinding *v1alpha1.AppBinding, secret *core.Secret, waitTi
 		"--user=root",
 		fmt.Sprintf("--wait=%d", waitTimeout),
 	}
+	if appBinding.Spec.ClientConfig.Service.Port != 0 {
+		args = append(args, fmt.Sprintf("--port=%d", appBinding.Spec.ClientConfig.Service.Port))
+	}
 	return shell.Command("mysqladmin", args...).Run()
 }