fix(deisctl): prefix unit name with "deis-" before expanding

Author: mboersma

deisctl/backend/fleet/utils.go

@@ -88,6 +88,10 @@ func splitTarget(target string) (component string, num int, err error) {
 // expand a target to all installed units
 func expandTargets(c *FleetClient, targets []string) (expandedTargets []string, err error) {
 	for _, t := range targets {
+		// ensure unit name starts with "deis-"
+		if !strings.HasPrefix(t, "deis-") {
+			t = "deis-" + t
+		}
 		if strings.HasSuffix(t, "@*") {
 			var targets []string
 			targets, err = expandTarget(c, strings.TrimSuffix(t, "@*"))

deisctl/backend/fleet/utils_test.go

@@ -136,13 +136,22 @@ func TestExpandTargets(t *testing.T) {
 		&schema.Unit{
 			Name: "deis-store-gateway@1.service",
 		},
+		&schema.Unit{
+			Name: "deis-store-gateway@2.service",
+		},
 		&schema.Unit{
 			Name: "deis-controller.service",
 		},
+		&schema.Unit{
+			Name: "deis-registry@1.service",
+		},
+		&schema.Unit{
+			Name: "registry_v2.cmd.1.service",
+		},
 	}
 	c := &FleetClient{Fleet: fc}
 
-	targets := []string{"deis-router@*", "deis-store-gateway@1", "deis-controller"}
+	targets := []string{"router@*", "deis-store-gateway@1", "deis-controller", "registry@*"}
 	expandedTargets, err := expandTargets(c, targets)
 	if err != nil {
 		t.Fatal(err)
@@ -152,6 +161,7 @@ func TestExpandTargets(t *testing.T) {
 		"deis-router@2.service",
 		"deis-store-gateway@1",
 		"deis-controller",
+		"deis-registry@1.service",
 	}
 	if !reflect.DeepEqual(expandedTargets, expectedTargets) {
 		t.Fatal(expandedTargets)