@@ -3,7 +3,6 @@ package swarm // import "github.com/docker/docker/api/server/router/swarm"

 import (

 	"context"

-	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/backend"

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/swarm"

@@ -21,7 +20,7 @@ type Backend interface {

 	GetServices(swarm.ServiceListOptions) ([]swarm.Service, error)

 	GetService(idOrName string, insertDefaults bool) (swarm.Service, error)

 	CreateService(swarm.ServiceSpec, string, bool) (*swarm.ServiceCreateResponse, error)

-	UpdateService(string, uint64, swarm.ServiceSpec, types.ServiceUpdateOptions, bool) (*swarm.ServiceUpdateResponse, error)

+	UpdateService(string, uint64, swarm.ServiceSpec, swarm.ServiceUpdateOptions, bool) (*swarm.ServiceUpdateResponse, error)

 	RemoveService(string) error

 	ServiceLogs(context.Context, *backend.LogSelector, *container.LogsOptions) (<-chan *backend.LogMessage, error)

 	GetNodes(swarm.NodeListOptions) ([]swarm.Node, error)

@@ -8,7 +8,6 @@ import (

 	"github.com/containerd/log"

 	"github.com/docker/docker/api/server/httputils"

-	basictypes "github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/backend"

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/registry"

@@ -245,7 +244,7 @@ func (sr *swarmRouter) updateService(ctx context.Context, w http.ResponseWriter,

 		return errdefs.InvalidParameter(err)

 	}

-	var flags basictypes.ServiceUpdateOptions

+	var flags types.ServiceUpdateOptions

 	// Get returns "" if the header does not exist

 	flags.EncodedRegistryAuth = r.Header.Get(registry.AuthHeader)

@@ -46,42 +46,6 @@ func (h *HijackedResponse) CloseWrite() error {

 	return nil

 }

-// Values for RegistryAuthFrom in ServiceUpdateOptions

-const (

-	RegistryAuthFromSpec         = "spec"

-	RegistryAuthFromPreviousSpec = "previous-spec"

-)

-

-// ServiceUpdateOptions contains the options to be used for updating services.

-type ServiceUpdateOptions struct {

-	// EncodedRegistryAuth is the encoded registry authorization credentials to

-	// use when updating the service.

-	//

-	// This field follows the format of the X-Registry-Auth header.

-	EncodedRegistryAuth string

-

-	// TODO(stevvooe): Consider moving the version parameter of ServiceUpdate

-	// into this field. While it does open API users up to racy writes, most

-	// users may not need that level of consistency in practice.

-

-	// RegistryAuthFrom specifies where to find the registry authorization

-	// credentials if they are not given in EncodedRegistryAuth. Valid

-	// values are "spec" and "previous-spec".

-	RegistryAuthFrom string

-

-	// Rollback indicates whether a server-side rollback should be

-	// performed. When this is set, the provided spec will be ignored.

-	// The valid values are "previous" and "none". An empty value is the

-	// same as "none".

-	Rollback string

-

-	// QueryRegistry indicates whether the service update requires

-	// contacting a registry. A registry may be contacted to retrieve

-	// the image digest and manifest, which in turn can be used to update

-	// platform or other information about the service.

-	QueryRegistry bool

-}

-

 // PluginRemoveOptions holds parameters to remove plugins.

 type PluginRemoveOptions struct {

 	Force bool

@@ -220,6 +220,42 @@ type ServiceCreateOptions struct {

 	QueryRegistry bool

 }

+// Values for RegistryAuthFrom in ServiceUpdateOptions

+const (

+	RegistryAuthFromSpec         = "spec"

+	RegistryAuthFromPreviousSpec = "previous-spec"

+)

+

+// ServiceUpdateOptions contains the options to be used for updating services.

+type ServiceUpdateOptions struct {

+	// EncodedRegistryAuth is the encoded registry authorization credentials to

+	// use when updating the service.

+	//

+	// This field follows the format of the X-Registry-Auth header.

+	EncodedRegistryAuth string

+

+	// TODO(stevvooe): Consider moving the version parameter of ServiceUpdate

+	// into this field. While it does open API users up to racy writes, most

+	// users may not need that level of consistency in practice.

+

+	// RegistryAuthFrom specifies where to find the registry authorization

+	// credentials if they are not given in EncodedRegistryAuth. Valid

+	// values are "spec" and "previous-spec".

+	RegistryAuthFrom string

+

+	// Rollback indicates whether a server-side rollback should be

+	// performed. When this is set, the provided spec will be ignored.

+	// The valid values are "previous" and "none". An empty value is the

+	// same as "none".

+	Rollback string

+

+	// QueryRegistry indicates whether the service update requires

+	// contacting a registry. A registry may be contacted to retrieve

+	// the image digest and manifest, which in turn can be used to update

+	// platform or other information about the service.

+	QueryRegistry bool

+}

+

 // ServiceListOptions holds parameters to list services with.

 type ServiceListOptions struct {

 	Filters filters.Args

@@ -158,6 +158,16 @@ type TaskListOptions = swarm.TaskListOptions

 // Deprecated: use [swarm.ServiceCreateOptions].

 type ServiceCreateOptions = swarm.ServiceCreateOptions

+// ServiceUpdateOptions contains the options to be used for updating services.

+//

+// Deprecated: use [swarm.ServiceCreateOptions].

+type ServiceUpdateOptions = swarm.ServiceUpdateOptions

+

+const (

+	RegistryAuthFromSpec         = swarm.RegistryAuthFromSpec         // Deprecated: use [swarm.RegistryAuthFromSpec].

+	RegistryAuthFromPreviousSpec = swarm.RegistryAuthFromPreviousSpec // Deprecated: use [swarm.RegistryAuthFromPreviousSpec].

+)

+

 // ServiceListOptions holds parameters to list services with.

 //

 // Deprecated: use [swarm.ServiceListOptions].

@@ -180,7 +180,7 @@ type ServiceAPIClient interface {

 	ServiceInspectWithRaw(ctx context.Context, serviceID string, options swarm.ServiceInspectOptions) (swarm.Service, []byte, error)

 	ServiceList(ctx context.Context, options swarm.ServiceListOptions) ([]swarm.Service, error)

 	ServiceRemove(ctx context.Context, serviceID string) error

-	ServiceUpdate(ctx context.Context, serviceID string, version swarm.Version, service swarm.ServiceSpec, options types.ServiceUpdateOptions) (swarm.ServiceUpdateResponse, error)

+	ServiceUpdate(ctx context.Context, serviceID string, version swarm.Version, service swarm.ServiceSpec, options swarm.ServiceUpdateOptions) (swarm.ServiceUpdateResponse, error)

 	ServiceLogs(ctx context.Context, serviceID string, options container.LogsOptions) (io.ReadCloser, error)

 	TaskLogs(ctx context.Context, taskID string, options container.LogsOptions) (io.ReadCloser, error)

 	TaskInspectWithRaw(ctx context.Context, taskID string) (swarm.Task, []byte, error)

@@ -6,7 +6,6 @@ import (

 	"net/http"

 	"net/url"

-	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/registry"

 	"github.com/docker/docker/api/types/swarm"

 	"github.com/docker/docker/api/types/versions"

@@ -15,7 +14,7 @@ import (

 // ServiceUpdate updates a Service. The version number is required to avoid conflicting writes.

 // It should be the value as set *before* the update. You can find this value in the Meta field

 // of swarm.Service, which can be found using ServiceInspectWithRaw.

-func (cli *Client) ServiceUpdate(ctx context.Context, serviceID string, version swarm.Version, service swarm.ServiceSpec, options types.ServiceUpdateOptions) (swarm.ServiceUpdateResponse, error) {

+func (cli *Client) ServiceUpdate(ctx context.Context, serviceID string, version swarm.Version, service swarm.ServiceSpec, options swarm.ServiceUpdateOptions) (swarm.ServiceUpdateResponse, error) {

 	serviceID, err := trimID("service", serviceID)

 	if err != nil {

 		return swarm.ServiceUpdateResponse{}, err

@@ -9,7 +9,6 @@ import (

 	"strings"

 	"testing"

-	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/swarm"

 	"github.com/docker/docker/errdefs"

 	"gotest.tools/v3/assert"

@@ -21,14 +20,14 @@ func TestServiceUpdateError(t *testing.T) {

 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),

 	}

-	_, err := client.ServiceUpdate(context.Background(), "service_id", swarm.Version{}, swarm.ServiceSpec{}, types.ServiceUpdateOptions{})

+	_, err := client.ServiceUpdate(context.Background(), "service_id", swarm.Version{}, swarm.ServiceSpec{}, swarm.ServiceUpdateOptions{})

 	assert.Check(t, is.ErrorType(err, errdefs.IsSystem))

-	_, err = client.ServiceUpdate(context.Background(), "", swarm.Version{}, swarm.ServiceSpec{}, types.ServiceUpdateOptions{})

+	_, err = client.ServiceUpdate(context.Background(), "", swarm.Version{}, swarm.ServiceSpec{}, swarm.ServiceUpdateOptions{})

 	assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))

 	assert.Check(t, is.ErrorContains(err, "value is empty"))

-	_, err = client.ServiceUpdate(context.Background(), "    ", swarm.Version{}, swarm.ServiceSpec{}, types.ServiceUpdateOptions{})

+	_, err = client.ServiceUpdate(context.Background(), "    ", swarm.Version{}, swarm.ServiceSpec{}, swarm.ServiceUpdateOptions{})

 	assert.Check(t, is.ErrorType(err, errdefs.IsInvalidParameter))

 	assert.Check(t, is.ErrorContains(err, "value is empty"))

 }

@@ -41,7 +40,7 @@ func TestServiceUpdateConnectionError(t *testing.T) {

 	client, err := NewClientWithOpts(WithAPIVersionNegotiation(), WithHost("tcp://no-such-host.invalid"))

 	assert.NilError(t, err)

-	_, err = client.ServiceUpdate(context.Background(), "service_id", swarm.Version{}, swarm.ServiceSpec{}, types.ServiceUpdateOptions{})

+	_, err = client.ServiceUpdate(context.Background(), "service_id", swarm.Version{}, swarm.ServiceSpec{}, swarm.ServiceUpdateOptions{})

 	assert.Check(t, is.ErrorType(err, IsErrConnectionFailed))

 }

@@ -89,7 +88,7 @@ func TestServiceUpdate(t *testing.T) {

 			}),

 		}

-		_, err := client.ServiceUpdate(context.Background(), "service_id", updateCase.swarmVersion, swarm.ServiceSpec{}, types.ServiceUpdateOptions{})

+		_, err := client.ServiceUpdate(context.Background(), "service_id", updateCase.swarmVersion, swarm.ServiceSpec{}, swarm.ServiceUpdateOptions{})

 		assert.NilError(t, err)

 	}

 }

@@ -13,7 +13,6 @@ import (

 	"github.com/containerd/log"

 	"github.com/distribution/reference"

-	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/backend"

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/registry"

@@ -283,7 +282,7 @@ func (c *Cluster) CreateService(s swarm.ServiceSpec, encodedAuth string, queryRe

 }

 // UpdateService updates existing service to match new properties.

-func (c *Cluster) UpdateService(serviceIDOrName string, version uint64, spec swarm.ServiceSpec, flags types.ServiceUpdateOptions, queryRegistry bool) (*swarm.ServiceUpdateResponse, error) {

+func (c *Cluster) UpdateService(serviceIDOrName string, version uint64, spec swarm.ServiceSpec, flags swarm.ServiceUpdateOptions, queryRegistry bool) (*swarm.ServiceUpdateResponse, error) {

 	var resp *swarm.ServiceUpdateResponse

 	err := c.lockedManagerAction(func(ctx context.Context, state nodeState) error {

@@ -328,9 +327,9 @@ func (c *Cluster) UpdateService(serviceIDOrName string, version uint64, spec swa

 				// shouldn't lose it, and continue to use the one that was already present

 				var ctnr *swarmapi.ContainerSpec

 				switch flags.RegistryAuthFrom {

-				case types.RegistryAuthFromSpec, "":

+				case swarm.RegistryAuthFromSpec, "":

 					ctnr = currentService.Spec.Task.GetContainer()

-				case types.RegistryAuthFromPreviousSpec:

+				case swarm.RegistryAuthFromPreviousSpec:

 					if currentService.PreviousSpec == nil {

 						return errors.New("service does not have a previous spec")

 					}

@@ -18,7 +18,6 @@ import (

 	"github.com/cloudflare/cfssl/csr"

 	"github.com/cloudflare/cfssl/helpers"

 	"github.com/cloudflare/cfssl/initca"

-	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/network"

 	"github.com/docker/docker/api/types/swarm"

@@ -890,7 +889,7 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesUpdateWithName(c *testing.T) {

 	setInstances(instances)(service)

 	cli := d.NewClientT(c)

 	defer cli.Close()

-	_, err := cli.ServiceUpdate(ctx, service.Spec.Name, service.Version, service.Spec, types.ServiceUpdateOptions{})

+	_, err := cli.ServiceUpdate(ctx, service.Spec.Name, service.Version, service.Spec, swarm.ServiceUpdateOptions{})

 	assert.NilError(c, err)

 	poll.WaitOn(c, pollCheck(c, d.CheckActiveContainerCount(ctx), checker.Equals(instances)), poll.WithTimeout(defaultReconciliationTimeout))

 }

@@ -3,7 +3,6 @@ package service

 import (

 	"testing"

-	"github.com/docker/docker/api/types"

 	swarmtypes "github.com/docker/docker/api/types/swarm"

 	"github.com/docker/docker/integration/internal/swarm"

 	"gotest.tools/v3/assert"

@@ -120,7 +119,7 @@ func TestUpdateReplicatedJob(t *testing.T) {

 	spec.TaskTemplate.ForceUpdate++

 	_, err = client.ServiceUpdate(

-		ctx, id, service.Version, spec, types.ServiceUpdateOptions{},

+		ctx, id, service.Version, spec, swarmtypes.ServiceUpdateOptions{},

 	)

 	assert.NilError(t, err)

@@ -4,7 +4,6 @@ import (

 	"context"

 	"testing"

-	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/filters"

 	networktypes "github.com/docker/docker/api/types/network"

@@ -35,7 +34,7 @@ func TestServiceUpdateLabel(t *testing.T) {

 	// add label to empty set

 	service.Spec.Labels["foo"] = "bar"

-	_, err := cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{})

+	_, err := cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, swarmtypes.ServiceUpdateOptions{})

 	assert.NilError(t, err)

 	poll.WaitOn(t, serviceSpecIsUpdated(ctx, cli, serviceID, service.Version.Index), swarm.ServicePoll)

 	service = getService(ctx, t, cli, serviceID)

@@ -43,21 +42,21 @@ func TestServiceUpdateLabel(t *testing.T) {

 	// add label to non-empty set

 	service.Spec.Labels["foo2"] = "bar"

-	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{})

+	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, swarmtypes.ServiceUpdateOptions{})

 	assert.NilError(t, err)

 	poll.WaitOn(t, serviceSpecIsUpdated(ctx, cli, serviceID, service.Version.Index), swarm.ServicePoll)

 	service = getService(ctx, t, cli, serviceID)

 	assert.Check(t, is.DeepEqual(service.Spec.Labels, map[string]string{"foo": "bar", "foo2": "bar"}))

 	delete(service.Spec.Labels, "foo2")

-	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{})

+	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, swarmtypes.ServiceUpdateOptions{})

 	assert.NilError(t, err)

 	poll.WaitOn(t, serviceSpecIsUpdated(ctx, cli, serviceID, service.Version.Index), swarm.ServicePoll)

 	service = getService(ctx, t, cli, serviceID)

 	assert.Check(t, is.DeepEqual(service.Spec.Labels, map[string]string{"foo": "bar"}))

 	delete(service.Spec.Labels, "foo")

-	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{})

+	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, swarmtypes.ServiceUpdateOptions{})

 	assert.NilError(t, err)

 	poll.WaitOn(t, serviceSpecIsUpdated(ctx, cli, serviceID, service.Version.Index), swarm.ServicePoll)

 	service = getService(ctx, t, cli, serviceID)

@@ -65,7 +64,7 @@ func TestServiceUpdateLabel(t *testing.T) {

 	// now make sure we can add again

 	service.Spec.Labels["foo"] = "bar"

-	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{})

+	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, swarmtypes.ServiceUpdateOptions{})

 	assert.NilError(t, err)

 	poll.WaitOn(t, serviceSpecIsUpdated(ctx, cli, serviceID, service.Version.Index), swarm.ServicePoll)

 	service = getService(ctx, t, cli, serviceID)

@@ -112,7 +111,7 @@ func TestServiceUpdateSecrets(t *testing.T) {

 			SecretName: secretName,

 		},

 	)

-	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{})

+	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, swarmtypes.ServiceUpdateOptions{})

 	assert.NilError(t, err)

 	poll.WaitOn(t, serviceIsUpdated(ctx, cli, serviceID), swarm.ServicePoll)

@@ -127,7 +126,7 @@ func TestServiceUpdateSecrets(t *testing.T) {

 	// remove

 	service.Spec.TaskTemplate.ContainerSpec.Secrets = []*swarmtypes.SecretReference{}

-	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{})

+	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, swarmtypes.ServiceUpdateOptions{})

 	assert.NilError(t, err)

 	poll.WaitOn(t, serviceIsUpdated(ctx, cli, serviceID), swarm.ServicePoll)

 	service = getService(ctx, t, cli, serviceID)

@@ -174,7 +173,7 @@ func TestServiceUpdateConfigs(t *testing.T) {

 			ConfigName: configName,

 		},

 	)

-	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{})

+	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, swarmtypes.ServiceUpdateOptions{})

 	assert.NilError(t, err)

 	poll.WaitOn(t, serviceIsUpdated(ctx, cli, serviceID), swarm.ServicePoll)

@@ -189,7 +188,7 @@ func TestServiceUpdateConfigs(t *testing.T) {

 	// remove

 	service.Spec.TaskTemplate.ContainerSpec.Configs = []*swarmtypes.ConfigReference{}

-	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{})

+	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, swarmtypes.ServiceUpdateOptions{})

 	assert.NilError(t, err)

 	poll.WaitOn(t, serviceIsUpdated(ctx, cli, serviceID), swarm.ServicePoll)

 	service = getService(ctx, t, cli, serviceID)

@@ -232,7 +231,7 @@ func TestServiceUpdateNetwork(t *testing.T) {

 	// Remove network from service

 	service.Spec.TaskTemplate.Networks = []swarmtypes.NetworkAttachmentConfig{}

-	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{})

+	_, err = cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, swarmtypes.ServiceUpdateOptions{})

 	assert.NilError(t, err)

 	poll.WaitOn(t, serviceIsUpdated(ctx, cli, serviceID), swarm.ServicePoll)

@@ -300,7 +299,7 @@ func TestServiceUpdatePidsLimit(t *testing.T) {

 					service.Spec.TaskTemplate.Resources.Limits = &swarmtypes.Limit{}

 				}

 				service.Spec.TaskTemplate.Resources.Limits.Pids = tc.pidsLimit

-				_, err := cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, types.ServiceUpdateOptions{})

+				_, err := cli.ServiceUpdate(ctx, serviceID, service.Version, service.Spec, swarmtypes.ServiceUpdateOptions{})

 				assert.NilError(t, err)

 				poll.WaitOn(t, serviceIsUpdated(ctx, cli, serviceID), swarm.ServicePoll)

 			}

@@ -5,7 +5,6 @@ import (

 	"testing"

 	"time"

-	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/swarm"

 	"gotest.tools/v3/assert"

@@ -82,7 +81,7 @@ func (d *Daemon) UpdateService(ctx context.Context, t testing.TB, service *swarm

 		fn(service)

 	}

-	_, err := cli.ServiceUpdate(ctx, service.ID, service.Version, service.Spec, types.ServiceUpdateOptions{})

+	_, err := cli.ServiceUpdate(ctx, service.ID, service.Version, service.Spec, swarm.ServiceUpdateOptions{})

 	assert.NilError(t, err)

 }