client: consolidate node options with their methods

Move them together, as we did for most of the other options.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

client/node_inspect.go

@@ -9,6 +9,9 @@ import (
 	"github.com/moby/moby/api/types/swarm"
 )
 
+// NodeInspectOptions holds parameters to inspect nodes with.
+type NodeInspectOptions struct{}
+
 type NodeInspectResult struct {
 	Node swarm.Node
 	Raw  []byte

client/node_list.go

@@ -8,6 +8,11 @@ import (
 	"github.com/moby/moby/api/types/swarm"
 )
 
+// NodeListOptions holds parameters to list nodes with.
+type NodeListOptions struct {
+	Filters Filters
+}
+
 type NodeListResult struct {
 	Items []swarm.Node
 }

client/node_remove.go

@@ -5,6 +5,10 @@ import (
 	"net/url"
 )
 
+// NodeRemoveOptions holds parameters to remove nodes with.
+type NodeRemoveOptions struct {
+	Force bool
+}
 type NodeRemoveResult struct{}
 
 // NodeRemove removes a Node.

client/node_update.go

@@ -3,8 +3,16 @@ package client
 import (
 	"context"
 	"net/url"
+
+	"github.com/moby/moby/api/types/swarm"
 )
 
+// NodeUpdateOptions holds parameters to update nodes with.
+type NodeUpdateOptions struct {
+	Version swarm.Version
+	Node    swarm.NodeSpec
+}
+
 type NodeUpdateResult struct{}
 
 // NodeUpdate updates a Node.

client/swarm_node_inspect_opts.go

@@ -1,4 +0,0 @@
-package client
-
-// NodeInspectOptions holds parameters to inspect nodes with.
-type NodeInspectOptions struct{}

client/swarm_node_list_opts.go

@@ -1,6 +0,0 @@
-package client
-
-// NodeListOptions holds parameters to list nodes with.
-type NodeListOptions struct {
-	Filters Filters
-}

client/swarm_node_remove_opts.go

@@ -1,6 +0,0 @@
-package client
-
-// NodeRemoveOptions holds parameters to remove nodes with.
-type NodeRemoveOptions struct {
-	Force bool
-}

client/swarm_node_update_opts.go

@@ -1,9 +0,0 @@
-package client
-
-import "github.com/moby/moby/api/types/swarm"
-
-// NodeUpdateOptions holds parameters to update nodes with.
-type NodeUpdateOptions struct {
-	Version swarm.Version
-	Node    swarm.NodeSpec
-}

vendor/github.com/moby/moby/client/container_exec.go

@@ -26,7 +26,7 @@ type ExecCreateOptions struct {
 
 // ExecCreateResult holds the result of creating a container exec.
 type ExecCreateResult struct {
-	container.ExecCreateResponse
+	ID string
 }
 
 // ExecCreate creates a new exec configuration to run an exec process.
@@ -58,7 +58,7 @@ func (cli *Client) ExecCreate(ctx context.Context, containerID string, options E
 
 	var response container.ExecCreateResponse
 	err = json.NewDecoder(resp.Body).Decode(&response)
-	return ExecCreateResult{ExecCreateResponse: response}, err
+	return ExecCreateResult{ID: response.ID}, err
 }
 
 type execStartAttachOptions struct {

vendor/github.com/moby/moby/client/node_inspect.go

@@ -9,6 +9,9 @@ import (
 	"github.com/moby/moby/api/types/swarm"
 )
 
+// NodeInspectOptions holds parameters to inspect nodes with.
+type NodeInspectOptions struct{}
+
 type NodeInspectResult struct {
 	Node swarm.Node
 	Raw  []byte

vendor/github.com/moby/moby/client/node_list.go

@@ -8,6 +8,11 @@ import (
 	"github.com/moby/moby/api/types/swarm"
 )
 
+// NodeListOptions holds parameters to list nodes with.
+type NodeListOptions struct {
+	Filters Filters
+}
+
 type NodeListResult struct {
 	Items []swarm.Node
 }

vendor/github.com/moby/moby/client/node_remove.go

@@ -5,6 +5,10 @@ import (
 	"net/url"
 )
 
+// NodeRemoveOptions holds parameters to remove nodes with.
+type NodeRemoveOptions struct {
+	Force bool
+}
 type NodeRemoveResult struct{}
 
 // NodeRemove removes a Node.

vendor/github.com/moby/moby/client/node_update.go

@@ -3,8 +3,16 @@ package client
 import (
 	"context"
 	"net/url"
+
+	"github.com/moby/moby/api/types/swarm"
 )
 
+// NodeUpdateOptions holds parameters to update nodes with.
+type NodeUpdateOptions struct {
+	Version swarm.Version
+	Node    swarm.NodeSpec
+}
+
 type NodeUpdateResult struct{}
 
 // NodeUpdate updates a Node.

vendor/github.com/moby/moby/client/swarm_node_inspect_opts.go

@@ -1,4 +0,0 @@
-package client
-
-// NodeInspectOptions holds parameters to inspect nodes with.
-type NodeInspectOptions struct{}

vendor/github.com/moby/moby/client/swarm_node_list_opts.go

@@ -1,6 +0,0 @@
-package client
-
-// NodeListOptions holds parameters to list nodes with.
-type NodeListOptions struct {
-	Filters Filters
-}

vendor/github.com/moby/moby/client/swarm_node_remove_opts.go

@@ -1,6 +0,0 @@
-package client
-
-// NodeRemoveOptions holds parameters to remove nodes with.
-type NodeRemoveOptions struct {
-	Force bool
-}

vendor/github.com/moby/moby/client/swarm_node_update_opts.go

@@ -1,9 +0,0 @@
-package client
-
-import "github.com/moby/moby/api/types/swarm"
-
-// NodeUpdateOptions holds parameters to update nodes with.
-type NodeUpdateOptions struct {
-	Version swarm.Version
-	Node    swarm.NodeSpec
-}