InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: rename ServiceListResult.Services to ServiceListResult.Items

Browse Source 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
This commit is contained in:
Austin Vazquez
2025-10-22 15:51:27 -05:00
parent 00abc3a9d5
commit 5a5d39205c
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/service_list.go
View File

@@ -19,7 +19,7 @@ type ServiceListOptions struct {
// ServiceListResult represents the result of a service list operation.
type ServiceListResult struct {
Services []swarm.Service
Items []swarm.Service
}
// ServiceList returns the list of services.
@@ -40,5 +40,5 @@ func (cli *Client) ServiceList(ctx context.Context, options ServiceListOptions)
var services []swarm.Service
err = json.NewDecoder(resp.Body).Decode(&services)
return ServiceListResult{Services: services}, err
return ServiceListResult{Items: services}, err
}

2
client/service_list_test.go
View File

@@ -77,6 +77,6 @@ func TestServiceList(t *testing.T) {
list, err := client.ServiceList(context.Background(), listCase.options)
assert.NilError(t, err)
assert.Check(t, is.Len(list.Services, 2))
assert.Check(t, is.Len(list.Items, 2))
}
}

4
integration/network/service_test.go
View File

@@ -337,10 +337,10 @@ func noServices(ctx context.Context, apiClient client.ServiceAPIClient) func(log
switch {
case err != nil:
return poll.Error(err)
case len(result.Services) == 0:
case len(result.Items) == 0:
return poll.Success()
default:
return poll.Continue("waiting for all services to be removed: service count at %d", len(result.Services))
return poll.Continue("waiting for all services to be removed: service count at %d", len(result.Items))
}
}
}

8
integration/service/list_test.go
View File

@@ -80,16 +80,16 @@ func TestServiceListWithStatuses(t *testing.T) {
// now, let's do the list operation with no status arg set.
result, err := apiClient.ServiceList(ctx, client.ServiceListOptions{})
assert.NilError(t, err)
assert.Check(t, is.Len(result.Services, serviceCount))
for _, service := range result.Services {
assert.Check(t, is.Len(result.Items, serviceCount))
for _, service := range result.Items {
assert.Check(t, is.Nil(service.ServiceStatus))
}
// now try again, but with Status: true. This time, we should have statuses
result, err = apiClient.ServiceList(ctx, client.ServiceListOptions{Status: true})
assert.NilError(t, err)
assert.Check(t, is.Len(result.Services, serviceCount))
for _, service := range result.Services {
assert.Check(t, is.Len(result.Items, serviceCount))
for _, service := range result.Items {
replicas := *service.Spec.Mode.Replicated.Replicas
assert.Assert(t, service.ServiceStatus != nil)

2
internal/testutil/daemon/service.go
View File

@@ -107,7 +107,7 @@ func (d *Daemon) ListServices(ctx context.Context, t testing.TB) []swarm.Service
res, err := cli.ServiceList(ctx, client.ServiceListOptions{})
assert.NilError(t, err)
return res.Services
return res.Items
}
// GetTask returns the swarm task identified by the specified id

4
vendor/github.com/moby/moby/client/service_list.go generated vendored
View File

@@ -19,7 +19,7 @@ type ServiceListOptions struct {
// ServiceListResult represents the result of a service list operation.
type ServiceListResult struct {
Services []swarm.Service
Items []swarm.Service
}
// ServiceList returns the list of services.
@@ -40,5 +40,5 @@ func (cli *Client) ServiceList(ctx context.Context, options ServiceListOptions)
var services []swarm.Service
err = json.NewDecoder(resp.Body).Decode(&services)
return ServiceListResult{Services: services}, err
return ServiceListResult{Items: services}, err
}