internal/v5: Support multiple values for filters.

internal/charmstore/store.go

@@ -1502,11 +1502,11 @@ func prepareList(sp SearchParams) (filters map[string]interface{}, err error) {
 	for k, v := range sp.Filters {
 		switch k {
 		case "name":
-			filters[k] = v[0]
+			filters[k] = orQuery(v)
 		case "owner":
-			filters["user"] = v[0]
+			filters["user"] = orQuery(v)
 		case "series":
-			filters["series"] = v[0]
+			filters["series"] = orQuery(v)
 		case "type":
 			if v[0] == "bundle" {
 				filters["series"] = "bundle"
@@ -1526,6 +1526,16 @@ func prepareList(sp SearchParams) (filters map[string]interface{}, err error) {
 	return filters, nil
 }
 
+func orQuery(values []string) interface{} {
+	switch len(values) {
+		case 0:
+			return nil
+		case 1:
+			return values[0]
+		}
+	return bson.D{{"$in", values}}
+}
+
 // ListQuery holds a list query from which an iterator
 // can be created.
 type ListQuery struct {

internal/v5/list_test.go

@@ -98,19 +98,41 @@ func (s *ListSuite) TestSuccessfulList(c *gc.C) {
 		results: []string{
 			"cs:trusty/mysql-7",
 		},
+	}, {
+		about: "name filter list",
+		query: "name=mysql&name=wordpress",
+		results: []string{
+			"cs:precise/wordpress-23",
+			"cs:trusty/mysql-7",
+		},
 	}, {
 		about: "owner filter list",
 		query: "owner=foo",
 		results: []string{
 			"cs:~foo/trusty/varnish-1",
 		},
+	}, {
+		about: "owner filter list",
+		query: "owner=foo&owner=openstack-charmers",
+		results: []string{
+			"cs:trusty/mysql-7",
+			"cs:~foo/trusty/varnish-1",
+		},
 	}, {
 		about: "series filter list",
 		query: "series=trusty",
 		results: []string{
 			"cs:trusty/mysql-7",
 			"cs:~foo/trusty/varnish-1",
 		},
+	}, {
+		about: "series filter list",
+		query: "series=trusty&series=precise",
+		results: []string{
+			"cs:precise/wordpress-23",
+			"cs:trusty/mysql-7",
+			"cs:~foo/trusty/varnish-1",
+		},
 	}, {
 		about: "type filter list",
 		query: "type=bundle",