update koanf major (#3441)

* update koanf major

* fix broken test

---------

Co-authored-by: Gerard Snaauw <[email protected]>

core/client_config.go

@@ -21,13 +21,13 @@ package core
 
 import (
 	"fmt"
+	"github.com/knadh/koanf/v2"
 	"github.com/spf13/cobra"
 	"os"
 	"path"
 	"strings"
 	"time"
 
-	"github.com/knadh/koanf"
 	"github.com/spf13/pflag"
 )
 

core/client_config_test.go

@@ -20,7 +20,7 @@
 package core
 
 import (
-	"github.com/knadh/koanf"
+	"github.com/knadh/koanf/v2"
 	"github.com/nuts-foundation/nuts-node/test/io"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"

core/config.go

@@ -22,11 +22,11 @@ package core
 import (
 	"errors"
 	"fmt"
-	"github.com/knadh/koanf"
 	"github.com/knadh/koanf/parsers/yaml"
 	"github.com/knadh/koanf/providers/env"
 	"github.com/knadh/koanf/providers/file"
 	"github.com/knadh/koanf/providers/posflag"
+	"github.com/knadh/koanf/v2"
 	"github.com/spf13/pflag"
 	"os"
 	"strings"

core/config_test.go

@@ -20,7 +20,7 @@
 package core
 
 import (
-	"github.com/knadh/koanf"
+	"github.com/knadh/koanf/v2"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/stretchr/testify/assert"

core/server_config.go

@@ -25,9 +25,9 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
-	"github.com/knadh/koanf"
 	"github.com/knadh/koanf/providers/env"
 	"github.com/knadh/koanf/providers/posflag"
+	"github.com/knadh/koanf/v2"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/pflag"
 	"net/url"

e2e-tests/browser/rfc019_selfsigned/config/node/nuts.yaml

@@ -6,4 +6,4 @@ http:
     address: :8081
 auth:
   contractvalidators:
-    - selfsigned
+    - employeeid

e2e-tests/browser/rfc019_selfsigned/run-test.sh

@@ -4,12 +4,11 @@ source ../../util.sh
 set -e # make script fail if any of the tests returns a non-zero exit code
 
 # Shut down existing containers
-docker compose stop
+docker compose down
 
 # Start new stack
 docker compose up --wait
 
-
 go test -v --tags=e2e_tests .
 
 docker compose stop

go.mod

@@ -16,7 +16,11 @@ require (
 	github.com/goodsign/monday v1.0.2
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/vault/api v1.15.0
-	github.com/knadh/koanf v1.5.0
+	github.com/knadh/koanf/parsers/yaml v0.1.0
+	github.com/knadh/koanf/providers/env v1.0.0
+	github.com/knadh/koanf/providers/file v1.1.0
+	github.com/knadh/koanf/providers/posflag v0.1.0
+	github.com/knadh/koanf/providers/structs v0.1.0
 	github.com/labstack/echo/v4 v4.12.0
 	github.com/lestrrat-go/jwx/v2 v2.1.1
 	github.com/magiconair/properties v1.8.7
@@ -87,7 +91,7 @@ require (
 	github.com/edsrzf/mmap-go v1.1.0 // indirect
 	github.com/eknkc/basex v1.0.1 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
-	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/fxamacker/cbor v1.5.1 // indirect
 	github.com/glebarez/go-sqlite v1.21.2 // indirect
 	github.com/go-chi/chi/v5 v5.0.10 // indirect
@@ -124,9 +128,9 @@ require (
 	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/lestrrat-go/blackmagic v1.0.2 // indirect
@@ -199,3 +203,8 @@ require (
 	modernc.org/sqlite v1.32.0 // indirect
 	rsc.io/qr v0.2.0 // indirect
 )
+
+require (
+	github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect
+	github.com/knadh/koanf/v2 v2.1.1 // indirect
+)

main_test.go

@@ -22,9 +22,9 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/knadh/koanf"
 	"github.com/knadh/koanf/parsers/yaml"
 	"github.com/knadh/koanf/providers/structs"
+	"github.com/knadh/koanf/v2"
 	"github.com/nuts-foundation/nuts-node/auth"
 	"github.com/nuts-foundation/nuts-node/cmd"
 	"github.com/nuts-foundation/nuts-node/core"