IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

stackdriver: test that no interpolation is done when there are no wildcards

Browse Source
This commit is contained in:
Erik Sundell
2018-10-02 17:58:31 +02:00
parent 2a0d7a8803
commit 5f7795aa1f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/tsdb/stackdriver/stackdriver.go
View File

@@ -179,7 +179,7 @@ func interpolateFilterWildcards(value string) string {
} else if matches == 1 && strings.HasSuffix(value, "*") { } else if matches == 1 && strings.HasSuffix(value, "*") {
value = reverse(strings.Replace(reverse(value), "*", "", 1)) value = reverse(strings.Replace(reverse(value), "*", "", 1))
value = fmt.Sprintf(`starts_with("%s")`, value) value = fmt.Sprintf(`starts_with("%s")`, value)
} else if matches == 1 { } else if matches != 0 {
re := regexp.MustCompile(`[-\/^$+?.()|[\]{}]`) re := regexp.MustCompile(`[-\/^$+?.()|[\]{}]`)
value = string(re.ReplaceAllFunc([]byte(value), func(in []byte) []byte { value = string(re.ReplaceAllFunc([]byte(value), func(in []byte) []byte {
return []byte(strings.Replace(string(in), string(in), `\\`+string(in), 1)) return []byte(strings.Replace(string(in), string(in), `\\`+string(in), 1))

6
pkg/tsdb/stackdriver/stackdriver_test.go
View File

@@ -398,7 +398,13 @@ func TestStackdriver(t *testing.T) {
value := interpolateFilterWildcards("us-ce*tral1-*") value := interpolateFilterWildcards("us-ce*tral1-*")
So(value, ShouldEqual, `monitoring.regex.full_match("^us\\-ce.*tral1\\-.*$")`) So(value, ShouldEqual, `monitoring.regex.full_match("^us\\-ce.*tral1\\-.*$")`)
}) })
Convey("and no wildcard is used", func() {
value := interpolateFilterWildcards("us-central1-a}")
So(value, ShouldEqual, `us-central1-a}`)
})
}) })
}) })
} }