TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-01-06 13:37:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(deps): replace "github.com/ghodss/yaml" with "sigs.k8s.io/yaml" (#2812)

Browse Source
This commit is contained in:
Livio Amstutz 2021-12-08 16:26:12 +01:00 committed by GitHub
parent 9967a3ee5e
commit 75f3067d42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -29,7 +29,6 @@ require (
github.com/duo-labs/webauthn v0.0.0-20210727191636-9f1b88ef44cc
github.com/envoyproxy/protoc-gen-validate v0.6.2
github.com/getsentry/sentry-go v0.11.0
github.com/ghodss/yaml v1.0.0
github.com/golang/glog v1.0.0
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.2
@ -93,6 +92,7 @@ require (
k8s.io/apimachinery v0.22.4
k8s.io/client-go v0.22.4
sigs.k8s.io/controller-runtime v0.10.3
sigs.k8s.io/yaml v1.3.0
)
replace github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.4

2
internal/admin/repository/eventsourcing/eventstore/iam.go
View File

@ -9,8 +9,8 @@ import (
"strings"
"sync"
"github.com/ghodss/yaml"
"golang.org/x/text/language"
"sigs.k8s.io/yaml"
"github.com/caos/zitadel/internal/domain"
v1 "github.com/caos/zitadel/internal/eventstore/v1"

2
internal/config/config.go
View File

@ -7,7 +7,7 @@ import (
"path/filepath"
"github.com/BurntSushi/toml"
"github.com/ghodss/yaml"
"sigs.k8s.io/yaml"
"github.com/caos/zitadel/internal/errors"
)

4
internal/i18n/i18n.go
View File

@ -10,10 +10,10 @@ import (
"github.com/BurntSushi/toml"
"github.com/caos/logging"
"github.com/ghodss/yaml"
"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
"github.com/nicksnyder/go-i18n/v2/i18n"
"golang.org/x/text/language"
"sigs.k8s.io/yaml"
"github.com/caos/zitadel/internal/api/authz"
http_util "github.com/caos/zitadel/internal/api/http"
@ -55,7 +55,7 @@ func NewTranslator(dir http.FileSystem, config TranslatorConfig) (*Translator, e
func newBundle(dir http.FileSystem, defaultLanguage language.Tag) (*i18n.Bundle, error) {
bundle := i18n.NewBundle(defaultLanguage)
bundle.RegisterUnmarshalFunc("yaml", yaml.Unmarshal)
bundle.RegisterUnmarshalFunc("yaml", func(data []byte, v interface{}) error { return yaml.Unmarshal(data, v) })
bundle.RegisterUnmarshalFunc("json", json.Unmarshal)
bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal)
i18nDir, err := dir.Open(i18nPath)

2
internal/management/repository/eventsourcing/eventstore/org.go
View File

@ -12,9 +12,9 @@ import (
"time"
"github.com/caos/logging"
"github.com/ghodss/yaml"
"github.com/golang/protobuf/ptypes"
"golang.org/x/text/language"
"sigs.k8s.io/yaml"
"github.com/caos/zitadel/internal/api/authz"
"github.com/caos/zitadel/internal/config/systemdefaults"