Fixes docker-archive-public#2451 ensure filters <key> and <value> work when case-insensitive

askb · askb · commit 22cacbf152a9 · 2015-12-02T22:15:03.000+05:30
Added unit tests to verify filters

Signed-off-by: Anil Belur &lt;askb23@gmail.com&gt;
diff --git a/commands/ls.go b/commands/ls.go
@@ -113,7 +113,7 @@ func parseFilters(filters []string) (FilterOptions, error) {
 		if len(kv) != 2 {
 			return options, errors.New("Unsupported filter syntax.")
 		}
-		key, value := kv[0], kv[1]
+		key, value := strings.ToLower(kv[0]), kv[1]
 
 		switch key {
 		case "swarm":
@@ -176,7 +176,7 @@ func matchesSwarmName(host *host.Host, swarmNames []string, swarmMasters map[str
 	}
 	for _, n := range swarmNames {
 		if host.HostOptions.SwarmOptions != nil {
-			if n == swarmMasters[host.HostOptions.SwarmOptions.Discovery] {
+			if strings.EqualFold(n, swarmMasters[host.HostOptions.SwarmOptions.Discovery]) {
 				return true
 			}
 		}
@@ -189,7 +189,7 @@ func matchesDriverName(host *host.Host, driverNames []string) bool {
 		return true
 	}
 	for _, n := range driverNames {
-		if host.DriverName == n {
+		if strings.EqualFold(host.DriverName, n) {
 			return true
 		}
 	}
@@ -205,7 +205,7 @@ func matchesState(host *host.Host, states []string) bool {
 		if err != nil {
 			log.Warn(err)
 		}
-		if n == s.String() {
+		if strings.EqualFold(n, s.String()) {
 			return true
 		}
 	}
diff --git a/commands/ls_test.go b/commands/ls_test.go
@@ -43,6 +43,11 @@ func TestParseFiltersAll(t *testing.T) {
 	assert.Equal(t, actual, FilterOptions{SwarmName: []string{"foo"}, DriverName: []string{"bar"}, State: []string{"Stopped"}, Name: []string{"dev"}})
 }
 
+func TestParseFiltersAllCase(t *testing.T) {
+	actual, _ := parseFilters([]string{"sWarM=foo", "DrIver=bar", "StaTe=Stopped", "NAMe=dev"})
+	assert.Equal(t, actual, FilterOptions{SwarmName: []string{"foo"}, DriverName: []string{"bar"}, State: []string{"Stopped"}, Name: []string{"dev"}})
+}
+
 func TestParseFiltersDuplicates(t *testing.T) {
 	actual, _ := parseFilters([]string{"swarm=foo", "driver=bar", "name=mark", "swarm=baz", "driver=qux", "state=Running", "state=Starting", "name=time"})
 	assert.Equal(t, actual, FilterOptions{SwarmName: []string{"foo", "baz"}, DriverName: []string{"bar", "qux"}, State: []string{"Running", "Starting"}, Name: []string{"mark", "time"}})
@@ -53,6 +58,16 @@ func TestParseFiltersValueWithEqual(t *testing.T) {
 	assert.Equal(t, actual, FilterOptions{DriverName: []string{"bar=baz"}})
 }
 
+func TestFilterHostsReturnsFiltersValuesCaseInsensitive(t *testing.T) {
+	opts := FilterOptions{
+		SwarmName:  []string{"fOo"},
+		DriverName: []string{"ViRtUaLboX"},
+		State:      []string{"StOPpeD"},
+	}
+	hosts := []*host.Host{}
+	actual := filterHosts(hosts, opts)
+	assert.EqualValues(t, actual, hosts)
+}
 func TestFilterHostsReturnsSameGivenNoFilters(t *testing.T) {
 	opts := FilterOptions{}
 	hosts := []*host.Host{

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ func parseFilters(filters []string) (FilterOptions, error) {`
`113`	`113`	`if len(kv) != 2 {`
`114`	`114`	`return options, errors.New("Unsupported filter syntax.")`
`115`	`115`	`}`
`116`		`- key, value := kv[0], kv[1]`
	`116`	`+ key, value := strings.ToLower(kv[0]), kv[1]`
`117`	`117`
`118`	`118`	`switch key {`
`119`	`119`	`case "swarm":`
`@@ -176,7 +176,7 @@ func matchesSwarmName(host *host.Host, swarmNames []string, swarmMasters map[str`
`176`	`176`	`}`
`177`	`177`	`for _, n := range swarmNames {`
`178`	`178`	`if host.HostOptions.SwarmOptions != nil {`
`179`		`- if n == swarmMasters[host.HostOptions.SwarmOptions.Discovery] {`
	`179`	`+ if strings.EqualFold(n, swarmMasters[host.HostOptions.SwarmOptions.Discovery]) {`
`180`	`180`	`return true`
`181`	`181`	`}`
`182`	`182`	`}`
`@@ -189,7 +189,7 @@ func matchesDriverName(host *host.Host, driverNames []string) bool {`
`189`	`189`	`return true`
`190`	`190`	`}`
`191`	`191`	`for _, n := range driverNames {`
`192`		`- if host.DriverName == n {`
	`192`	`+ if strings.EqualFold(host.DriverName, n) {`
`193`	`193`	`return true`
`194`	`194`	`}`
`195`	`195`	`}`
`@@ -205,7 +205,7 @@ func matchesState(host *host.Host, states []string) bool {`
`205`	`205`	`if err != nil {`
`206`	`206`	`log.Warn(err)`
`207`	`207`	`}`
`208`		`- if n == s.String() {`
	`208`	`+ if strings.EqualFold(n, s.String()) {`
`209`	`209`	`return true`
`210`	`210`	`}`
`211`	`211`	`}`