From 0b7b7625c67fb52c46f0cb8d7249a69133aa44d2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 24 Oct 2025 13:06:39 +0200 Subject: [PATCH] client: rename NodeUpdateOptions.Node to NodeUpdateOptions.Spec Align with the other swarm-types, which use `Spec` for updates. Signed-off-by: Sebastiaan van Stijn --- client/node_update.go | 4 ++-- client/node_update_test.go | 8 ++++---- internal/testutil/daemon/node.go | 2 +- vendor/github.com/moby/moby/client/node_update.go | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/node_update.go b/client/node_update.go index dcf5b617ec..4bc7c3b698 100644 --- a/client/node_update.go +++ b/client/node_update.go @@ -10,7 +10,7 @@ import ( // NodeUpdateOptions holds parameters to update nodes with. type NodeUpdateOptions struct { Version swarm.Version - Node swarm.NodeSpec + Spec swarm.NodeSpec } type NodeUpdateResult struct{} @@ -24,7 +24,7 @@ func (cli *Client) NodeUpdate(ctx context.Context, nodeID string, options NodeUp query := url.Values{} query.Set("version", options.Version.String()) - resp, err := cli.post(ctx, "/nodes/"+nodeID+"/update", query, options.Node, nil) + resp, err := cli.post(ctx, "/nodes/"+nodeID+"/update", query, options.Spec, nil) defer ensureReaderClosed(resp) return NodeUpdateResult{}, err } diff --git a/client/node_update_test.go b/client/node_update_test.go index d278699cb8..484e59bfe4 100644 --- a/client/node_update_test.go +++ b/client/node_update_test.go @@ -17,20 +17,20 @@ func TestNodeUpdateError(t *testing.T) { _, err = client.NodeUpdate(context.Background(), "node_id", NodeUpdateOptions{ Version: swarm.Version{}, - Node: swarm.NodeSpec{}, + Spec: swarm.NodeSpec{}, }) assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal)) _, err = client.NodeUpdate(context.Background(), "", NodeUpdateOptions{ Version: swarm.Version{}, - Node: swarm.NodeSpec{}, + Spec: swarm.NodeSpec{}, }) assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument)) assert.Check(t, is.ErrorContains(err, "value is empty")) _, err = client.NodeUpdate(context.Background(), " ", NodeUpdateOptions{ Version: swarm.Version{}, - Node: swarm.NodeSpec{}, + Spec: swarm.NodeSpec{}, }) assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument)) assert.Check(t, is.ErrorContains(err, "value is empty")) @@ -49,7 +49,7 @@ func TestNodeUpdate(t *testing.T) { _, err = client.NodeUpdate(context.Background(), "node_id", NodeUpdateOptions{ Version: swarm.Version{}, - Node: swarm.NodeSpec{}, + Spec: swarm.NodeSpec{}, }) assert.NilError(t, err) } diff --git a/internal/testutil/daemon/node.go b/internal/testutil/daemon/node.go index f631c53710..a541e37084 100644 --- a/internal/testutil/daemon/node.go +++ b/internal/testutil/daemon/node.go @@ -60,7 +60,7 @@ func (d *Daemon) UpdateNode(ctx context.Context, t testing.TB, id string, f ...N _, err := cli.NodeUpdate(ctx, node.ID, client.NodeUpdateOptions{ Version: node.Version, - Node: node.Spec, + Spec: node.Spec, }) if i < 10 && err != nil && strings.Contains(err.Error(), "update out of sequence") { time.Sleep(100 * time.Millisecond) diff --git a/vendor/github.com/moby/moby/client/node_update.go b/vendor/github.com/moby/moby/client/node_update.go index dcf5b617ec..4bc7c3b698 100644 --- a/vendor/github.com/moby/moby/client/node_update.go +++ b/vendor/github.com/moby/moby/client/node_update.go @@ -10,7 +10,7 @@ import ( // NodeUpdateOptions holds parameters to update nodes with. type NodeUpdateOptions struct { Version swarm.Version - Node swarm.NodeSpec + Spec swarm.NodeSpec } type NodeUpdateResult struct{} @@ -24,7 +24,7 @@ func (cli *Client) NodeUpdate(ctx context.Context, nodeID string, options NodeUp query := url.Values{} query.Set("version", options.Version.String()) - resp, err := cli.post(ctx, "/nodes/"+nodeID+"/update", query, options.Node, nil) + resp, err := cli.post(ctx, "/nodes/"+nodeID+"/update", query, options.Spec, nil) defer ensureReaderClosed(resp) return NodeUpdateResult{}, err }