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.go
+8 -11
View File
@@ -210,8 +210,8 @@ func (val *JSONSliceValue) UnmarshalYAML(unmarshal func(interface{}) error) erro
for _, v := range unmarshaled {
i := make(map[string]interface{})
r := make(map[string]interface{})
for key, val := range v.(map[interface{}]interface{}) {
i[key.(string)], r[key.(string)], err = transformInterface(val)
for key, val := range v.(map[string]interface{}) {
i[key], r[key], err = transformInterface(val)
if err != nil {
return err
}
@@ -245,7 +245,7 @@ func transformInterface(i interface{}) (interface{}, interface{}, error) {
case reflect.Slice:
return transformSlice(i.([]interface{}))
case reflect.Map:
return transformMap(i.(map[interface{}]interface{}))
return transformMap(i.(map[string]interface{}))
case reflect.String:
return interpolateValue(i.(string))
default:
@@ -268,17 +268,14 @@ func transformSlice(i []interface{}) (interface{}, interface{}, error) {
return transformedSlice, rawSlice, nil
}
func transformMap(i map[interface{}]interface{}) (interface{}, interface{}, error) {
func transformMap(i map[string]interface{}) (interface{}, interface{}, error) {
transformed := make(map[string]interface{})
raw := make(map[string]interface{})
for key, val := range i {
stringKey, ok := key.(string)
if ok {
var err error
transformed[stringKey], raw[stringKey], err = transformInterface(val)
if err != nil {
return nil, nil, err
}
var err error
transformed[key], raw[key], err = transformInterface(val)
if err != nil {
return nil, nil, err
}
}
return transformed, raw, nil