Merge branch 'master' into async-sql-errs2

Azure · Apr 3, 2020 · b90de36 · b90de36
2 parents 1dffba4 + 8bc085b
commit b90de36
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/pkg/helpers/helpers_labels_test.go b/pkg/helpers/helpers_labels_test.go
@@ -53,6 +53,19 @@ func TestLabelsToTags(t *testing.T) {
 				"fun..zone": to.StringPtr("null"),
 			},
 		},
+		{
+			Name: "question mark labels",
+			In: map[string]string{
+				"age?date":  "null",
+				"type?kind": "null",
+				"fun??zone": "null",
+			},
+			Out: map[string]*string{
+				"age.date":  to.StringPtr("null"),
+				"type.kind": to.StringPtr("null"),
+				"fun..zone": to.StringPtr("null"),
+			},
+		},
 		{
 			Name: "percent labels",
 			In: map[string]string{

diff --git a/pkg/helpers/labels.go b/pkg/helpers/labels.go
@@ -15,7 +15,7 @@ func LabelsToTags(in map[string]string) map[string]*string {
 		newK := k
 		value := v
 		if strings.ContainsAny(k, "<>%/?\\") {
-			newK = ReplaceAny(k, []string{"<", ">", "%", "/", "\\\\", "?"})
+			newK = ReplaceAny(k, []string{"<", ">", "%", "/", "\\\\", "\\?"})
 		}
 		out[newK] = &value
 	}