Treat empty-string tags as no tags at all

hashicorp · Jun 29, 2016 · fcf913d · fcf913d
1 parent 56eb3bb
commit fcf913d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/consul/prepared_query/template.go b/consul/prepared_query/template.go
@@ -182,5 +182,13 @@ func (ct *CompiledTemplate) Render(name string) (*structs.PreparedQuery, error)
 		return nil, err
 	}
 
+	tags := []string(nil)
+	for _, tag := range query.Service.Tags {
+		if tag != "" {
+			tags = append(tags, tag)
+		}
+	}
+	query.Service.Tags = tags
+
 	return query, nil
 }
diff --git a/consul/prepared_query/template_test.go b/consul/prepared_query/template_test.go
@@ -244,12 +244,10 @@ func TestTemplate_Render(t *testing.T) {
 			Service: structs.ServiceQuery{
 				Service: "hello- xxx hello-foo-bar-none xxx foo-bar-none",
 				Tags: []string{
-					"",
 					"hello-foo-bar-none",
 					"hello",
 					"foo",
 					"bar-none",
-					"",
 					"42",
 				},
 			},
@@ -274,12 +272,6 @@ func TestTemplate_Render(t *testing.T) {
 			Service: structs.ServiceQuery{
 				Service: "hello- xxx hello-nope xxx nope",
 				Tags: []string{
-					"",
-					"",
-					"",
-					"",
-					"",
-					"",
 					"42",
 				},
 			},