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

Chore: Replace yaml.v2 with yaml.v3 (#59897)

Browse Source 
* replace yaml.v2 with yaml.v3

* fix a few tests due to the yaml.v3 api changes

* and another goconvey mistake in tests
This commit is contained in:
Serge Zaitsev
2022-12-06 21:17:17 +01:00
committed by GitHub
parent fdc3adb2c9
commit 43f40e6c7c
12 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/provisioning/values/values_test.go
+15 -7
View File
@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gopkg.in/ini.v1"
"gopkg.in/yaml.v2"
"gopkg.in/yaml.v3"
)
func TestValues(t *testing.T) {
@@ -39,21 +39,23 @@ func TestValues(t *testing.T) {
type Data struct {
Val IntValue `yaml:"val"`
}
d := &Data{}
t.Run("Should unmarshal simple number", func(t *testing.T) {
d := &Data{}
unmarshalingTest(t, `val: 1`, d)
require.Equal(t, d.Val.Value(), 1)
require.Equal(t, d.Val.Raw, "1")
})
t.Run("Should unmarshal env var", func(t *testing.T) {
d := &Data{}
unmarshalingTest(t, `val: $INT`, d)
require.Equal(t, d.Val.Value(), 1)
require.Equal(t, d.Val.Raw, "$INT")
})
t.Run("Should ignore empty value", func(t *testing.T) {
d := &Data{}
unmarshalingTest(t, `val: `, d)
require.Equal(t, d.Val.Value(), 0)
require.Equal(t, d.Val.Raw, "")
@@ -64,39 +66,43 @@ func TestValues(t *testing.T) {
type Data struct {
Val StringValue `yaml:"val"`
}
d := &Data{}
t.Run("Should unmarshal simple string", func(t *testing.T) {
d := &Data{}
unmarshalingTest(t, `val: test`, d)
require.Equal(t, d.Val.Value(), "test")
require.Equal(t, d.Val.Raw, "test")
})
t.Run("Should unmarshal env var", func(t *testing.T) {
d := &Data{}
unmarshalingTest(t, `val: $STRING`, d)
require.Equal(t, d.Val.Value(), "test")
require.Equal(t, d.Val.Raw, "$STRING")
})
t.Run("Should ignore empty value", func(t *testing.T) {
d := &Data{}
unmarshalingTest(t, `val: `, d)
require.Equal(t, d.Val.Value(), "")
require.Equal(t, d.Val.Raw, "")
})
t.Run("empty var should have empty value", func(t *testing.T) {
d := &Data{}
unmarshalingTest(t, `val: $EMPTYSTRING`, d)
require.Equal(t, d.Val.Value(), "")
require.Equal(t, d.Val.Raw, "$EMPTYSTRING")
})
t.Run("$$ should be a literal $", func(t *testing.T) {
d := &Data{}
unmarshalingTest(t, `val: $$`, d)
require.Equal(t, d.Val.Value(), "$")
require.Equal(t, d.Val.Raw, "$$")
})
t.Run("$$ should be a literal $ and not expanded within a string", func(t *testing.T) {
d := &Data{}
unmarshalingTest(t, `val: mY,Passwo$$rd`, d)
require.Equal(t, d.Val.Value(), "mY,Passwo$rd")
require.Equal(t, d.Val.Raw, "mY,Passwo$$rd")
@@ -107,27 +113,29 @@ func TestValues(t *testing.T) {
type Data struct {
Val BoolValue `yaml:"val"`
}
d := &Data{}
t.Run("Should unmarshal bool value", func(t *testing.T) {
d := &Data{}
unmarshalingTest(t, `val: true`, d)
require.True(t, d.Val.Value())
require.Equal(t, d.Val.Raw, "true")
})
t.Run("Should unmarshal explicit string", func(t *testing.T) {
d := &Data{}
unmarshalingTest(t, `val: "true"`, d)
require.True(t, d.Val.Value())
require.Equal(t, d.Val.Raw, "true")
})
t.Run("Should unmarshal env var", func(t *testing.T) {
d := &Data{}
unmarshalingTest(t, `val: $BOOL`, d)
require.True(t, d.Val.Value())
require.Equal(t, d.Val.Raw, "$BOOL")
})
t.Run("Should ignore empty value", func(t *testing.T) {
d := &Data{}
unmarshalingTest(t, `val: `, d)
require.False(t, d.Val.Value())
require.Equal(t, d.Val.Raw, "")