Merge pull request flynn#1420 from flynn/fix-sticky

Fix sticky route flag

cli/route.go

@@ -142,7 +142,7 @@ func runRouteAddHTTP(args *docopt.Args, client *controller.Client) error {
 		Domain:  args.String["<domain>"],
 		TLSCert: string(tlsCert),
 		TLSKey:  string(tlsKey),
-		Sticky:  args.Bool["sticky"],
+		Sticky:  args.Bool["--sticky"],
 	}
 	route := hr.ToRoute()
 	if err := client.CreateRoute(mustApp(), route); err != nil {

test/test_cli.go

@@ -360,11 +360,24 @@ func (s *CLISuite) TestRoute(t *c.C) {
 
 	// flynn route add http
 	route := random.String(32) + ".dev"
-	newRoute := app.flynn("route", "add", "http", route)
+	newRoute := app.flynn("route", "add", "http", "--sticky", route)
 	t.Assert(newRoute, Succeeds)
 	routeID := strings.TrimSpace(newRoute.Output)
 	assertRouteContains(routeID, true)
 
+	// ensure sticky flag is set
+	routes, err := s.controllerClient(t).RouteList(app.name)
+	t.Assert(err, c.IsNil)
+	var found bool
+	for _, r := range routes {
+		if fmt.Sprintf("%s/%s", r.Type, r.ID) != routeID {
+			continue
+		}
+		t.Assert(r.Sticky, c.Equals, true)
+		found = true
+	}
+	t.Assert(found, c.Equals, true, c.Commentf("didn't find route"))
+
 	// flynn route remove
 	t.Assert(app.flynn("route", "remove", routeID), Succeeds)
 	assertRouteContains(routeID, false)