Merge pull request #259 from kmala/health

fix(healthcheck): show all the healthchecks set when no proctype is specified

Author: kmala

cmd/healthchecks.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"sort"
+
 	"github.com/deis/controller-sdk-go/api"
 	"github.com/deis/controller-sdk-go/config"
 )
@@ -34,12 +36,28 @@ func (d *DeisCmd) HealthchecksList(appID, procType string) error {
 		return err
 	}
 
-	d.Printf("=== %s Healthchecks\n\n", appID)
-	d.Println(procType + ":")
-	if healthcheck, found := config.Healthcheck[procType]; found {
-		d.printHealthCheck(*healthcheck)
+	d.Printf("=== %s Healthchecks\n", appID)
+	if procType == "" {
+		if len(config.Healthcheck) == 0 {
+			d.Println("No health checks configured.")
+			return nil
+		}
+		var keys []string
+		for k := range config.Healthcheck {
+			keys = append(keys, k)
+		}
+		sort.Strings(keys)
+		for _, key := range keys {
+			d.Printf("\n%s:\n", key)
+			d.printHealthCheck(*config.Healthcheck[key])
+		}
 	} else {
-		d.printHealthCheck(api.Healthchecks{})
+		d.Printf("\n%s:\n", procType)
+		if healthcheck, found := config.Healthcheck[procType]; found {
+			d.printHealthCheck(*healthcheck)
+		} else {
+			d.printHealthCheck(api.Healthchecks{})
+		}
 	}
 
 	return nil

cmd/healthchecks_test.go

@@ -93,6 +93,130 @@ No readiness probe configured.
 `, "output")
 }
 
+func TestHealthchecksListNoHealthCheck(t *testing.T) {
+	t.Parallel()
+	cf, server, err := testutil.NewTestServerAndClient()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer server.Close()
+	var b bytes.Buffer
+	cmdr := DeisCmd{WOut: &b, ConfigFile: cf}
+
+	server.Mux.HandleFunc("/v2/apps/foo/config/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		fmt.Fprintf(w, `{
+  "uuid": "c039a380-6068-4511-b35a-535a73b86ef5",
+  "app": "foo",
+  "owner": "bar",
+  "values": {},
+  "memory": {},
+  "cpu": {},
+  "tags": {},
+  "registry": {},
+  "healthcheck": {},
+  "created": "2016-09-12T22:20:14Z",
+  "updated": "2016-09-12T22:20:14Z"
+}`)
+	})
+
+	err = cmdr.HealthchecksList("foo", "")
+	assert.NoErr(t, err)
+
+	assert.Equal(t, b.String(), `=== foo Healthchecks
+No health checks configured.
+`, "output")
+}
+
+func TestHealthchecksListAllHealthChecks(t *testing.T) {
+	t.Parallel()
+	cf, server, err := testutil.NewTestServerAndClient()
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer server.Close()
+	var b bytes.Buffer
+	cmdr := DeisCmd{WOut: &b, ConfigFile: cf}
+
+	server.Mux.HandleFunc("/v2/apps/foo/config/", func(w http.ResponseWriter, r *http.Request) {
+		testutil.SetHeaders(w)
+		fmt.Fprintf(w, `{
+  "uuid": "c039a380-6068-4511-b35a-535a73b86ef5",
+  "app": "foo",
+  "owner": "bar",
+  "values": {},
+  "memory": {},
+  "cpu": {},
+  "tags": {},
+  "registry": {},
+  "healthcheck": {
+    "web/cmd": {
+      "livenessProbe": {
+        "initialDelaySeconds": 50,
+        "timeoutSeconds": 50,
+        "periodSeconds": 10,
+        "failureThreshold": 3,
+        "httpGet": {
+          "port": 80,
+          "path": "/"
+        },
+        "successThreshold": 1
+      }
+    },
+		"web": {
+      "livenessProbe": {
+        "initialDelaySeconds": 50,
+        "timeoutSeconds": 50,
+        "periodSeconds": 10,
+        "failureThreshold": 3,
+        "httpGet": {
+          "port": 80,
+          "path": "/"
+        },
+        "successThreshold": 1
+      }
+    }
+  },
+  "created": "2016-09-12T22:20:14Z",
+  "updated": "2016-09-12T22:20:14Z"
+}`)
+	})
+
+	err = cmdr.HealthchecksList("foo", "")
+	assert.NoErr(t, err)
+
+	assert.Equal(t, b.String(), `=== foo Healthchecks
+
+web:
+--- Liveness
+Initial Delay (seconds): 50
+Timeout (seconds): 50
+Period (seconds): 10
+Success Threshold: 1
+Failure Threshold: 3
+Exec Probe: N/A
+HTTP GET Probe: Path="/" Port=80 HTTPHeaders=[]
+TCP Socket Probe: N/A
+
+--- Readiness
+No readiness probe configured.
+
+web/cmd:
+--- Liveness
+Initial Delay (seconds): 50
+Timeout (seconds): 50
+Period (seconds): 10
+Success Threshold: 1
+Failure Threshold: 3
+Exec Probe: N/A
+HTTP GET Probe: Path="/" Port=80 HTTPHeaders=[]
+TCP Socket Probe: N/A
+
+--- Readiness
+No readiness probe configured.
+`, "output")
+}
+
 func TestHealthchecksSet(t *testing.T) {
 	t.Parallel()
 	cf, server, err := testutil.NewTestServerAndClient()

parser/healthchecks.go

@@ -72,9 +72,6 @@ Options:
 
 	app := safeGetValue(args, "--app")
 	procType := safeGetValue(args, "--type")
-	if procType == "" {
-		procType = defaultProcType
-	}
 
 	return cmdr.HealthchecksList(app, procType)
 }