Merge pull request #4231 from krancour/dock-container-name-matching

fix(deisctl): improve dock name match

Author: krancour

deisctl/backend/backend.go

@@ -15,6 +15,7 @@ type Backend interface {
 	RollingRestart(string, *sync.WaitGroup, io.Writer, io.Writer)
 	SSH(string) error
 	SSHExec(string, string) error
+	Dock(string, []string) error
 	ListUnits() error
 	ListUnitFiles() error
 	Status(string) error

deisctl/backend/fleet/dock.go

@@ -0,0 +1,25 @@
+package fleet
+
+import (
+	"fmt"
+	"strings"
+)
+
+// Dock connects to the appropriate host and runs 'docker exec -it'.
+func (c *FleetClient) Dock(target string, cmd []string) error {
+
+	units, err := c.Units(target)
+	if err != nil {
+		return err
+	}
+	target = units[0][0 : len(units[0])-len(".service")]
+
+	cmdStr := "sh"
+	if len(cmd) > 0 {
+		cmdStr = strings.Join(cmd, " ")
+	}
+
+	execit := fmt.Sprintf("docker exec -it %s %s", target, cmdStr)
+
+	return c.SSHExec(target, execit)
+}

deisctl/cmd/cmd.go

@@ -492,13 +492,5 @@ func SSH(target string, cmd []string, b backend.Backend) error {
 
 // Dock connects to the appropriate host and runs 'docker exec -it'.
 func Dock(target string, cmd []string, b backend.Backend) error {
-
-	c := "sh"
-	if len(cmd) > 0 {
-		c = strings.Join(cmd, " ")
-	}
-
-	execit := fmt.Sprintf("docker exec -it %s %s", target, c)
-
-	return b.SSHExec(target, execit)
+	return b.Dock(target, cmd)
 }

deisctl/cmd/cmd_test.go

@@ -85,6 +85,10 @@ func (backend *backendStub) SSHExec(target, command string) error {
 	return errors.New("Error")
 }
 
+func (backend *backendStub) Dock(target string, command []string) error {
+	return nil
+}
+
 var _ backend.Backend = &backendStub{}
 
 func fakeCheckKeys(cb config.Backend) error {