From 99984a49de48919ea5b1e97ffbd421c0b8d5a3e0 Mon Sep 17 00:00:00 2001
From: Ondrej Tomcik <ondrej.tomcik@plgd.dev>
Date: Mon, 14 Jun 2021 21:02:35 +0200
Subject: [PATCH] update yaml (#181)

---
 config/parse.go | 4 ++--
 go.mod          | 6 ++----
 go.sum          | 2 ++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/parse.go b/config/parse.go
index 838cf493..84d8f7a2 100644
--- a/config/parse.go
+++ b/config/parse.go
@@ -9,7 +9,7 @@ import (
 
 // Parse parse bytes to config
 func Parse(data []byte, config interface{}) error {
-	err := yaml.Unmarshal(data, config, yaml.DecoderWithFieldNameMarshaler(FieldNameMarshaler))
+	err := yaml.Unmarshal(data, config)
 	if err != nil {
 		return fmt.Errorf("invalid config: %w", err)
 	}
@@ -18,7 +18,7 @@ func Parse(data []byte, config interface{}) error {
 
 // ToString returns string representation of Config
 func ToString(config interface{}) string {
-	b, _ := yaml.Marshal(config, yaml.EncoderWithFieldNameMarshaler(FieldNameMarshaler))
+	b, _ := yaml.Marshal(config)
 	return string(b)
 }
 
diff --git a/go.mod b/go.mod
index 5e252638..3c27661d 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,5 @@ require (
 	golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
 	golang.org/x/net v0.0.0-20210502030024-e5908800b52b
 	google.golang.org/grpc v1.29.1
-	gopkg.in/yaml.v2 v2.2.8
-)
-
-replace gopkg.in/yaml.v2 v2.2.8 => github.com/cizmazia/yaml v0.0.0-20200220134304-2008791f5454
+	gopkg.in/yaml.v2 v2.4.0
+)
\ No newline at end of file
diff --git a/go.sum b/go.sum
index 6762b61e..5b4bce4d 100644
--- a/go.sum
+++ b/go.sum
@@ -258,6 +258,8 @@ gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w
 gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+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 h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=