Fix typo in func name.

Author: AMecea

cmd/mysql-helper/appclone/appclone.go

@@ -150,7 +150,7 @@ func cloneFromBucket(initBucket string) error {
 func cloneFromSource(host string) error {
 	glog.Infof("Cloning from node: %s", host)
 
-	backupBody, err := tb.RequestABackup(host, tb.ServerBackupPath)
+	backupBody, err := tb.RequestABackup(host, tb.ServerBackupEndpoint)
 	if err != nil {
 		return fmt.Errorf("fail to get backup: %s", err)
 	}

cmd/mysql-helper/apphelper/server.go

@@ -25,7 +25,7 @@ import (
 	"os/exec"
 
 	"github.com/golang/glog"
-	tb "github.com/presslabs/mysql-operator/cmd/mysql-helper/util"
+	"github.com/presslabs/mysql-operator/cmd/mysql-helper/util"
 )
 
 type server struct {
@@ -36,14 +36,14 @@ func NewServer(stop <-chan struct{}) *server {
 	mux := http.NewServeMux()
 	srv := &server{
 		Server: http.Server{
-			Addr:    fmt.Sprintf(":%d", tb.ServerPort),
+			Addr:    fmt.Sprintf(":%d", util.ServerPort),
 			Handler: mux,
 		},
 	}
 
 	// Add handle functions
-	mux.HandleFunc(tb.ServerProbePath, srv.healthHandle)
-	mux.Handle(tb.ServerBackupPath, tb.MaxClients(http.HandlerFunc(srv.serveBackupHandle), 1))
+	mux.HandleFunc(util.ServerProbeEndpoint, srv.healthHandler)
+	mux.Handle(util.ServerBackupEndpoint, util.MaxClients(http.HandlerFunc(srv.backupHandler), 1))
 
 	// Shutdown gracefully the http server
 	go func() {
@@ -56,12 +56,12 @@ func NewServer(stop <-chan struct{}) *server {
 	return srv
 }
 
-func (s *server) healthHandle(w http.ResponseWriter, r *http.Request) {
+func (s *server) healthHandler(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 	w.Write([]byte("OK"))
 }
 
-func (s *server) serveBackupHandle(w http.ResponseWriter, r *http.Request) {
+func (s *server) backupHandler(w http.ResponseWriter, r *http.Request) {
 
 	if !s.isAuthenticated(r) {
 		http.Error(w, "Not authenticated!", http.StatusForbidden)
@@ -78,8 +78,8 @@ func (s *server) serveBackupHandle(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Connection", "keep-alive")
 
 	xtrabackup := exec.Command("xtrabackup", "--backup", "--slave-info", "--stream=xbstream",
-		"--host=127.0.0.1", fmt.Sprintf("--user=%s", tb.GetReplUser()),
-		fmt.Sprintf("--password=%s", tb.GetReplPass()))
+		"--host=127.0.0.1", fmt.Sprintf("--user=%s", util.GetReplUser()),
+		fmt.Sprintf("--password=%s", util.GetReplPass()))
 
 	xtrabackup.Stderr = os.Stderr
 
@@ -115,5 +115,5 @@ func (s *server) serveBackupHandle(w http.ResponseWriter, r *http.Request) {
 
 func (s *server) isAuthenticated(r *http.Request) bool {
 	user, pass, ok := r.BasicAuth()
-	return ok && user == tb.GetBackupUser() && pass == tb.GetBackupPass()
+	return ok && user == util.GetBackupUser() && pass == util.GetBackupPass()
 }

cmd/mysql-helper/apptakebackup/apptakebackup.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/golang/glog"
 
-	tb "github.com/presslabs/mysql-operator/cmd/mysql-helper/util"
+	"github.com/presslabs/mysql-operator/cmd/mysql-helper/util"
 )
 
 const (
@@ -39,15 +39,15 @@ func RunTakeBackupCommand(stopCh <-chan struct{}, srcHost, destBucket string) er
 
 func pushBackupFromTo(srcHost, destBucket string) error {
 
-	backupBody, err := tb.RequestABackup(srcHost, tb.ServerBackupPath)
+	backupBody, err := util.RequestABackup(srcHost, util.ServerBackupEndpoint)
 	if err != nil {
 		return fmt.Errorf("getting backup: %s", err)
 	}
 
 	gzip := exec.Command("gzip", "-c")
 
 	rclone := exec.Command("rclone",
-		fmt.Sprintf("--config=%s", tb.RcloneConfigFile), "rcat", destBucket)
+		fmt.Sprintf("--config=%s", util.RcloneConfigFile), "rcat", destBucket)
 
 	gzip.Stdin = backupBody
 	gzip.Stderr = os.Stderr

cmd/mysql-helper/util/util.go

@@ -70,9 +70,9 @@ var (
 	NameOfStatefulSet = api.StatefulSet
 
 	// http server config
-	ServerPort       = mysqlcluster.HelperServerPort
-	ServerProbePath  = mysqlcluster.HelperServerProbePath
-	ServerBackupPath = "/xtbackup"
+	ServerPort           = mysqlcluster.HelperServerPort
+	ServerProbeEndpoint  = mysqlcluster.HelperServerProbePath
+	ServerBackupEndpoint = "/xbackup"
 )
 
 const (
@@ -309,10 +309,10 @@ func MaxClients(h http.Handler, n int) http.Handler {
 	})
 }
 
-func RequestABackup(host, path string) (io.Reader, error) {
-	glog.Infof("Initiate a backup from: %s path: %s", host, path)
+func RequestABackup(host, endpoint string) (io.Reader, error) {
+	glog.Infof("Initiate a backup from: %s endpoint: %s", host, endpoint)
 
-	req, err := http.NewRequest("GET", fmt.Sprintf("http://%s:%d%s", host, ServerPort, path), nil)
+	req, err := http.NewRequest("GET", fmt.Sprintf("http://%s:%d%s", host, ServerPort, endpoint), nil)
 	if err != nil {
 		return nil, fmt.Errorf("fail to create request: %s", err)
 	}