Added template function whereSomeMatch

Author: Ted Chen

README.md

@@ -133,6 +133,7 @@ Within those templates, the object emitted by docker-gen will have [this structu
 * *`trimPrefix $prefix $string`*: If `$prefix` is a prefix of `$string`, return `$string` with `$prefix` trimmed from the beginning. Otherwise, return `$string` unchanged.
 * *`trimSuffix $suffix $string`*: If `$suffix` is a suffix of `$string`, return `$string` with `$suffix` trimmed from the end. Otherwise, return `$string` unchanged.
 * *`where $containers $fieldPath $value`*: Filters an array of `RuntimeContainer` instances based on the values of a field path expression `$fieldPath`. A field path expression is a dot-delimited list of map keys or struct member names specifying the path from container to a nested value, which must be a string. Returns an array of containers having that value.
+* *`whereSomeMatch $containers $fieldPath $sep $values`*: Like `where`, but the string value specified by `$fieldPath` is first split by `$sep` into a list of strings. The comparison value is a string slice with possible matches. Returns containers which OR intersect these values.
 
 ===
 

template.go

@@ -77,6 +77,21 @@ func where(entries []*RuntimeContainer, key string, cmp string) []*RuntimeContai
 	return selection
 }
 
+// selects entries based on key.  Assumes key is delimited and breaks it apart before comparing
+func whereSomeMatch(entries []*RuntimeContainer, key, sep string, cmp []string) []*RuntimeContainer {
+	selection := []*RuntimeContainer{}
+	for _, v := range entries {
+		value := deepGet(*v, key)
+		if value != nil {
+			items := strings.Split(value.(string), sep)
+			if len(intersect(cmp, items)) > 0 {
+				selection = append(selection, v)
+			}
+		}
+	}
+	return selection
+}
+
 // hasPrefix returns whether a given string is a prefix of another string
 func hasPrefix(prefix, s string) bool {
 	return strings.HasPrefix(s, prefix)
@@ -253,6 +268,7 @@ func generateFile(config Config, containers Context) bool {
 		"trimPrefix":   trimPrefix,
 		"trimSuffix":   trimSuffix,
 		"where":		where,
+		"whereSomeMatch": whereSomeMatch,
 	}).ParseFiles(templatePath)
 	if err != nil {
 		log.Fatalf("unable to parse template: %s", err)

template_test.go

@@ -205,19 +205,64 @@ func TestWhere(t *testing.T) {
 	}
 
 	if len(where(containers, "Env.VIRTUAL_HOST", "demo1.localhost")) != 1 {
-		t.Fatalf("expected 1 match")
+		t.Fatalf("demo1.localhost expected 1 match")
 	}
 
 	if len(where(containers, "Env.VIRTUAL_HOST", "demo2.localhost")) != 2 {
-		t.Fatalf("expected 2 matches")
+		t.Fatalf("demo2.localhost expected 2 matches")
 	}
 
 	if len(where(containers, "Env.VIRTUAL_HOST", "demo3.localhost")) != 1 {
-		t.Fatalf("expected 1 match")
+		t.Fatalf("demo3.localhost expected 1 match")
 	}
 
 	if len(where(containers, "Env.NOEXIST", "demo3.localhost")) != 0 {
-		t.Fatalf("expected 0 match")
+		t.Fatalf("NOEXIST demo3.localhost expected 0 match")
+	}
+}
+
+func TestWhereSomeMatch(t *testing.T) {
+	containers := []*RuntimeContainer{
+		&RuntimeContainer{
+			Env: map[string]string{
+				"VIRTUAL_HOST": "demo1.localhost",
+			},
+			ID: "1",
+		},
+		&RuntimeContainer{
+			Env: map[string]string{
+				"VIRTUAL_HOST": "demo2.localhost,demo4.localhost",
+			},
+			ID: "2",
+		},
+		&RuntimeContainer{
+			Env: map[string]string{
+				"VIRTUAL_HOST": "bar,demo3.localhost,foo",
+			},
+			ID: "3",
+		},
+		&RuntimeContainer{
+			Env: map[string]string{
+				"VIRTUAL_HOST": "demo2.localhost",
+			},
+			ID: "4",
+		},
+	}
+
+	if len(whereSomeMatch(containers, "Env.VIRTUAL_HOST", ",", []string{"demo1.localhost"})) != 1 {
+		t.Fatalf("demo1.localhost expected 1 match")
+	}
+
+	if len(whereSomeMatch(containers, "Env.VIRTUAL_HOST", ",", []string{"demo2.localhost", "lala"})) != 2 {
+		t.Fatalf("demo2.localhost expected 2 matches")
+	}
+
+	if len(whereSomeMatch(containers, "Env.VIRTUAL_HOST", ",", []string{"something", "demo3.localhost"})) != 1 {
+		t.Fatalf("demo3.localhost expected 1 match")
+	}
+
+	if len(whereSomeMatch(containers, "Env.NOEXIST", ",", []string{"demo3.localhost"})) != 0 {
+		t.Fatalf("NOEXIST demo3.localhost expected 0 match")
 	}
 }