[fixed] wildcard counting issue on import validation (#154)

Signed-off-by: Matthias Hanel <mh@synadia.com>
nats-io · Jul 15, 2021 · 37a10b0 · 37a10b0
1 parent bd63c2e
commit 37a10b0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/v2/imports_test.go b/v2/imports_test.go
@@ -372,7 +372,8 @@ func TestImportsLocalSubjectVariants(t *testing.T) {
 		&Import{Subject: "foo.*.bar.*.>", Account: akp, LocalSubject: "my.$2.$1.>", Type: Stream},
 		&Import{Subject: "baz.*.bar.*.>", Account: akp, LocalSubject: "bar.*.*.>", Type: Service},
 		&Import{Subject: "baz.*", Account: akp, LocalSubject: "my.$1", Type: Stream},
-		&Import{Subject: "bar.*", Account: akp, LocalSubject: "baz.*", Type: Service})
+		&Import{Subject: "bar.*", Account: akp, LocalSubject: "baz.*", Type: Service},
+		&Import{Subject: "biz.*.*.*", Account: akp, LocalSubject: "buz.*.*.*", Type: Service})
 	vr := CreateValidationResults()
 	imports.Validate("", vr)
 	if !vr.IsEmpty() {

diff --git a/v2/types.go b/v2/types.go
@@ -188,12 +188,11 @@ func (s Subject) countTokenWildcards() int {
 	if v == "*" {
 		return 1
 	}
-	cnt := strings.Count(v, ".*.")
-	if strings.HasSuffix(v, ".*") {
-		cnt++
-	}
-	if strings.HasPrefix(v, "*.") {
-		cnt++
+	cnt := 0
+	for _, t := range strings.Split(v, ".") {
+		if t == "*" {
+			cnt++
+		}
 	}
 	return cnt
 }