From e50e1d8a1f04567b5b8cf5bd2bb496e90031b069 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:43:31 +0000 Subject: [PATCH 1/2] Bump github.com/magiconair/properties from 1.8.7 to 1.8.9 Bumps [github.com/magiconair/properties](https://github.com/magiconair/properties) from 1.8.7 to 1.8.9. - [Release notes](https://github.com/magiconair/properties/releases) - [Commits](https://github.com/magiconair/properties/compare/v1.8.7...v1.8.9) --- updated-dependencies: - dependency-name: github.com/magiconair/properties dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 643d36954..8fde4d70b 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/knadh/koanf/v2 v2.1.2 github.com/labstack/echo/v4 v4.13.0 github.com/lestrrat-go/jwx/v2 v2.1.3 - github.com/magiconair/properties v1.8.7 + github.com/magiconair/properties v1.8.9 github.com/mdp/qrterminal/v3 v3.2.0 github.com/mr-tron/base58 v1.2.0 github.com/multiformats/go-multicodec v0.9.0 diff --git a/go.sum b/go.sum index 362faae9a..5cce648d3 100644 --- a/go.sum +++ b/go.sum @@ -298,8 +298,8 @@ github.com/lestrrat-go/jwx/v2 v2.1.3 h1:Ud4lb2QuxRClYAmRleF50KrbKIoM1TddXgBrneT5 github.com/lestrrat-go/jwx/v2 v2.1.3/go.mod h1:q6uFgbgZfEmQrfJfrCo90QcQOcXFMfbI/fO0NqRtvZo= github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= -github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= -github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM= +github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= From b67c3ff84816142ecc781dffef63972d5f7d2293 Mon Sep 17 00:00:00 2001 From: Wout Slakhorst Date: Mon, 9 Dec 2024 16:30:59 +0100 Subject: [PATCH 2/2] remove magiconair --- auth/log/logger_test.go | 2 +- crypto/api/v1/generated_test.go | 5 ++--- events/log/logger_test.go | 2 +- go.mod | 1 - go.sum | 2 -- http/log/logger_test.go | 2 +- network/dag/consistency_test.go | 2 +- network/transport/grpc/stats_test.go | 5 +++-- vcr/log/log_test.go | 2 +- vdr/didsubject/test.go | 2 +- vdr/log/logger_test.go | 2 +- 11 files changed, 12 insertions(+), 15 deletions(-) diff --git a/auth/log/logger_test.go b/auth/log/logger_test.go index 853f85c33..40d107bf0 100644 --- a/auth/log/logger_test.go +++ b/auth/log/logger_test.go @@ -21,7 +21,7 @@ package log import ( "testing" - "github.com/magiconair/properties/assert" + "github.com/stretchr/testify/assert" ) func TestLog(t *testing.T) { diff --git a/crypto/api/v1/generated_test.go b/crypto/api/v1/generated_test.go index c4bd57255..8910af5f4 100644 --- a/crypto/api/v1/generated_test.go +++ b/crypto/api/v1/generated_test.go @@ -24,10 +24,9 @@ import ( "strings" "testing" - "github.com/nuts-foundation/nuts-node/core" - "github.com/labstack/echo/v4" - "github.com/magiconair/properties/assert" + "github.com/nuts-foundation/nuts-node/core" + "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/events/log/logger_test.go b/events/log/logger_test.go index c5fd05521..26bbf0c40 100644 --- a/events/log/logger_test.go +++ b/events/log/logger_test.go @@ -21,7 +21,7 @@ package log import ( "testing" - "github.com/magiconair/properties/assert" + "github.com/stretchr/testify/assert" ) func TestLog(t *testing.T) { diff --git a/go.mod b/go.mod index 8fde4d70b..847e539b1 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,6 @@ require ( github.com/knadh/koanf/v2 v2.1.2 github.com/labstack/echo/v4 v4.13.0 github.com/lestrrat-go/jwx/v2 v2.1.3 - github.com/magiconair/properties v1.8.9 github.com/mdp/qrterminal/v3 v3.2.0 github.com/mr-tron/base58 v1.2.0 github.com/multiformats/go-multicodec v0.9.0 diff --git a/go.sum b/go.sum index 5cce648d3..22e0ac942 100644 --- a/go.sum +++ b/go.sum @@ -298,8 +298,6 @@ github.com/lestrrat-go/jwx/v2 v2.1.3 h1:Ud4lb2QuxRClYAmRleF50KrbKIoM1TddXgBrneT5 github.com/lestrrat-go/jwx/v2 v2.1.3/go.mod h1:q6uFgbgZfEmQrfJfrCo90QcQOcXFMfbI/fO0NqRtvZo= github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= -github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM= -github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= diff --git a/http/log/logger_test.go b/http/log/logger_test.go index 20a595bbf..768c18cf7 100644 --- a/http/log/logger_test.go +++ b/http/log/logger_test.go @@ -21,7 +21,7 @@ package log import ( "testing" - "github.com/magiconair/properties/assert" + "github.com/stretchr/testify/assert" ) func TestLog(t *testing.T) { diff --git a/network/dag/consistency_test.go b/network/dag/consistency_test.go index a13387b9d..af6fa5076 100644 --- a/network/dag/consistency_test.go +++ b/network/dag/consistency_test.go @@ -21,12 +21,12 @@ package dag import ( "context" "encoding/binary" - "github.com/magiconair/properties/assert" "github.com/nuts-foundation/nuts-node/crypto/hash" "github.com/nuts-foundation/nuts-node/network/dag/tree" "github.com/nuts-foundation/nuts-node/storage" "github.com/nuts-foundation/nuts-node/test" "github.com/nuts-foundation/nuts-node/test/io" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" "path" diff --git a/network/transport/grpc/stats_test.go b/network/transport/grpc/stats_test.go index b98e059c4..ab6dff02f 100644 --- a/network/transport/grpc/stats_test.go +++ b/network/transport/grpc/stats_test.go @@ -20,12 +20,13 @@ package grpc import ( "errors" - "github.com/magiconair/properties/assert" + "testing" + "github.com/nuts-foundation/nuts-node/network/transport" "github.com/prometheus/client_golang/prometheus" io_prometheus_client "github.com/prometheus/client_model/go" + "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" - "testing" ) func Test_NumberOfPeersStatistic(t *testing.T) { diff --git a/vcr/log/log_test.go b/vcr/log/log_test.go index 1b1e4416e..a8b630ea3 100644 --- a/vcr/log/log_test.go +++ b/vcr/log/log_test.go @@ -21,7 +21,7 @@ package log import ( "testing" - "github.com/magiconair/properties/assert" + "github.com/stretchr/testify/assert" ) func TestLog(t *testing.T) { diff --git a/vdr/didsubject/test.go b/vdr/didsubject/test.go index 6fa1d7934..85b5267ea 100644 --- a/vdr/didsubject/test.go +++ b/vdr/didsubject/test.go @@ -22,9 +22,9 @@ import ( "github.com/sirupsen/logrus" "testing" - "github.com/magiconair/properties/assert" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/nuts-node/storage" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gorm.io/gorm" ) diff --git a/vdr/log/logger_test.go b/vdr/log/logger_test.go index fd4e3709c..3aed5c77f 100644 --- a/vdr/log/logger_test.go +++ b/vdr/log/logger_test.go @@ -21,7 +21,7 @@ package log import ( "testing" - "github.com/magiconair/properties/assert" + "github.com/stretchr/testify/assert" ) func TestLog(t *testing.T) {