p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace all "Filter" field with "Filters" for consistency

Browse Source 
In file `api/types/client.go`, some of the "*Options{}" structs own a
`Filters` field while some else have the name of `Filter`, this commit
will rename all `Filter` to `Filters` for consistency. Also `Filters`
is consistent with API with format `/xxx?filters=xxx`, that's why
`Filters` is the right name.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 89a6966726941b4b7f0431ab214013cf9c655c25
Component: engine
This commit is contained in:
Zhang Wei
2016-11-01 22:01:16 +08:00
parent d375460d63
commit 9cb45952e0
23 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/cli/command/stack/common.go
View File

@ -34,7 +34,7 @@ func getServices(
) ([]swarm.Service, error) {
return apiclient.ServiceList(
ctx,
types.ServiceListOptions{Filter: getStackFilter(namespace)})
types.ServiceListOptions{Filters: getStackFilter(namespace)})
}
func getNetworks(

2
components/engine/cli/command/stack/list.go
View File

@ -87,7 +87,7 @@ func getStacks(
services, err := apiclient.ServiceList(
ctx,
types.ServiceListOptions{Filter: filter})
types.ServiceListOptions{Filters: filter})
if err != nil {
return nil, err
}

2
components/engine/cli/command/stack/ps.go
View File

@ -56,7 +56,7 @@ func runPS(dockerCli *command.DockerCli, opts psOptions) error {
filter.Add("desired-state", string(swarm.TaskStateAccepted))
}
tasks, err := client.TaskList(ctx, types.TaskListOptions{Filter: filter})
tasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: filter})
if err != nil {
return err
}

4
components/engine/cli/command/stack/services.go
View File

@ -46,7 +46,7 @@ func runServices(dockerCli *command.DockerCli, opts servicesOptions) error {
filter := opts.filter.Value()
filter.Add("label", labelNamespace+"="+opts.namespace)
services, err := client.ServiceList(ctx, types.ServiceListOptions{Filter: filter})
services, err := client.ServiceList(ctx, types.ServiceListOptions{Filters: filter})
if err != nil {
return err
}
@ -67,7 +67,7 @@ func runServices(dockerCli *command.DockerCli, opts servicesOptions) error {
taskFilter.Add("service", service.ID)
}
tasks, err := client.TaskList(ctx, types.TaskListOptions{Filter: taskFilter})
tasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: taskFilter})
if err != nil {
return err
}