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

client: refactor service api client functions for defined options/result structs

Browse Source 
Co-authored-by: Claude <noreply@anthropic.com>
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
This commit is contained in:
Austin Vazquez
2025-10-21 14:21:54 -05:00
parent 13374b5a72
commit cd08b79c02
50 changed files with 646 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
integration-cli/daemon/daemon_swarm.go
View File

@@ -103,13 +103,13 @@ func (d *Daemon) CheckRunningTaskNetworks(ctx context.Context) func(t *testing.T
cli := d.NewClientT(t)
defer cli.Close()
taskResult, err := cli.TaskList(ctx, client.TaskListOptions{
taskList, err := cli.TaskList(ctx, client.TaskListOptions{
Filters: make(client.Filters).Add("desired-state", "running"),
})
assert.NilError(t, err)
result := make(map[string]int)
for _, task := range taskResult.Tasks {
for _, task := range taskList.Items {
for _, network := range task.Spec.Networks {
result[network.Target]++
}
@@ -124,13 +124,13 @@ func (d *Daemon) CheckRunningTaskImages(ctx context.Context) func(t *testing.T)
cli := d.NewClientT(t)
defer cli.Close()
taskResult, err := cli.TaskList(ctx, client.TaskListOptions{
taskList, err := cli.TaskList(ctx, client.TaskListOptions{
Filters: make(client.Filters).Add("desired-state", "running"),
})
assert.NilError(t, err)
result := make(map[string]int)
for _, task := range taskResult.Tasks {
for _, task := range taskList.Items {
if task.Status.State == swarm.TaskStateRunning && task.Spec.ContainerSpec != nil {
result[task.Spec.ContainerSpec.Image]++
}

8
integration-cli/docker_api_swarm_service_test.go
View File

@@ -78,14 +78,14 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesCreate(c *testing.T) {
options := client.ServiceInspectOptions{InsertDefaults: true}
// insertDefaults inserts UpdateConfig when service is fetched by ID
resp, _, err := apiClient.ServiceInspectWithRaw(ctx, id, options)
out := fmt.Sprintf("%+v", resp)
res, err := apiClient.ServiceInspect(ctx, id, options)
out := fmt.Sprintf("%+v", res.Service)
assert.NilError(c, err)
assert.Assert(c, is.Contains(out, "UpdateConfig"))
// insertDefaults inserts UpdateConfig when service is fetched by ID
resp, _, err = apiClient.ServiceInspectWithRaw(ctx, "top", options)
out = fmt.Sprintf("%+v", resp)
res, err = apiClient.ServiceInspect(ctx, "top", options)
out = fmt.Sprintf("%+v", res.Service)
assert.NilError(c, err)
assert.Assert(c, is.Contains(out, "UpdateConfig"))