1. docker
  2. Commit d761719eb4e45fbd6f092f6d0b4eb42206e298f6
Browse code

rename desired_state filter to desired-state

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>

Sebastiaan van Stijn authored on 2016/06/30 01:20:32
Showing 6 changed files
api/client/node/tasks.go
History View file @ d761719
... ... 
@@ -55,10 +55,9 @@ func runTasks(dockerCli *client.DockerCli, opts tasksOptions) error {
55 55
56 56 
 	filter := opts.filter.Value()
57 57 
 	filter.Add("node", node.ID)
58 
-	if !opts.all && !filter.Include("desired_state") {
59 
-		filter.Add("desired_state", string(swarm.TaskStateRunning))
60 
-		filter.Add("desired_state", string(swarm.TaskStateAccepted))
61 
-
58 
+	if !opts.all && !filter.Include("desired-state") {
59 
+		filter.Add("desired-state", string(swarm.TaskStateRunning))
60 
+		filter.Add("desired-state", string(swarm.TaskStateAccepted))
62 61 
 	}
63 62
64 63 
 	tasks, err := client.TaskList(
api/client/service/tasks.go
History View file @ d761719
... ... 
@@ -51,9 +51,9 @@ func runTasks(dockerCli *client.DockerCli, opts tasksOptions) error {
51 51
52 52 
 	filter := opts.filter.Value()
53 53 
 	filter.Add("service", service.ID)
54 
-	if !opts.all && !filter.Include("desired_state") {
55 
-		filter.Add("desired_state", string(swarm.TaskStateRunning))
56 
-		filter.Add("desired_state", string(swarm.TaskStateAccepted))
54 
+	if !opts.all && !filter.Include("desired-state") {
55 
+		filter.Add("desired-state", string(swarm.TaskStateRunning))
56 
+		filter.Add("desired-state", string(swarm.TaskStateAccepted))
57 57 
 	}
58 58
59 59 
 	tasks, err := client.TaskList(ctx, types.TaskListOptions{Filter: filter})
api/client/stack/tasks.go
History View file @ d761719
... ... 
@@ -48,9 +48,9 @@ func runTasks(dockerCli *client.DockerCli, opts tasksOptions) error {
48 48
49 49 
 	filter := opts.filter.Value()
50 50 
 	filter.Add("label", labelNamespace+"="+opts.namespace)
51 
-	if !opts.all && !filter.Include("desired_state") {
52 
-		filter.Add("desired_state", string(swarm.TaskStateRunning))
53 
-		filter.Add("desired_state", string(swarm.TaskStateAccepted))
51 
+	if !opts.all && !filter.Include("desired-state") {
52 
+		filter.Add("desired-state", string(swarm.TaskStateRunning))
53 
+		filter.Add("desired-state", string(swarm.TaskStateAccepted))
54 54 
 	}
55 55
56 56 
 	tasks, err := client.TaskList(ctx, types.TaskListOptions{Filter: filter})
daemon/cluster/filters.go
History View file @ d761719
... ... 
@@ -68,7 +68,7 @@ func newListTasksFilters(filter filters.Args) (*swarmapi.ListTasksRequest_Filter
68 68 
 		"label":         true,
69 69 
 		"service":       true,
70 70 
 		"node":          true,
71 
-		"desired_state": true,
71 
+		"desired-state": true,
72 72 
 	}
73 73 
 	if err := filter.Validate(accepted); err != nil {
74 74 
 		return nil, err
... ... 
@@ -81,11 +81,11 @@ func newListTasksFilters(filter filters.Args) (*swarmapi.ListTasksRequest_Filter
81 81 
 		NodeIDs:    filter.Get("node"),
82 82 
 	}
83 83
84 
-	for _, s := range filter.Get("desired_state") {
84 
+	for _, s := range filter.Get("desired-state") {
85 85 
 		if state, ok := swarmapi.TaskState_value[strings.ToUpper(s)]; ok {
86 86 
 			f.DesiredStates = append(f.DesiredStates, swarmapi.TaskState(state))
87 87 
 		} else if s != "" {
88 
-			return nil, fmt.Errorf("Invalid desired_state filter: '%s'", s)
88 
+			return nil, fmt.Errorf("Invalid desired-state filter: '%s'", s)
89 89 
 		}
90 90 
 	}
91 91
docs/reference/commandline/node_tasks.md
History View file @ d761719
... ... 
@@ -44,7 +44,7 @@ The currently supported filters are:
44 44 
 * [name](#name)
45 45 
 * [id](#id)
46 46 
 * [label](#label)
47 
-* [desired_state](#desired_state)
47 
+* [desired-state](#desired-state)
48 48
49 49 
 #### name
50 50
... ... 
@@ -85,9 +85,9 @@ bg8c07zzg87di2mufeq51a2qp  redis.7  redis    redis:3.0.6  Running 9 minutes   Ru
85 85 
 ```
86 86
87 87
88 
-#### desired_state
88 
+#### desired-state
89 89
90 
-The `desired_state` filter can take the values `running` and `accepted`.
90 
+The `desired-state` filter can take the values `running` and `accepted`.
91 91
92 92
93 93 
 ## Related information
docs/reference/commandline/service_tasks.md
History View file @ d761719
... ... 
@@ -60,7 +60,7 @@ The currently supported filters are:
60 60
61 61 
 * [id](#id)
62 62 
 * [name](#name)
63 
-* [desired_state](#desired_state)
63 
+* [desired-state](#desired-state)
64 64
65 65
66 66 
 #### ID
... ... 
@@ -85,9 +85,9 @@ ID                         NAME      SERVICE  IMAGE        DESIRED STATE  LAST S
85 85 
 ```
86 86
87 87
88 
-#### desired_state
88 
+#### desired-state
89 89
90 
-The `desired_state` filter can take the values `running` and `accepted`.
90 
+The `desired-state` filter can take the values `running` and `accepted`.
91 91
92 92
93 93 
 ## Related information