beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename desired_state filter to desired-state

Browse source 
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d761719eb4)
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Sebastiaan van Stijn 2016-06-29 09:20:32 -07:00 committed by Tibor Vass
parent 76aed24192
commit 67f4f5d2c4
6 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
api/client/node/tasks.go
View file

@ -55,10 +55,9 @@ func runTasks(dockerCli *client.DockerCli, opts tasksOptions) error {
filter := opts.filter.Value()
filter.Add("node", node.ID)
if !opts.all && !filter.Include("desired_state") {
filter.Add("desired_state", string(swarm.TaskStateRunning))
filter.Add("desired_state", string(swarm.TaskStateAccepted))
if !opts.all && !filter.Include("desired-state") {
filter.Add("desired-state", string(swarm.TaskStateRunning))
filter.Add("desired-state", string(swarm.TaskStateAccepted))
}
tasks, err := client.TaskList(

6
api/client/service/tasks.go
View file

@ -51,9 +51,9 @@ func runTasks(dockerCli *client.DockerCli, opts tasksOptions) error {
filter := opts.filter.Value()
filter.Add("service", service.ID)
if !opts.all && !filter.Include("desired_state") {
filter.Add("desired_state", string(swarm.TaskStateRunning))
filter.Add("desired_state", string(swarm.TaskStateAccepted))
if !opts.all && !filter.Include("desired-state") {
filter.Add("desired-state", string(swarm.TaskStateRunning))
filter.Add("desired-state", string(swarm.TaskStateAccepted))
}
tasks, err := client.TaskList(ctx, types.TaskListOptions{Filter: filter})

6
api/client/stack/tasks.go
View file

@ -48,9 +48,9 @@ func runTasks(dockerCli *client.DockerCli, opts tasksOptions) error {
filter := opts.filter.Value()
filter.Add("label", labelNamespace+"="+opts.namespace)
if !opts.all && !filter.Include("desired_state") {
filter.Add("desired_state", string(swarm.TaskStateRunning))
filter.Add("desired_state", string(swarm.TaskStateAccepted))
if !opts.all && !filter.Include("desired-state") {
filter.Add("desired-state", string(swarm.TaskStateRunning))
filter.Add("desired-state", string(swarm.TaskStateAccepted))
}
tasks, err := client.TaskList(ctx, types.TaskListOptions{Filter: filter})

6
daemon/cluster/filters.go
View file

@ -68,7 +68,7 @@ func newListTasksFilters(filter filters.Args) (*swarmapi.ListTasksRequest_Filter
"label": true,
"service": true,
"node": true,
"desired_state": true,
"desired-state": true,
}
if err := filter.Validate(accepted); err != nil {
return nil, err
@ -81,11 +81,11 @@ func newListTasksFilters(filter filters.Args) (*swarmapi.ListTasksRequest_Filter
NodeIDs: filter.Get("node"),
}
for _, s := range filter.Get("desired_state") {
for _, s := range filter.Get("desired-state") {
if state, ok := swarmapi.TaskState_value[strings.ToUpper(s)]; ok {
f.DesiredStates = append(f.DesiredStates, swarmapi.TaskState(state))
} else if s != "" {
return nil, fmt.Errorf("Invalid desired_state filter: '%s'", s)
return nil, fmt.Errorf("Invalid desired-state filter: '%s'", s)
}
}

6
docs/reference/commandline/node_tasks.md
View file

@ -45,7 +45,7 @@ The currently supported filters are:
* [name](#name)
* [id](#id)
* [label](#label)
* [desired_state](#desired_state)
* [desired-state](#desired-state)
#### name
@ -86,9 +86,9 @@ bg8c07zzg87di2mufeq51a2qp redis.7 redis redis:3.0.6 Running 9 minutes Ru
```
#### desired_state
#### desired-state
The `desired_state` filter can take the values `running` and `accepted`.
The `desired-state` filter can take the values `running` and `accepted`.
## Related information

6
docs/reference/commandline/service_tasks.md
View file

@ -61,7 +61,7 @@ The currently supported filters are:
* [id](#id)
* [name](#name)
* [desired_state](#desired_state)
* [desired-state](#desired-state)
#### ID
@ -86,9 +86,9 @@ ID NAME SERVICE IMAGE DESIRED STATE LAST S
```
#### desired_state
#### desired-state
The `desired_state` filter can take the values `running` and `accepted`.
The `desired-state` filter can take the values `running` and `accepted`.
## Related information