Address service tag regex request in hashicorp#1049

theolleg · Sep 6, 2019 · 87f0b15 · 87f0b15
1 parent 47de449
commit 87f0b15
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/dependency/catalog_service_test.go b/dependency/catalog_service_test.go
@@ -116,6 +116,15 @@ func TestNewCatalogServiceQuery(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"tag_name_with_colon",
+			"tag:value.name",
+			&CatalogServiceQuery{
+				name: "name",
+				tag:  "tag:value",
+			},
+			false,
+		},
 	}
 
 	for i, tc := range cases {

diff --git a/dependency/dependency.go b/dependency/dependency.go
@@ -18,7 +18,7 @@ const (
 	nodeNameRe    = `(?P<name>[[:word:]\.\-\_]+)`
 	nearRe        = `(~(?P<near>[[:word:]\.\-\_]+))?`
 	prefixRe      = `/?(?P<prefix>[^@]+)`
-	tagRe         = `((?P<tag>[[:word:]\.\-\_]+)\.)?`
+	tagRe         = `((?P<tag>[[:word:]=:\.\-\_]+)\.)?`
 )
 
 type Type int

diff --git a/dependency/dependency_test.go b/dependency/dependency_test.go
@@ -180,8 +180,8 @@ func TestCanShare(t *testing.T) {
 func TestDeepCopyAndSortTags(t *testing.T) {
 	t.Parallel()
 
-	tags := []string{"hello", "world", "these", "are", "tags"}
-	expected := []string{"are", "hello", "tags", "these", "world"}
+	tags := []string{"hello", "world", "these", "are", "tags", "foo:bar", "baz=qux"}
+	expected := []string{"are", "baz=qux", "foo:bar", "hello", "tags", "these", "world"}
 
 	result := deepCopyAndSortTags(tags)
 	if !reflect.DeepEqual(result, expected) {