diff --git a/go.mod b/go.mod index b04aaf0..df44346 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,9 @@ -module github.com/ViaQ/logerr +module github.com/ViaQ/logerr/v2 go 1.17 require ( + github.com/ViaQ/logerr v1.2.0 github.com/go-logr/logr v1.2.3 github.com/stretchr/testify v1.7.1 ) @@ -12,5 +13,3 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect ) - -retract [v1.1.0, v1.1.1] // Improper versioning of breaking changes diff --git a/go.sum b/go.sum index 40b2a49..150a698 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,18 @@ +github.com/ViaQ/logerr v1.2.0 h1:thSyb8Zv7xAyWFwcxW2ppj+NK6qZ1GoNOXjDSx8zWe8= +github.com/ViaQ/logerr v1.2.0/go.mod h1:DFmaWoeJeLLixbN6yK5inb0X6meEhj7XoBp1Quoj+Wk= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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= diff --git a/kverrors/kverrors.go b/kverrors/kverrors.go index 626da03..7c312a2 100644 --- a/kverrors/kverrors.go +++ b/kverrors/kverrors.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/ViaQ/logerr/internal/kv" + "github.com/ViaQ/logerr/v2/internal/kv" ) // Keys used to log specific builtin fields diff --git a/kverrors/kverrors_test.go b/kverrors/kverrors_test.go index eceac05..aded923 100644 --- a/kverrors/kverrors_test.go +++ b/kverrors/kverrors_test.go @@ -6,8 +6,8 @@ import ( "io" "testing" - "github.com/ViaQ/logerr/internal/kv" - "github.com/ViaQ/logerr/kverrors" + "github.com/ViaQ/logerr/v2/internal/kv" + "github.com/ViaQ/logerr/v2/kverrors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/log/log.go b/log/log.go index 308ea67..762e2a6 100644 --- a/log/log.go +++ b/log/log.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/ViaQ/logerr/kverrors" + "github.com/ViaQ/logerr/v2/kverrors" "github.com/go-logr/logr" ) diff --git a/log/log_test.go b/log/log_test.go index ee98790..95a74c8 100644 --- a/log/log_test.go +++ b/log/log_test.go @@ -4,13 +4,13 @@ import ( "bytes" "errors" "fmt" - "github.com/ViaQ/logerr/internal/kv" + "github.com/ViaQ/logerr/v2/internal/kv" "io/ioutil" "testing" - "github.com/ViaQ/logerr/kverrors" - "github.com/ViaQ/logerr/log" + "github.com/ViaQ/logerr/v2/kverrors" + "github.com/ViaQ/logerr/v2/log" "github.com/go-logr/logr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/log/logsink.go b/log/logsink.go index 4a8573d..0fbd82c 100644 --- a/log/logsink.go +++ b/log/logsink.go @@ -12,8 +12,8 @@ import ( "sync" "time" - "github.com/ViaQ/logerr/internal/kv" - "github.com/ViaQ/logerr/kverrors" + "github.com/ViaQ/logerr/v2/internal/kv" + "github.com/ViaQ/logerr/v2/kverrors" "github.com/go-logr/logr" ) diff --git a/log/logsink_test.go b/log/logsink_test.go index f6c4869..a7790d5 100644 --- a/log/logsink_test.go +++ b/log/logsink_test.go @@ -10,8 +10,8 @@ import ( "reflect" "testing" - "github.com/ViaQ/logerr/kverrors" - "github.com/ViaQ/logerr/log" + "github.com/ViaQ/logerr/v2/kverrors" + "github.com/ViaQ/logerr/v2/log" "github.com/go-logr/logr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/log/observer_test.go b/log/observer_test.go index 1233050..abfcc57 100644 --- a/log/observer_test.go +++ b/log/observer_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/ViaQ/logerr/kverrors" - "github.com/ViaQ/logerr/log" + "github.com/ViaQ/logerr/v2/kverrors" + "github.com/ViaQ/logerr/v2/log" "github.com/go-logr/logr" "github.com/stretchr/testify/require" )