Merge pull request #280 from kmala/health

fix(healthcheck): Parse arguments properly for httpheaders

Author: kmala

glide.lock

@@ -16,4 +16,4 @@ import:
 - package: github.com/olekukonko/tablewriter
 - package: github.com/arschles/assert
 - package: github.com/deis/controller-sdk-go
-  version: e4abe62d2accc3168b82ff54cb7e8aff2764d03b
+  version: 578082f82b3460b47d3c7e127313352f7117edfc

glide.yaml

@@ -124,7 +124,7 @@ Options:
     the relative URL path for 'httpGet' probes. [default: /]
   --type=<type>
     the procType for which the health check needs to be applied.
-  --header=<header>...
+  --headers=<headers>...
     the HTTP headers to send for 'httpGet' probes, separated by commas.
   --initial-delay-timeout=<initial-delay-timeout>
     the initial delay timeout for the probe [default: 50]
@@ -154,7 +154,7 @@ Options:
 	failureThreshold := safeGetInt(args, "--failure-threshold")
 	headers := []string{}
 	if args["--headers"] != nil {
-		headers = args["--headers"].([]string)
+		headers = strings.Split(args["--headers"].(string), ",")
 	}
 	if procType == "" {
 		procType = defaultProcType
@@ -271,7 +271,7 @@ func parseHeader(header string) (*api.KVPair, error) {
 		return nil, fmt.Errorf("could not find separator in header (%s)", header)
 	}
 	return &api.KVPair{
-		Key:   strings.TrimSpace(headerParts[0]),
+		Name:  strings.TrimSpace(headerParts[0]),
 		Value: strings.TrimSpace(headerParts[1]),
 	}, nil
 }

parser/healthchecks.go

@@ -51,7 +51,7 @@ func TestHealthchecks(t *testing.T) {
 			expected: "",
 		},
 		{
-			args:     []string{"healthchecks:set", "liveness", "httpGet", "80", "--header=test-header:test-value"},
+			args:     []string{"healthchecks:set", "liveness", "httpGet", "80", "--headers=test-header:test-value"},
 			expected: "",
 		},
 		{