Refactor sidecar package

Author: AMecea

cmd/mysql-operator-sidecar/main.go

@@ -25,11 +25,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
 
-	"github.com/presslabs/mysql-operator/pkg/sidecar/app"
-	"github.com/presslabs/mysql-operator/pkg/sidecar/appclone"
-	"github.com/presslabs/mysql-operator/pkg/sidecar/appconf"
-	"github.com/presslabs/mysql-operator/pkg/sidecar/apphelper"
-	"github.com/presslabs/mysql-operator/pkg/sidecar/apptakebackup"
+	"github.com/presslabs/mysql-operator/pkg/sidecar"
 )
 
 var log = logf.Log.WithName("sidecar")
@@ -61,13 +57,13 @@ func main() {
 	logf.SetLogger(logf.ZapLogger(debug))
 
 	// init configs
-	cfg := app.NewBasicConfig(stopCh)
+	cfg := sidecar.NewConfig(stopCh)
 
 	confCmd := &cobra.Command{
 		Use:   "init-configs",
 		Short: "Init subcommand, for init files.",
 		Run: func(cmd *cobra.Command, args []string) {
-			err := appconf.RunConfigCommand(cfg)
+			err := sidecar.RunConfigCommand(cfg)
 			if err != nil {
 				log.Error(err, "init command failed")
 				os.Exit(1)
@@ -80,7 +76,7 @@ func main() {
 		Use:   "clone",
 		Short: "Clone data from a bucket or prior node.",
 		Run: func(cmd *cobra.Command, args []string) {
-			err := appclone.RunCloneCommand(cfg)
+			err := sidecar.RunCloneCommand(cfg)
 			if err != nil {
 				log.Error(err, "clone command failed")
 				os.Exit(1)
@@ -93,8 +89,7 @@ func main() {
 		Use:   "run",
 		Short: "Configs mysql users, replication, and serve backups.",
 		Run: func(cmd *cobra.Command, args []string) {
-			mysqlCFG := app.NewMysqlConfig(cfg)
-			err := apphelper.RunRunCommand(mysqlCFG)
+			err := sidecar.RunSidecarCommand(cfg)
 			if err != nil {
 				log.Error(err, "run command failed")
 				os.Exit(1)
@@ -113,7 +108,7 @@ func main() {
 			return nil
 		},
 		Run: func(cmd *cobra.Command, args []string) {
-			err := apptakebackup.RunTakeBackupCommand(cfg, args[0], args[1])
+			err := sidecar.RunTakeBackupCommand(cfg, args[0], args[1])
 			if err != nil {
 				log.Error(err, "take backup command failed")
 				os.Exit(1)

pkg/sidecar/appclone/appclone.go pkg/sidecar/appclone.gopkg/sidecar/appclone/appclone.go renamed to pkg/sidecar/appclone.go

@@ -14,28 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package appclone
+package sidecar
 
 import (
 	"fmt"
 	"os"
 	"os/exec"
 	"strings"
-
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
-
-	"github.com/presslabs/mysql-operator/pkg/sidecar/app"
 )
 
-var log = logf.Log.WithName("sidecar.appclone")
-
 // RunCloneCommand clone the data from source.
 // nolint: gocyclo
-func RunCloneCommand(cfg *app.BaseConfig) error {
+func RunCloneCommand(cfg *Config) error {
 	log.Info("clonning command", "host", cfg.Hostname)
 
 	// skip cloning if data exists.
-	if !app.ShouldBootstrapNode() {
+	if !shouldBootstrapNode() {
 		log.Info("data exists and is initialized, skipping cloning.")
 		return nil
 	}
@@ -49,7 +43,7 @@ func RunCloneCommand(cfg *app.BaseConfig) error {
 		return fmt.Errorf("removing lost+found: %s", err)
 	}
 
-	if cfg.NodeRole() == app.MasterNode {
+	if cfg.NodeRole() == MasterNode {
 		if len(cfg.InitBucketURL) == 0 {
 			log.Info("skip cloning init bucket uri is not set.")
 			// let mysqld initialize data dir
@@ -87,15 +81,15 @@ func cloneFromBucket(initBucket string) error {
 
 	log.Info("cloning from bucket", "bucket", initBucket)
 
-	if _, err := os.Stat(app.RcloneConfigFile); os.IsNotExist(err) {
+	if _, err := os.Stat(rcloneConfigFile); os.IsNotExist(err) {
 		log.Error(err, "rclone config file does not exists")
 		return err
 	}
 	// rclone --config={conf file} cat {bucket uri}
 	// writes to stdout the content of the bucket uri
 	// nolint: gosec
 	rclone := exec.Command("rclone", "-vv",
-		fmt.Sprintf("--config=%s", app.RcloneConfigFile), "cat", initBucket)
+		fmt.Sprintf("--config=%s", rcloneConfigFile), "cat", initBucket)
 
 	// gzip reads from stdin decompress and then writes to stdout
 	// nolint: gosec
@@ -105,7 +99,7 @@ func cloneFromBucket(initBucket string) error {
 	// extracts files from stdin (-x) and writes them to mysql
 	// data target dir
 	// nolint: gosec
-	xbstream := exec.Command("xbstream", "-x", "-C", app.DataDir)
+	xbstream := exec.Command("xbstream", "-x", "-C", dataDir)
 
 	var err error
 	// rclone | gzip | xbstream
@@ -149,10 +143,10 @@ func cloneFromBucket(initBucket string) error {
 	return nil
 }
 
-func cloneFromSource(cfg *app.BaseConfig, host string) error {
+func cloneFromSource(cfg *Config, host string) error {
 	log.Info("cloning from node", "host", host)
 
-	backupBody, err := app.RequestABackup(cfg, host, app.ServerBackupEndpoint)
+	backupBody, err := requestABackup(cfg, host, serverBackupEndpoint)
 	if err != nil {
 		return fmt.Errorf("fail to get backup: %s", err)
 	}
@@ -161,7 +155,7 @@ func cloneFromSource(cfg *app.BaseConfig, host string) error {
 	// extracts files from stdin (-x) and writes them to mysql
 	// data target dir
 	// nolint: gosec
-	xbstream := exec.Command("xbstream", "-x", "-C", app.DataDir)
+	xbstream := exec.Command("xbstream", "-x", "-C", dataDir)
 
 	xbstream.Stdin = backupBody
 	xbstream.Stderr = os.Stderr
@@ -180,7 +174,7 @@ func cloneFromSource(cfg *app.BaseConfig, host string) error {
 func xtrabackupPreperData() error {
 	// nolint: gosec
 	xtbkCmd := exec.Command("xtrabackup", "--prepare",
-		fmt.Sprintf("--target-dir=%s", app.DataDir))
+		fmt.Sprintf("--target-dir=%s", dataDir))
 
 	xtbkCmd.Stderr = os.Stderr
 
@@ -189,7 +183,7 @@ func xtrabackupPreperData() error {
 
 // nolint: gosec
 func checkIfDataExists() bool {
-	path := fmt.Sprintf("%s/mysql", app.DataDir)
+	path := fmt.Sprintf("%s/mysql", dataDir)
 	_, err := os.Open(path)
 
 	if os.IsNotExist(err) {
@@ -202,6 +196,6 @@ func checkIfDataExists() bool {
 }
 
 func deleteLostFound() error {
-	path := fmt.Sprintf("%s/lost+found", app.DataDir)
+	path := fmt.Sprintf("%s/lost+found", dataDir)
 	return os.RemoveAll(path)
 }

pkg/sidecar/appconf/appconf.go pkg/sidecar/appconf.gopkg/sidecar/appconf/appconf.go renamed to pkg/sidecar/appconf.go

@@ -14,31 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package appconf
+package sidecar
 
 import (
 	"fmt"
 	"os"
 	"strconv"
 
 	"github.com/go-ini/ini"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 
-	"github.com/presslabs/mysql-operator/pkg/sidecar/app"
 	pkgutil "github.com/presslabs/mysql-operator/pkg/util"
 )
 
-var log = logf.Log.WithName("sidecar.appconf")
-
 const (
 	rStrLen = 18
 )
 
 // RunConfigCommand generates my.cnf, client.cnf and 10-dynamic.cnf files.
-func RunConfigCommand(cfg *app.BaseConfig) error {
+func RunConfigCommand(cfg *Config) error {
 	log.Info("configuring server", "host", cfg.Hostname, "role", cfg.NodeRole())
 
-	if err := app.CopyFile(app.MountConfigDir+"/my.cnf", app.ConfigDir+"/my.cnf"); err != nil {
+	if err := copyFile(mountConfigDir+"/my.cnf", configDir+"/my.cnf"); err != nil {
 		return fmt.Errorf("copy file my.cnf: %s", err)
 	}
 
@@ -52,26 +48,26 @@ func RunConfigCommand(cfg *app.BaseConfig) error {
 		return fmt.Errorf("failed to get dynamic configs: %s", err)
 	}
 
-	if err = os.Mkdir(app.ConfDPath, os.FileMode(0755)); err != nil {
+	if err = os.Mkdir(confDPath, os.FileMode(0755)); err != nil {
 		if !os.IsExist(err) {
-			return fmt.Errorf("error mkdir %s/conf.d: %s", app.ConfigDir, err)
+			return fmt.Errorf("error mkdir %s/conf.d: %s", configDir, err)
 		}
 	}
-	if err = dynCFG.SaveTo(app.ConfDPath + "/10-dynamic.cnf"); err != nil {
+	if err = dynCFG.SaveTo(confDPath + "/10-dynamic.cnf"); err != nil {
 		return fmt.Errorf("failed to save configs: %s", err)
 	}
-	if utilityCFG, err = getUtilityUserConfigs(app.UtilityUser, uPass); err != nil {
+	if utilityCFG, err = getUtilityUserConfigs(utilityUser, uPass); err != nil {
 		return fmt.Errorf("failed to configure utility user: %s", err)
 	}
-	if err = utilityCFG.SaveTo(app.ConfDPath + "/10-utility-user.cnf"); err != nil {
+	if err = utilityCFG.SaveTo(confDPath + "/10-utility-user.cnf"); err != nil {
 		return fmt.Errorf("failed to configure utility user: %s", err)
 	}
 
-	if clientCFG, err = getClientConfigs(app.UtilityUser, uPass); err != nil {
+	if clientCFG, err = getClientConfigs(utilityUser, uPass); err != nil {
 		return fmt.Errorf("failed to get client configs: %s", err)
 	}
 
-	if err = clientCFG.SaveTo(app.ConfigDir + "/client.cnf"); err != nil {
+	if err = clientCFG.SaveTo(configDir + "/client.cnf"); err != nil {
 		return fmt.Errorf("failed to save configs: %s", err)
 	}
 
@@ -86,7 +82,7 @@ func getClientConfigs(user, pass string) (*ini.File, error) {
 	if _, err := client.NewKey("host", "127.0.0.1"); err != nil {
 		return nil, err
 	}
-	if _, err := client.NewKey("port", app.MysqlPort); err != nil {
+	if _, err := client.NewKey("port", mysqlPort); err != nil {
 		return nil, err
 	}
 	if _, err := client.NewKey("user", user); err != nil {