@@ -205,21 +205,6 @@ type JobStatus struct {

 	LastExecution time.Time `json:",omitempty"`

 }

-// ServiceCreateOptions contains the options to use when creating a service.

-type ServiceCreateOptions 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

-

-	// 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

-}

-

 // Values for RegistryAuthFrom in ServiceUpdateOptions

 const (

 	RegistryAuthFromSpec         = "spec"

@@ -162,7 +162,7 @@ type PluginAPIClient interface {

 // ServiceAPIClient defines API client methods for the services

 type ServiceAPIClient interface {

-	ServiceCreate(ctx context.Context, service swarm.ServiceSpec, options swarm.ServiceCreateOptions) (swarm.ServiceCreateResponse, error)

+	ServiceCreate(ctx context.Context, service swarm.ServiceSpec, options ServiceCreateOptions) (swarm.ServiceCreateResponse, error)

 	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

@@ -16,7 +16,7 @@ import (

 )

 // ServiceCreate creates a new service.

-func (cli *Client) ServiceCreate(ctx context.Context, service swarm.ServiceSpec, options swarm.ServiceCreateOptions) (swarm.ServiceCreateResponse, error) {

+func (cli *Client) ServiceCreate(ctx context.Context, service swarm.ServiceSpec, options ServiceCreateOptions) (swarm.ServiceCreateResponse, error) {

 	var response swarm.ServiceCreateResponse

 	// Make sure we negotiated (if the client is configured to do so),

@@ -24,7 +24,7 @@ func TestServiceCreateError(t *testing.T) {

 	client := &Client{

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

 	}

-	_, err := client.ServiceCreate(context.Background(), swarm.ServiceSpec{}, swarm.ServiceCreateOptions{})

+	_, err := client.ServiceCreate(context.Background(), swarm.ServiceSpec{}, ServiceCreateOptions{})

 	assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))

 }

@@ -36,7 +36,7 @@ func TestServiceCreateConnectionError(t *testing.T) {

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

 	assert.NilError(t, err)

-	_, err = client.ServiceCreate(context.Background(), swarm.ServiceSpec{}, swarm.ServiceCreateOptions{})

+	_, err = client.ServiceCreate(context.Background(), swarm.ServiceSpec{}, ServiceCreateOptions{})

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

 }

@@ -63,7 +63,7 @@ func TestServiceCreate(t *testing.T) {

 		}),

 	}

-	r, err := client.ServiceCreate(context.Background(), swarm.ServiceSpec{}, swarm.ServiceCreateOptions{})

+	r, err := client.ServiceCreate(context.Background(), swarm.ServiceSpec{}, ServiceCreateOptions{})

 	assert.NilError(t, err)

 	assert.Check(t, is.Equal(r.ID, "service_id"))

 }

@@ -122,7 +122,7 @@ func TestServiceCreateCompatiblePlatforms(t *testing.T) {

 	spec := swarm.ServiceSpec{TaskTemplate: swarm.TaskSpec{ContainerSpec: &swarm.ContainerSpec{Image: "foobar:1.0"}}}

-	r, err := client.ServiceCreate(context.Background(), spec, swarm.ServiceCreateOptions{QueryRegistry: true})

+	r, err := client.ServiceCreate(context.Background(), spec, ServiceCreateOptions{QueryRegistry: true})

 	assert.NilError(t, err)

 	assert.Check(t, is.Equal("service_linux_amd64", r.ID))

 }

@@ -201,7 +201,7 @@ func TestServiceCreateDigestPinning(t *testing.T) {

 					Image: p.img,

 				},

 			},

-		}, swarm.ServiceCreateOptions{QueryRegistry: true})

+		}, ServiceCreateOptions{QueryRegistry: true})

 		assert.NilError(t, err)

 		assert.Check(t, is.Equal(r.ID, "service_id"))

new file mode 100644

@@ -0,0 +1,16 @@

+package client

+

+// ServiceCreateOptions contains the options to use when creating a service.

+type ServiceCreateOptions 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

+

+	// 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

+}

@@ -414,7 +414,7 @@ func (s *DockerSwarmSuite) TestAPISwarmRaftQuorum(c *testing.T) {

 	// d1 will eventually step down from leader because there is no longer an active quorum, wait for that to happen

 	poll.WaitOn(c, pollCheck(c, func(t *testing.T) (any, string) {

-		_, err := cli.ServiceCreate(testutil.GetContext(t), service.Spec, swarm.ServiceCreateOptions{})

+		_, err := cli.ServiceCreate(testutil.GetContext(t), service.Spec, client.ServiceCreateOptions{})

 		return err.Error(), ""

 	}, checker.Contains("Make sure more than half of the managers are online.")), poll.WithTimeout(defaultReconciliationTimeout*2))

@@ -63,7 +63,7 @@ func CreateService(ctx context.Context, t *testing.T, d *daemon.Daemon, opts ...

 	defer apiClient.Close()

 	spec := CreateServiceSpec(t, opts...)

-	resp, err := apiClient.ServiceCreate(ctx, spec, swarmtypes.ServiceCreateOptions{})

+	resp, err := apiClient.ServiceCreate(ctx, spec, client.ServiceCreateOptions{})

 	assert.NilError(t, err, "error creating service")

 	return resp.ID

 }

@@ -164,7 +164,7 @@ func TestCreateServiceConflict(t *testing.T) {

 	swarm.CreateService(ctx, t, d, serviceSpec...)

 	spec := swarm.CreateServiceSpec(t, serviceSpec...)

-	_, err := c.ServiceCreate(ctx, spec, swarmtypes.ServiceCreateOptions{})

+	_, err := c.ServiceCreate(ctx, spec, client.ServiceCreateOptions{})

 	assert.Check(t, cerrdefs.IsConflict(err))

 	assert.ErrorContains(t, err, "service "+serviceName+" already exists")

 }

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

 	"github.com/google/go-cmp/cmp"

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

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

+	"github.com/moby/moby/client"

 	"github.com/moby/moby/v2/integration/internal/swarm"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

@@ -20,22 +21,22 @@ func TestInspect(t *testing.T) {

 	ctx := setupTest(t)

 	d := swarm.NewSwarm(ctx, t, testEnv)

 	defer d.Stop(t)

-	client := d.NewClientT(t)

-	defer client.Close()

+	apiClient := d.NewClientT(t)

+	defer apiClient.Close()

 	now := time.Now()

 	var instances uint64 = 2

 	serviceSpec := fullSwarmServiceSpec("test-service-inspect"+t.Name(), instances)

-	resp, err := client.ServiceCreate(ctx, serviceSpec, swarmtypes.ServiceCreateOptions{

+	resp, err := apiClient.ServiceCreate(ctx, serviceSpec, client.ServiceCreateOptions{

 		QueryRegistry: false,

 	})

 	assert.NilError(t, err)

 	id := resp.ID

-	poll.WaitOn(t, swarm.RunningTasksCount(ctx, client, id, instances))

+	poll.WaitOn(t, swarm.RunningTasksCount(ctx, apiClient, id, instances))

-	service, _, err := client.ServiceInspectWithRaw(ctx, id, swarmtypes.ServiceInspectOptions{})

+	service, _, err := apiClient.ServiceInspectWithRaw(ctx, id, swarmtypes.ServiceInspectOptions{})

 	assert.NilError(t, err)

 	expected := swarmtypes.Service{

@@ -44,7 +44,7 @@ func TestServiceListWithStatuses(t *testing.T) {

 		// tasks to fail and exit. instead, we'll just pass no args, which

 		// works.

 		spec.TaskTemplate.ContainerSpec.Args = []string{}

-		resp, err := apiClient.ServiceCreate(ctx, spec, swarmtypes.ServiceCreateOptions{

+		resp, err := apiClient.ServiceCreate(ctx, spec, client.ServiceCreateOptions{

 			QueryRegistry: false,

 		})

 		assert.NilError(t, err)

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

 // ServiceConstructor defines a swarm service constructor function

 type ServiceConstructor func(*swarm.Service)

-func (d *Daemon) createServiceWithOptions(ctx context.Context, t testing.TB, opts swarm.ServiceCreateOptions, f ...ServiceConstructor) string {

+func (d *Daemon) createServiceWithOptions(ctx context.Context, t testing.TB, opts client.ServiceCreateOptions, f ...ServiceConstructor) string {

 	t.Helper()

 	var service swarm.Service

 	for _, fn := range f {

@@ -35,7 +35,7 @@ func (d *Daemon) createServiceWithOptions(ctx context.Context, t testing.TB, opt

 // CreateService creates a swarm service given the specified service constructor

 func (d *Daemon) CreateService(ctx context.Context, t testing.TB, f ...ServiceConstructor) string {

 	t.Helper()

-	return d.createServiceWithOptions(ctx, t, swarm.ServiceCreateOptions{}, f...)

+	return d.createServiceWithOptions(ctx, t, client.ServiceCreateOptions{}, f...)

 }

 // GetService returns the swarm service corresponding to the specified id

@@ -205,21 +205,6 @@ type JobStatus struct {

 	LastExecution time.Time `json:",omitempty"`

 }

-// ServiceCreateOptions contains the options to use when creating a service.

-type ServiceCreateOptions 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

-

-	// 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

-}

-

 // Values for RegistryAuthFrom in ServiceUpdateOptions

 const (

 	RegistryAuthFromSpec         = "spec"

@@ -162,7 +162,7 @@ type PluginAPIClient interface {

 // ServiceAPIClient defines API client methods for the services

 type ServiceAPIClient interface {

-	ServiceCreate(ctx context.Context, service swarm.ServiceSpec, options swarm.ServiceCreateOptions) (swarm.ServiceCreateResponse, error)

+	ServiceCreate(ctx context.Context, service swarm.ServiceSpec, options ServiceCreateOptions) (swarm.ServiceCreateResponse, error)

 	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

@@ -16,7 +16,7 @@ import (

 )

 // ServiceCreate creates a new service.

-func (cli *Client) ServiceCreate(ctx context.Context, service swarm.ServiceSpec, options swarm.ServiceCreateOptions) (swarm.ServiceCreateResponse, error) {

+func (cli *Client) ServiceCreate(ctx context.Context, service swarm.ServiceSpec, options ServiceCreateOptions) (swarm.ServiceCreateResponse, error) {

 	var response swarm.ServiceCreateResponse

 	// Make sure we negotiated (if the client is configured to do so),

new file mode 100644

@@ -0,0 +1,16 @@

+package client

+

+// ServiceCreateOptions contains the options to use when creating a service.

+type ServiceCreateOptions 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

+

+	// 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

+}