docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2473 from askb/2451_key_filter_case 

Fixes #2451 - ensures ls filters `<key>` and `<value>` works case-insensitive
This commit is contained in:
Nathan LeClaire 2015-12-02 15:42:12 -08:00
parent e35b169139 22cacbf152
commit 98a1c8c159
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
commands/ls.go
View File

@ -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
}
}

15
commands/ls_test.go
View File

@ -44,6 +44,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"}})
@ -54,6 +59,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{