public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CloudWatch: Fix apostrophes in dimension values not being escaped (#87182)

Browse Source
This commit is contained in:
Kevin Yu
2024-05-02 06:15:11 -07:00
committed by GitHub
parent a979417700
commit 6851ad9f8c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/cloudwatch/metric_data_query_builder.go
+3 -2
View File
@@ -99,7 +99,7 @@ func buildSearchExpression(query *models.CloudWatchQuery, stat string) string {
}
sort.Strings(keys)
for _, key := range keys {
values := escapeDoubleQuotes(knownDimensions[key])
values := escapeQuotes(knownDimensions[key])
valueExpression := join(values, " OR ", `"`, `"`)
if len(knownDimensions[key]) > 1 {
valueExpression = fmt.Sprintf(`(%s)`, valueExpression)
@@ -150,10 +150,11 @@ func buildSearchExpressionLabel(query *models.CloudWatchQuery) string {
return label
}
func escapeDoubleQuotes(arr []string) []string {
func escapeQuotes(arr []string) []string {
result := []string{}
for _, value := range arr {
value = strings.ReplaceAll(value, `"`, `\"`)
value = strings.ReplaceAll(value, `'`, `\'`)
result = append(result, value)
}