Merge pull request #213 from hyperhq/func-sync-call

update func call --wait to --sync

Author: carmark

api/client/func.go

@@ -383,7 +383,7 @@ func (cli *DockerCli) CmdFuncInspect(args ...string) error {
 // Usage: hyper func call NAME
 func (cli *DockerCli) CmdFuncCall(args ...string) error {
 	cmd := Cli.Subcmd("func call", []string{"NAME"}, "Call a function", false)
-	wait := cmd.Bool([]string{"-wait"}, false, "Block until the call is completed")
+	sync := cmd.Bool([]string{"-sync"}, false, "Block until the call is completed")
 
 	cmd.Require(flag.Exact, 1)
 	if err := cmd.ParseFlags(args, true); err != nil {
@@ -400,13 +400,13 @@ func (cli *DockerCli) CmdFuncCall(args ...string) error {
 		}
 	}
 
-	body, err := cli.client.FuncCall(context.Background(), name, stdin, *wait)
+	body, err := cli.client.FuncCall(context.Background(), name, stdin, *sync)
 	if err != nil {
 		return err
 	}
 	defer body.Close()
 
-	if *wait {
+	if *sync {
 		_, err = io.Copy(cli.out, body)
 		return err
 	}

vendor/src/github.com/docker/engine-api/client/func.go

@@ -182,14 +182,14 @@ func (cli *Client) FuncInspectWithCallId(ctx context.Context, id string) (*types
 	return &fn, err
 }
 
-func (cli *Client) FuncCall(ctx context.Context, name string, stdin io.Reader, wait bool) (io.ReadCloser, error) {
+func (cli *Client) FuncCall(ctx context.Context, name string, stdin io.Reader, sync bool) (io.ReadCloser, error) {
 	fn, _, err := cli.FuncInspectWithRaw(ctx, name)
 	if err != nil {
 		return nil, err
 	}
 	subpath := ""
-	if wait {
-		subpath += "/wait"
+	if sync {
+		subpath += "/sync"
 	}
 	req, err := newFuncEndpointRequest("POST", path.Join("call", name, fn.UUID, subpath), nil, stdin)
 	if err != nil {

vendor/src/github.com/docker/engine-api/client/interface.go

@@ -126,7 +126,7 @@ type APIClient interface {
 	FuncList(ctx context.Context, opts types.FuncListOptions) ([]types.Func, error)
 	FuncInspect(ctx context.Context, name string) (types.Func, error)
 	FuncInspectWithRaw(ctx context.Context, name string) (types.Func, []byte, error)
-	FuncCall(ctx context.Context, name string, stdin io.Reader, wait bool) (io.ReadCloser, error)
+	FuncCall(ctx context.Context, name string, stdin io.Reader, sync bool) (io.ReadCloser, error)
 	FuncGet(ctx context.Context, callId string, wait bool) (io.ReadCloser, error)
 	FuncLogs(ctx context.Context, name, callId string, follow bool, tail string) (io.ReadCloser, error)
 	FuncStatus(ctx context.Context, name string) (*types.FuncStatusResponse, error)