Replace yaml parse library

go.mod

@@ -6,10 +6,10 @@ require (
 	github.com/OpenSlides/openslides-autoupdate-service v0.4.1-0.20230912062233-f037fa16c288
 	github.com/blevesearch/bleve/v2 v2.3.8
 	github.com/buger/jsonparser v1.1.1
+	github.com/goccy/go-yaml v1.11.3
 	github.com/jackc/pgx/v5 v5.4.3
 	github.com/sirupsen/logrus v1.9.3
 	golang.org/x/sys v0.16.0
-	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -31,7 +31,6 @@ require (
 	github.com/blevesearch/zapx/v14 v14.3.7 // indirect
 	github.com/blevesearch/zapx/v15 v15.3.10 // indirect
 	github.com/fatih/color v1.16.0 // indirect
-	github.com/goccy/go-yaml v1.11.3 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/geo v0.0.0-20210211234256-740aa86cb551 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
@@ -40,7 +39,6 @@ require (
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect

go.sum

@@ -49,7 +49,6 @@ github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqy
 github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
 github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -63,6 +62,12 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
+github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
+github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
+github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/goccy/go-yaml v1.11.3 h1:B3W9IdWbvrUu2OYQGwvU1nZtvMQJPBKgBUuweJjLj6I=
 github.com/goccy/go-yaml v1.11.3/go.mod h1:wKnAMd44+9JAAnGQpWVEgBzGt3YuTaQ4uXoHvE4m7WU=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -78,8 +83,9 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/gomodule/redigo v1.8.9 h1:Sl3u+2BI/kk+VEatbj0scLdrFhjPmbxOc1myhDP41ws=
 github.com/gomodule/redigo v1.8.9/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
@@ -93,10 +99,8 @@ github.com/jackc/pgx/v5 v5.4.3 h1:cxFyXhxlvAifxnkKKdlxv8XqUf59tDlYjnV5YYfsJJY=
 github.com/jackc/pgx/v5 v5.4.3/go.mod h1:Ig06C2Vu0t5qXC60W8sqIthScaEnFvojjj9dSljmHRA=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
+github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
@@ -127,8 +131,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -152,15 +154,12 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
 golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
@@ -169,8 +168,6 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 google.golang.org/protobuf v1.29.0 h1:44S3JjaKmLEE4YIkjzexaP+NzZsudE3Zin5Njn/pYX0=
 google.golang.org/protobuf v1.29.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pkg/meta/collections.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"sort"
 
-	"gopkg.in/yaml.v3"
+	"github.com/goccy/go-yaml"
 )
 
 // Collection is part of the meta model.
@@ -39,10 +39,10 @@ type CollectionDescription struct {
 // Collections is part of the meta model.
 type Collections map[string]*Collection
 
-// UnmarshalYAML implements [gopkg.in/yaml.v3.Unmarshaler].
-func (m *Collection) UnmarshalYAML(value *yaml.Node) error {
+// UnmarshalYAML Parses yaml to Collection
+func (m *Collection) UnmarshalYAML(node []byte) error {
 	m.Order = modelNum.Add(1)
-	return value.Decode(&m.Fields)
+	return yaml.Unmarshal(node, &m.Fields)
 }
 
 // OrderedKeys returns the keys in document order.

pkg/meta/fields.go

@@ -3,7 +3,7 @@ package meta
 import (
 	"fmt"
 
-	"gopkg.in/yaml.v3"
+	"github.com/goccy/go-yaml"
 )
 
 // Fields is part of the meta model.
@@ -12,18 +12,18 @@ type Fields struct {
 	To   string `yaml:"to"`
 }
 
-// UnmarshalYAML implements [gopkg.in/yaml.v3.Unmarshaler].
-func (fs *Fields) UnmarshalYAML(value *yaml.Node) error {
+// UnmarshalYAML Parses yaml to Fields
+func (fs *Fields) UnmarshalYAML(node []byte) error {
 	var s string
-	if err := value.Decode(&s); err == nil {
+	if err := yaml.Unmarshal(node, &s); err == nil {
 		fs.Type = s
 		return nil
 	}
 	var field struct {
 		Type string `yaml:"type"`
 		To   string `yaml:"to"`
 	}
-	if err := value.Decode(&field); err != nil {
+	if err := yaml.Unmarshal(node, &field); err != nil {
 		return fmt.Errorf("fields object without type: %w", err)
 	}
 	fs.Type = field.Type

pkg/meta/filters.go

@@ -2,9 +2,8 @@ package meta
 
 import (
 	log "github.com/sirupsen/logrus"
-	"sort"
 
-	"gopkg.in/yaml.v3"
+	"github.com/goccy/go-yaml"
 )
 
 // Filter is part of the meta model.
@@ -17,59 +16,33 @@ type Filter struct {
 	Relations   map[string]*CollectionRelation
 }
 
-// FilterKey is part of the meta model.
-type FilterKey struct {
-	Name  string
-	Order int32
-}
-
 // Filters is a list of filters.
 type Filters []Filter
 
-// UnmarshalYAML implements [gopkg.in/yaml.v3.Unmarshaler].
-func (fk *FilterKey) UnmarshalYAML(value *yaml.Node) error {
-	var s string
-	if err := value.Decode(&s); err != nil {
+// UnmarshalYAML Parses yaml to Filters
+func (fs *Filters) UnmarshalYAML(node []byte) error {
+	var fsm map[string]CollectionDescription
+	if err := yaml.Unmarshal(node, &fsm); err != nil {
 		return err
 	}
-	*fk = FilterKey{
-		Order: filterNum.Add(1),
-		Name:  s,
-	}
-	return nil
-}
 
-// UnmarshalYAML implements [gopkg.in/yaml.v3.Unmarshaler].
-func (fs *Filters) UnmarshalYAML(value *yaml.Node) error {
-	var fsm map[FilterKey]CollectionDescription
-	if err := value.Decode(&fsm); err != nil {
-		return err
-	}
-	sorted := make([]FilterKey, 0, len(fsm))
+	*fs = make(Filters, 0, len(fsm))
 	for k := range fsm {
-		sorted = append(sorted, k)
-	}
-	sort.Slice(sorted, func(i, j int) bool {
-		return sorted[i].Order < sorted[j].Order
-	})
-
-	*fs = make(Filters, 0, len(sorted))
-	for _, s := range sorted {
 		relations := map[string]*CollectionRelation{}
-		for k, r := range fsm[s].Relations {
+		for k, r := range fsm[k].Relations {
 			relations[k] = r
 		}
 
-		contains := make(map[string]struct{}, len(fsm[s].Contains))
-		for _, c := range fsm[s].Contains {
+		contains := make(map[string]struct{}, len(fsm[k].Contains))
+		for _, c := range fsm[k].Contains {
 			contains[c] = struct{}{}
 		}
 
 		*fs = append(*fs, Filter{
-			Name:        s.Name,
-			Items:       fsm[s].Searchable,
-			ItemsConfig: fsm[s].SearchableConfig,
-			Additional:  fsm[s].Additional,
+			Name:        k,
+			Items:       fsm[k].Searchable,
+			ItemsConfig: fsm[k].SearchableConfig,
+			Additional:  fsm[k].Additional,
 			Relations:   relations,
 			Contains:    contains,
 		})

pkg/meta/member.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	log "github.com/sirupsen/logrus"
 
-	"gopkg.in/yaml.v3"
+	"github.com/goccy/go-yaml"
 )
 
 // MemberTo is part of the meta model.
@@ -29,18 +29,18 @@ type Member struct {
 	Order                 int32               `yaml:"-"`
 }
 
-// UnmarshalYAML implements [gopkg.in/yaml.v3.Unmarshaler].
-func (mt *MemberTo) UnmarshalYAML(value *yaml.Node) error {
+// UnmarshalYAML Parses yaml to MemberTo
+func (mt *MemberTo) UnmarshalYAML(node []byte) error {
 	// 1. string
 	var s string
-	if err := value.Decode(&s); err == nil {
+	if err := yaml.Unmarshal(node, &s); err == nil {
 		mt.Field = s
 		return nil
 	}
 
 	// 2. List of strings
 	var collections []string
-	if err := value.Decode(&collections); err == nil {
+	if err := yaml.Unmarshal(node, &collections); err == nil {
 		mt.Collections = collections
 		return nil
 	}
@@ -50,19 +50,23 @@ func (mt *MemberTo) UnmarshalYAML(value *yaml.Node) error {
 		Collections []string `yaml:"collections"`
 		Field       string   `yaml:"field"`
 	}
-	if err := value.Decode(&memberTo); err != nil {
+	if err := yaml.Unmarshal(node, &memberTo); err != nil {
 		return fmt.Errorf("memberTo object without field: %w", err)
 	}
 	mt.Field = memberTo.Field
 	mt.Collections = memberTo.Collections
 	return nil
 }
 
-// UnmarshalYAML implements [gopkg.in/yaml.v3.Unmarshaler].
-func (m *Member) UnmarshalYAML(value *yaml.Node) error {
+// UnmarshalYAML Parses yaml to Member
+func (m *Member) UnmarshalYAML(node []byte) error {
+	if node[0] == byte('&') {
+		return nil
+	}
+
 	m.Order = fieldNum.Add(1)
 	var s string
-	if err := value.Decode(&s); err == nil {
+	if err := yaml.Unmarshal(node, &s); err == nil {
 		m.Type = s
 		return nil
 	}
@@ -76,7 +80,7 @@ func (m *Member) UnmarshalYAML(value *yaml.Node) error {
 		RestrictionMode       string    `yaml:"restriction_mode"`
 		Required              bool      `yaml:"required"`
 	}
-	if err := value.Decode(&member); err != nil {
+	if err := yaml.Unmarshal(node, &member); err != nil {
 		return fmt.Errorf("member object without type: %w", err)
 	}
 	m.Type = member.Type

pkg/meta/models.go

@@ -13,7 +13,7 @@ import (
 	"strings"
 	"sync/atomic"
 
-	"gopkg.in/yaml.v3"
+	"github.com/goccy/go-yaml"
 )
 
 var (
@@ -24,8 +24,24 @@ var (
 
 func load[T any](r io.Reader) (T, error) {
 	dec := yaml.NewDecoder(r)
+	var tmp map[string]interface{}
+	if err := dec.Decode(&tmp); err != nil {
+		var n T
+		return n, err
+	}
+
+	if _, ok := tmp["_meta"]; ok {
+		delete(tmp, "_meta")
+	}
+
+	cleanYml, err := yaml.Marshal(tmp)
+	if err != nil {
+		var n T
+		return n, err
+	}
+
 	var t T
-	if err := dec.Decode(&t); err != nil {
+	if err := yaml.Unmarshal(cleanYml, &t); err != nil {
 		var n T
 		return n, err
 	}