fix(cmd): check for invalid probe types

Author: Matthew Fisher

cmd/healthchecks_test.go

@@ -307,7 +307,7 @@ func TestHealthchecksUnset(t *testing.T) {
 }`)
 	})
 
-	err = cmdr.HealthchecksUnset("foo", "web/cmd", []string{"web/cmd"})
+	err = cmdr.HealthchecksUnset("foo", "web/cmd", []string{"liveness"})
 	assert.NoErr(t, err)
 	assert.Equal(t, testutil.StripProgress(b.String()), `Removing healthchecks... done
 

parser/healthchecks.go

@@ -164,8 +164,8 @@ Options:
 	probeType := args["<probe-type>"].(string)
 	probeArgs := args["<args>"].([]string)
 
-	if healthcheckType != "liveness" && healthcheckType != "readiness" {
-		return fmt.Errorf("Invalid healthcheck type. Must be one of: \"liveness\", \"readiness\"")
+	if err := checkProbeType(healthcheckType); err != nil {
+		return err
 	}
 
 	// NOTE(bacongobbler): k8s healthchecks use the term "livenessProbe" and "readinessProbe", so let's
@@ -247,6 +247,9 @@ Options:
 	// NOTE(bacongobbler): k8s healthchecks use the term "livenessProbe" and "readinessProbe", so let's
 	// add that to the end of the healthcheck type so the controller sees the right probe type
 	for healthcheck := range healthchecks {
+		if err := checkProbeType(healthchecks[healthcheck]); err != nil {
+			return err
+		}
 		healthchecks[healthcheck] += "Probe"
 	}
 
@@ -275,3 +278,20 @@ func parseHeader(header string) (*api.KVPair, error) {
 		Value: strings.TrimSpace(headerParts[1]),
 	}, nil
 }
+
+func checkProbeType(probe string) error {
+	var found bool
+	probeTypes := []string{
+		"liveness",
+		"readiness",
+	}
+	for _, ptype := range probeTypes {
+		if probe == ptype {
+			found = true
+		}
+	}
+	if !found {
+		return fmt.Errorf("probe type %s is invalid. Must be one of %s", probe, probeTypes)
+	}
+	return nil
+}

parser/healthchecks_test.go

@@ -70,6 +70,14 @@ func TestHealthchecks(t *testing.T) {
 			args:     []string{"healthchecks"},
 			expected: "healthchecks:list",
 		},
+		{
+			args:     []string{"healthchecks:set", "alien", "httpGet", "80"},
+			expected: "probe type alien is invalid. Must be one of [liveness readiness]",
+		},
+		{
+			args:     []string{"healthchecks:unset", "alien", "httpGet", "80"},
+			expected: "probe type alien is invalid. Must be one of [liveness readiness]",
+		},
 	}
 
 	// For each case, check that calling the route with the arguments