Fix expanding item name with unicode params, fixes #1269

This commit is contained in:
Alexander Zobnin
2021-08-25 12:06:25 +03:00
parent ee5223f0ab
commit 78fe0dd7a9
2 changed files with 58 additions and 2 deletions

57
pkg/zabbix/utils_test.go Normal file
View File

@@ -0,0 +1,57 @@
package zabbix
import (
"github.com/stretchr/testify/assert"
"testing"
)
func TestExpandItemName(t *testing.T) {
tests := []struct {
name string
itemName string
key string
expected string
}{
{
name: "UNQUOTED_PARAMS",
itemName: "CPU $2 time",
key: "system.cpu.util[,user,avg1]",
expected: "CPU user time",
},
{
name: "QUOTED_PARAMS_WITH_COMMAS",
itemName: "CPU $1 $2 $3",
key: "system.cpu.util[\"type=user,value=avg\",time,\"user\"]",
expected: "CPU type=user,value=avg time user",
},
{
name: "MULTIPLE_ARRAY_PARAMS",
itemName: "CPU $2 - $3 time",
key: "system.cpu.util[,[user,system],avg1]",
expected: "CPU user,system - avg1 time",
},
{
name: "MULTIPLE_ARRAY_PARAMS",
itemName: "CPU - $2 - $3 - $4",
key: "system.cpu.util[,[],[\"user,system\",iowait],avg1]",
expected: "CPU - - \"user,system\",iowait - avg1",
},
{
name: "UNICODE_PARAMS",
itemName: "CPU $1 $2 $3",
key: "system.cpu.util[\"type=\b5Ὂg̀9! ℃ᾭG,value=avg\",time,\"user\"]",
expected: "CPU type=\b5Ὂg̀9! ℃ᾭG,value=avg time user",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
item := &Item{
Name: tt.itemName,
Key: tt.key,
}
expandedName := item.ExpandItemName()
assert.Equal(t, tt.expected, expandedName)
})
}
}