fix(ps): give ps:restart a better understanding between RC and Deployment pods

And add some parsing tests

Author: helgi

cmd/ps.go

@@ -87,20 +87,9 @@ func PsRestart(appID, target string) error {
 		return err
 	}
 
-	psType := ""
-	psName := ""
-
+	psType, psName := "", ""
 	if target != "" {
-		if strings.Contains(target, "-") {
-			replaced := strings.Replace(target, appID + "-", "", 1)
-			parts := strings.Split(replaced, "-")
-			// the API requires the type, for now
-			psType = parts[0]
-			// process name is the full pod
-			psName = target
-		} else {
-			psType = target
-		}
+		psType, psName = parseType(target, appID)
 	}
 
 	fmt.Printf("Restarting processes... but first, %s!\n", drinkOfChoice())
@@ -139,3 +128,26 @@ func printProcesses(appID string, processes []api.Pods) {
 		}
 	}
 }
+
+func parseType(target string, appID string) (string, string) {
+	psType, psName := "", ""
+
+	if strings.Contains(target, "-") {
+		replaced := strings.Replace(target, appID + "-", "", 1)
+		parts := strings.Split(replaced, "-")
+		// the API requires the type, for now
+		// regex matches against how Deployment pod name is constructed
+		regex := regexp.MustCompile("[0-9]{8,10}-[a-z0-9]{5}$")
+		if regex.MatchString(replaced) {
+			psType = parts[0]
+		} else {
+			psType = parts[1]
+		}
+		// process name is the full pod
+		psName = target
+	} else {
+		psType = target
+	}
+
+	return psType, psName
+}

cmd/ps_test.go

@@ -0,0 +1,31 @@
+package cmd
+
+import "testing"
+
+func TestParseType(t *testing.T) {
+	t.Parallel()
+
+	// test RC pod name
+	appID := "earthy-underdog"
+	rcPod := "earthy-underdog-v2-cmd-8yngj"
+	psType, psName := parseType(rcPod, appID)
+	if psType != "cmd" || psName != rcPod {
+		t.Errorf("type was not cmd (got %s) or psName was not %s (got %s)", psType, rcPod, psName)
+	}
+
+	// test Deployment pod name - they are longer due to hash
+	appID = "nonfat-yearbook"
+	deployPod := "nonfat-yearbook-cmd-2180299075-7na91"
+	psType, psName = parseType(deployPod, appID)
+	if psType != "cmd" || psName != deployPod {
+		t.Errorf("type was not cmd (got %s) or psName was not %s (got %s)", psType, deployPod, psName)
+	}
+
+
+	// test type by itself
+	psType, psName = parseType("cmd", "fake")
+	if psType != "cmd" || psName != "" {
+		t.Error("type was not cmd")
+	}
+
+}