Refactored docker env fetching

Author: mblaschke

command/Helper.go

@@ -7,6 +7,10 @@ import (
 	"time"
 	"path/filepath"
 	"math/rand"
+	"bufio"
+	"strings"
+	"github.com/webdevops/go-shell"
+	"github.com/webdevops/go-shell/commandbuilder"
 )
 
 func NewSigIntHandler(callback func()) func() {
@@ -56,6 +60,27 @@ func GetCompressionByFilename(file string) string {
 	return compression
 }
 
+func GetDockerEnvList(connection commandbuilder.Connection, containerId string) map[string]string {
+	ret := map[string]string{}
+
+	cmd := shell.Cmd(connection.CommandBuilder("docker", "inspect", "-f", "{{range .Config.Env}}{{println .}}{{end}}", containerId)...)
+	envList := cmd.Run().Stdout.String()
+
+	scanner := bufio.NewScanner(strings.NewReader(envList))
+	for scanner.Scan() {
+		line := scanner.Text()
+		split := strings.SplitN(line, "=", 2)
+
+		if len(split) == 2 {
+			varName, varValue := split[0], split[1]
+
+			ret[varName] = varValue
+		}
+	}
+
+	return ret
+}
+
 const letterBytes = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 func randomString(length int) string {
 	rand.Seed(time.Now().UTC().UnixNano())

command/MysqlCommon.go

@@ -209,8 +209,6 @@ func  (conf *MysqlCommonOptions) GetTableList(schema string) []string {
 	return ret
 }
 
-
-
 func  (conf *MysqlCommonOptions) InitDockerSettings() {
 	containerName := conf.connection.Docker
 
@@ -221,21 +219,14 @@ func  (conf *MysqlCommonOptions) InitDockerSettings() {
 	containerId := connectionClone.DockerGetContainerId(containerName)
 	fmt.Println(fmt.Sprintf(" - Using docker container \"%s\"", containerId))
 
-	cmd := shell.Cmd(connectionClone.CommandBuilder("docker", "inspect",  "-f", "{{range .Config.Env}}{{println .}}{{end}}", containerId)...)
-	envList := cmd.Run().Stdout.String()
+	containerEnv := GetDockerEnvList(connectionClone, containerId)
 
-	scanner := bufio.NewScanner(strings.NewReader(envList))
-	for scanner.Scan() {
-		line := scanner.Text()
-		split := strings.SplitN(line, "=", 2)
-		if len(split) == 2 {
-			varName, varValue := split[0], split[1]
-
-			if varName == "MYSQL_ROOT_PASSWORD" && conf.Username == "" && conf.Password == "" {
-				conf.Username = "root"
-				conf.Password = varValue
-				conf.Hostname = ""
-			}
+	// get root pass from env
+	if val, ok := containerEnv["MYSQL_ROOT_PASSWORD"]; ok {
+		if conf.Username == "" && conf.Password == "" {
+			conf.Username = "root"
+			conf.Password = val
+			conf.Hostname = ""
 		}
 	}
 }

command/PostgresCommon.go

@@ -1,7 +1,6 @@
 package command
 
 import (
-	"bufio"
 	"strings"
 	"github.com/webdevops/go-shell"
 	"github.com/webdevops/go-shell/commandbuilder"
@@ -171,23 +170,19 @@ func  (conf *PostgresCommonOptions) InitDockerSettings() {
 	containerId := connectionClone.DockerGetContainerId(containerName)
 	fmt.Println(fmt.Sprintf(" - Using docker container \"%s\"", containerId))
 
-	cmd := shell.Cmd(connectionClone.CommandBuilder("docker", "inspect",  "-f", "{{range .Config.Env}}{{println .}}{{end}}", containerId)...)
-	envList := cmd.Run().Stdout.String()
+	containerEnv := GetDockerEnvList(connectionClone, containerId)
 
-	scanner := bufio.NewScanner(strings.NewReader(envList))
-	for scanner.Scan() {
-		line := scanner.Text()
-		split := strings.SplitN(line, "=", 2)
-		if len(split) == 2 {
-			varName, varValue := split[0], split[1]
-
-			if varName == "POSTGRES_USER" && conf.Username == "" {
-				conf.Username = varValue
-			}
+	// get user from env
+	if val, ok := containerEnv["POSTGRES_USER"]; ok {
+		if conf.Username == "" {
+			conf.Username = val
+		}
+	}
 
-			if varName == "POSTGRES_PASSWORD" && conf.Password == ""  {
-				conf.Password = varValue
-			}
+	// get user from env
+	if val, ok := containerEnv["POSTGRES_PASSWORD"]; ok {
+		if conf.Username == "" {
+			conf.Password = val
 		}
 	}
 }