From 45fbd34480c1050efd2a60b144aa33e437e1809f Mon Sep 17 00:00:00 2001 From: Stefan Majer Date: Mon, 27 Mar 2023 10:48:39 +0200 Subject: [PATCH] Do not use yaml.v2 and yaml.v3 as direct dependency (#1281) --- cmd/headscale/cli/utils.go | 2 +- derp.go | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/headscale/cli/utils.go b/cmd/headscale/cli/utils.go index 2d6369ae..3b3ac215 100644 --- a/cmd/headscale/cli/utils.go +++ b/cmd/headscale/cli/utils.go @@ -14,7 +14,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) const ( diff --git a/derp.go b/derp.go index c3d100b3..a447da78 100644 --- a/derp.go +++ b/derp.go @@ -10,7 +10,7 @@ import ( "time" "github.com/rs/zerolog/log" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "tailscale.com/tailcfg" ) diff --git a/go.mod b/go.mod index 49f7a821..f35e8e6c 100644 --- a/go.mod +++ b/go.mod @@ -40,7 +40,6 @@ require ( google.golang.org/grpc v1.53.0 google.golang.org/protobuf v1.28.1 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c - gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 gorm.io/driver/postgres v1.4.8 gorm.io/gorm v1.24.5 @@ -145,6 +144,7 @@ require ( google.golang.org/appengine v1.6.7 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect modernc.org/libc v1.22.2 // indirect modernc.org/mathutil v1.5.0 // indirect modernc.org/memory v1.5.0 // indirect