diff --git a/Dockerfile b/Dockerfile index 5bdb86295a..70a5cb01b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ COPY go.sum . RUN go mod download && go mod verify COPY . . -RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-w -s -X 'github.com/nuts-foundation/nuts-node/core.GitCommit=${GIT_COMMIT}' -X 'github.com/nuts-foundation/nuts-node/core.GitBranch=${GIT_BRANCH}' -X 'github.com/nuts-foundation/nuts-node/core.GitVersion=${GIT_VERSION}'" -o /opt/nuts/nuts +RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-w -s -X 'github.com/nuts-foundation/nuts-node/v5/core.GitCommit=${GIT_COMMIT}' -X 'github.com/nuts-foundation/nuts-node/v5/core.GitBranch=${GIT_BRANCH}' -X 'github.com/nuts-foundation/nuts-node/v5/core.GitVersion=${GIT_VERSION}'" -o /opt/nuts/nuts # alpine FROM alpine:3.22.2 diff --git a/api/ssi_types_test.go b/api/ssi_types_test.go index ad6825b3eb..e2d6802786 100644 --- a/api/ssi_types_test.go +++ b/api/ssi_types_test.go @@ -29,9 +29,9 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/crypto/hash" - vcr "github.com/nuts-foundation/nuts-node/vcr/api/vcr/v2" - vdrTypes "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + vcr "github.com/nuts-foundation/nuts-node/v5/vcr/api/vcr/v2" + vdrTypes "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) const ( diff --git a/audit/http.go b/audit/http.go index 90259241cf..67ccc453cb 100644 --- a/audit/http.go +++ b/audit/http.go @@ -21,7 +21,7 @@ package audit import ( "fmt" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" ) // StrictMiddleware is like SetOnEchoContext but then as handler for strict server interfaces. diff --git a/audit/http_test.go b/audit/http_test.go index 53bdf761c8..826a4e886b 100644 --- a/audit/http_test.go +++ b/audit/http_test.go @@ -20,7 +20,7 @@ package audit import ( "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/stretchr/testify/assert" "net/http" "testing" diff --git a/auth/api/auth/v1/api.go b/auth/api/auth/v1/api.go index 51fa4bd86f..8bc96a49b2 100644 --- a/auth/api/auth/v1/api.go +++ b/auth/api/auth/v1/api.go @@ -22,7 +22,7 @@ import ( "context" "encoding/json" "fmt" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "net/http" "net/url" "regexp" @@ -31,17 +31,17 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/api/auth/v1/client" - "github.com/nuts-foundation/nuts-node/vcr" + "github.com/nuts-foundation/nuts-node/v5/auth/api/auth/v1/client" + "github.com/nuts-foundation/nuts-node/v5/vcr" "github.com/labstack/echo/v4" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/auth" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/auth" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/log" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/core" ) var _ StrictServerInterface = (*Wrapper)(nil) diff --git a/auth/api/auth/v1/api_test.go b/auth/api/auth/v1/api_test.go index 25810910b6..f570d183c2 100644 --- a/auth/api/auth/v1/api_test.go +++ b/auth/api/auth/v1/api_test.go @@ -25,16 +25,16 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/audit" - pkg2 "github.com/nuts-foundation/nuts-node/auth" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/auth/services/dummy" - "github.com/nuts-foundation/nuts-node/auth/services/oauth" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vdr" + "github.com/nuts-foundation/nuts-node/v5/audit" + pkg2 "github.com/nuts-foundation/nuts-node/v5/auth" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services/dummy" + "github.com/nuts-foundation/nuts-node/v5/auth/services/oauth" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vdr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/api/auth/v1/client/client.go b/auth/api/auth/v1/client/client.go index 5ea160f107..38bd3233f0 100644 --- a/auth/api/auth/v1/client/client.go +++ b/auth/api/auth/v1/client/client.go @@ -25,8 +25,8 @@ import ( "strings" "time" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/auth/log" + "github.com/nuts-foundation/nuts-node/v5/core" ) type oauthAPIError struct { diff --git a/auth/api/auth/v1/client/client_test.go b/auth/api/auth/v1/client/client_test.go index 47f12079b6..1d4fc1f4f0 100644 --- a/auth/api/auth/v1/client/client_test.go +++ b/auth/api/auth/v1/client/client_test.go @@ -20,7 +20,7 @@ package client import ( "context" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/stretchr/testify/require" "net/http" "net/http/httptest" @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/assert" - http2 "github.com/nuts-foundation/nuts-node/test/http" + http2 "github.com/nuts-foundation/nuts-node/v5/test/http" ) func TestHTTPClient_CreateAccessToken(t *testing.T) { diff --git a/auth/api/auth/v1/client/types.go b/auth/api/auth/v1/client/types.go index 17d6e99b5e..fed2d414b0 100644 --- a/auth/api/auth/v1/client/types.go +++ b/auth/api/auth/v1/client/types.go @@ -20,7 +20,7 @@ package client import ( "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services" ) // JwtBearerGrantType defines the grant-type to use in the access token request diff --git a/auth/api/auth/v1/types.go b/auth/api/auth/v1/types.go index 90f203be59..061456c812 100644 --- a/auth/api/auth/v1/types.go +++ b/auth/api/auth/v1/types.go @@ -20,7 +20,7 @@ package v1 import ( "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services" ) // VerifiableCredential is an alias to use from within the API diff --git a/auth/api/means/v1/api.go b/auth/api/means/v1/api.go index 7daa71f433..11f0ae712b 100644 --- a/auth/api/means/v1/api.go +++ b/auth/api/means/v1/api.go @@ -19,8 +19,8 @@ package v1 import ( - "github.com/nuts-foundation/nuts-node/auth" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/auth" + "github.com/nuts-foundation/nuts-node/v5/core" ) // Wrapper bridges Echo routes to the server backend. diff --git a/auth/auth.go b/auth/auth.go index 36309f5008..971634aebf 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -23,17 +23,17 @@ import ( "path" "time" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/auth/services/notary" - "github.com/nuts-foundation/nuts-node/auth/services/oauth" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/didman" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services/notary" + "github.com/nuts-foundation/nuts-node/v5/auth/services/oauth" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/didman" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/pki" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" ) // ErrMissingPublicURL is returned when the publicUrl is missing from the config diff --git a/auth/auth_test.go b/auth/auth_test.go index a8b2a4a401..50d1a8a392 100644 --- a/auth/auth_test.go +++ b/auth/auth_test.go @@ -19,14 +19,14 @@ package auth import ( - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/pki" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "go.uber.org/mock/gomock" "testing" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/auth/cmd/cmd.go b/auth/cmd/cmd.go index 2d7214ba9b..3438ceb5a9 100644 --- a/auth/cmd/cmd.go +++ b/auth/cmd/cmd.go @@ -19,7 +19,7 @@ package cmd import ( - "github.com/nuts-foundation/nuts-node/auth" + "github.com/nuts-foundation/nuts-node/v5/auth" "github.com/spf13/pflag" ) diff --git a/auth/cmd/cmd_test.go b/auth/cmd/cmd_test.go index 705e6af79c..e98c09f0bb 100644 --- a/auth/cmd/cmd_test.go +++ b/auth/cmd/cmd_test.go @@ -19,8 +19,8 @@ package cmd import ( - "github.com/nuts-foundation/nuts-node/auth" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/auth" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/stretchr/testify/require" "sort" "testing" diff --git a/auth/config.go b/auth/config.go index 0b937444e8..37d9ece6fa 100644 --- a/auth/config.go +++ b/auth/config.go @@ -19,10 +19,10 @@ package auth import ( - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/auth/services/dummy" - "github.com/nuts-foundation/nuts-node/auth/services/selfsigned" - "github.com/nuts-foundation/nuts-node/auth/services/uzi" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services/dummy" + "github.com/nuts-foundation/nuts-node/v5/auth/services/selfsigned" + "github.com/nuts-foundation/nuts-node/v5/auth/services/uzi" ) // Config holds all the configuration params diff --git a/auth/interface.go b/auth/interface.go index 3e087e94ba..6836642469 100644 --- a/auth/interface.go +++ b/auth/interface.go @@ -19,8 +19,8 @@ package auth import ( - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/auth/services/oauth" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services/oauth" ) // AuthenticationServices is the interface which should be implemented for clients or mocks diff --git a/auth/log/logger.go b/auth/log/logger.go index e71f5c2df9..683f2bf942 100644 --- a/auth/log/logger.go +++ b/auth/log/logger.go @@ -19,7 +19,7 @@ package log import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" ) diff --git a/auth/services/dummy/dummy.go b/auth/services/dummy/dummy.go index d31b41003e..3f7231ed1e 100644 --- a/auth/services/dummy/dummy.go +++ b/auth/services/dummy/dummy.go @@ -29,8 +29,8 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" ) // ContractFormat is the contract format type diff --git a/auth/services/dummy/dummy_test.go b/auth/services/dummy/dummy_test.go index 9cbfa319bc..28070b21a2 100644 --- a/auth/services/dummy/dummy_test.go +++ b/auth/services/dummy/dummy_test.go @@ -25,8 +25,8 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" "github.com/stretchr/testify/assert" ) diff --git a/auth/services/irma/factory.go b/auth/services/irma/factory.go index 1533e4e3e7..b35ddc2931 100644 --- a/auth/services/irma/factory.go +++ b/auth/services/irma/factory.go @@ -20,11 +20,11 @@ package irma import ( "fmt" - "github.com/nuts-foundation/nuts-node/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" "os" "path/filepath" - "github.com/nuts-foundation/nuts-node/auth/log" + "github.com/nuts-foundation/nuts-node/v5/auth/log" "github.com/sirupsen/logrus" irma "github.com/privacybydesign/irmago" diff --git a/auth/services/irma/irmacontract.go b/auth/services/irma/irmacontract.go index 0f2326a061..30cb306a26 100644 --- a/auth/services/irma/irmacontract.go +++ b/auth/services/irma/irmacontract.go @@ -26,9 +26,9 @@ import ( "strings" "time" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/log" + "github.com/nuts-foundation/nuts-node/v5/auth/services" irma "github.com/privacybydesign/irmago" ) diff --git a/auth/services/irma/irmacontract_test.go b/auth/services/irma/irmacontract_test.go index 43372c7cd5..b3763ac5bc 100644 --- a/auth/services/irma/irmacontract_test.go +++ b/auth/services/irma/irmacontract_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services" - "github.com/nuts-foundation/nuts-node/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/test" + "github.com/nuts-foundation/nuts-node/v5/auth/test" irma "github.com/privacybydesign/irmago" "github.com/stretchr/testify/assert" diff --git a/auth/services/irma/signer.go b/auth/services/irma/signer.go index d913f28d99..57bda4e7d5 100644 --- a/auth/services/irma/signer.go +++ b/auth/services/irma/signer.go @@ -24,7 +24,7 @@ import ( "encoding/json" "fmt" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" "net/http" "os" @@ -35,9 +35,9 @@ import ( "github.com/privacybydesign/irmago/server/irmaserver" "github.com/mdp/qrterminal/v3" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/log" + "github.com/nuts-foundation/nuts-node/v5/auth/services" irmago "github.com/privacybydesign/irmago" "github.com/privacybydesign/irmago/server" ) diff --git a/auth/services/irma/signer_test.go b/auth/services/irma/signer_test.go index 6cba581302..af31f1e7e5 100644 --- a/auth/services/irma/signer_test.go +++ b/auth/services/irma/signer_test.go @@ -26,12 +26,12 @@ import ( "github.com/privacybydesign/irmago/server/irmaserver" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vdr" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vdr" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" irma "github.com/privacybydesign/irmago" irmaservercore "github.com/privacybydesign/irmago/server" "github.com/stretchr/testify/assert" diff --git a/auth/services/irma/validator.go b/auth/services/irma/validator.go index 19c586c158..39df32e017 100644 --- a/auth/services/irma/validator.go +++ b/auth/services/irma/validator.go @@ -21,14 +21,14 @@ package irma import ( "errors" "fmt" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/log" + "github.com/nuts-foundation/nuts-node/v5/auth/services" "strings" "time" "github.com/lestrrat-go/jwx/jwt" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" irma "github.com/privacybydesign/irmago" ) diff --git a/auth/services/irma/validator_test.go b/auth/services/irma/validator_test.go index 7c4931c373..5702b102d6 100644 --- a/auth/services/irma/validator_test.go +++ b/auth/services/irma/validator_test.go @@ -25,10 +25,10 @@ import ( "testing" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/auth/test" - "github.com/nuts-foundation/nuts-node/crypto" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/test" + "github.com/nuts-foundation/nuts-node/v5/crypto" irma "github.com/privacybydesign/irmago" irmaservercore "github.com/privacybydesign/irmago/server" "github.com/stretchr/testify/assert" diff --git a/auth/services/mock.go b/auth/services/mock.go index 768eba9d08..2c50c57246 100644 --- a/auth/services/mock.go +++ b/auth/services/mock.go @@ -11,8 +11,8 @@ import ( did "github.com/nuts-foundation/go-did/did" vc "github.com/nuts-foundation/go-did/vc" - contract "github.com/nuts-foundation/nuts-node/auth/contract" - core "github.com/nuts-foundation/nuts-node/core" + contract "github.com/nuts-foundation/nuts-node/v5/auth/contract" + core "github.com/nuts-foundation/nuts-node/v5/core" gomock "go.uber.org/mock/gomock" ) diff --git a/auth/services/notary/notary.go b/auth/services/notary/notary.go index f24d20abd3..304cd42013 100644 --- a/auth/services/notary/notary.go +++ b/auth/services/notary/notary.go @@ -23,7 +23,7 @@ import ( "errors" "fmt" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "reflect" "strings" "time" @@ -31,18 +31,18 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/auth/services/dummy" - "github.com/nuts-foundation/nuts-node/auth/services/irma" - "github.com/nuts-foundation/nuts-node/auth/services/selfsigned" - "github.com/nuts-foundation/nuts-node/auth/services/uzi" - "github.com/nuts-foundation/nuts-node/auth/services/x509" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services/dummy" + "github.com/nuts-foundation/nuts-node/v5/auth/services/irma" + "github.com/nuts-foundation/nuts-node/v5/auth/services/selfsigned" + "github.com/nuts-foundation/nuts-node/v5/auth/services/uzi" + "github.com/nuts-foundation/nuts-node/v5/auth/services/x509" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/pki" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // ErrMissingOrganizationKey is used to indicate that this node has no private key of the indicated organization. diff --git a/auth/services/notary/notary_test.go b/auth/services/notary/notary_test.go index 350cc1dc40..a2ea06877a 100644 --- a/auth/services/notary/notary_test.go +++ b/auth/services/notary/notary_test.go @@ -27,16 +27,16 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" - irmaService "github.com/nuts-foundation/nuts-node/auth/services/irma" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + irmaService "github.com/nuts-foundation/nuts-node/v5/auth/services/irma" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vdr" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" irma "github.com/privacybydesign/irmago" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/auth/services/oauth/authz_server.go b/auth/services/oauth/authz_server.go index b17a89338e..fe1c11a7d5 100644 --- a/auth/services/oauth/authz_server.go +++ b/auth/services/oauth/authz_server.go @@ -30,19 +30,19 @@ import ( "github.com/lestrrat-go/jwx/jwt" "github.com/nuts-foundation/go-did/did" vc2 "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/core" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/didman" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/verifier" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/log" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/core" + nutsCrypto "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/didman" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) const errInvalidIssuerFmt = "invalid jwt.issuer: %w" diff --git a/auth/services/oauth/authz_server_test.go b/auth/services/oauth/authz_server_test.go index 83228eab39..c7fe2b53ff 100644 --- a/auth/services/oauth/authz_server_test.go +++ b/auth/services/oauth/authz_server_test.go @@ -27,7 +27,7 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "testing" "time" @@ -37,18 +37,18 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/didman" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/credential" - vcrTypes "github.com/nuts-foundation/nuts-node/vcr/types" - verifier2 "github.com/nuts-foundation/nuts-node/vcr/verifier" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/didman" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + vcrTypes "github.com/nuts-foundation/nuts-node/v5/vcr/types" + verifier2 "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v5/vdr" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/services/oauth/interface.go b/auth/services/oauth/interface.go index e0d1dcf1d7..ffaace0063 100644 --- a/auth/services/oauth/interface.go +++ b/auth/services/oauth/interface.go @@ -20,7 +20,7 @@ package oauth import ( "context" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services" "net/url" ) diff --git a/auth/services/oauth/mock.go b/auth/services/oauth/mock.go index f09ac067f6..6fc43cad25 100644 --- a/auth/services/oauth/mock.go +++ b/auth/services/oauth/mock.go @@ -9,7 +9,7 @@ import ( url "net/url" reflect "reflect" - services "github.com/nuts-foundation/nuts-node/auth/services" + services "github.com/nuts-foundation/nuts-node/v5/auth/services" gomock "go.uber.org/mock/gomock" ) diff --git a/auth/services/oauth/relying_party.go b/auth/services/oauth/relying_party.go index 70365c00ca..5ffa53c70b 100644 --- a/auth/services/oauth/relying_party.go +++ b/auth/services/oauth/relying_party.go @@ -29,16 +29,16 @@ import ( "github.com/lestrrat-go/jwx/jwt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/auth/api/auth/v1/client" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/core" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/didman" - httpclient "github.com/nuts-foundation/nuts-node/http/client" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/auth/api/auth/v1/client" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/core" + nutsCrypto "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/didman" + httpclient "github.com/nuts-foundation/nuts-node/v5/http/client" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) var _ RelyingParty = (*relyingParty)(nil) diff --git a/auth/services/oauth/relying_party_test.go b/auth/services/oauth/relying_party_test.go index 84c83cbfe0..ae085657d7 100644 --- a/auth/services/oauth/relying_party_test.go +++ b/auth/services/oauth/relying_party_test.go @@ -23,8 +23,8 @@ import ( "crypto/tls" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/audit" - http2 "github.com/nuts-foundation/nuts-node/test/http" + "github.com/nuts-foundation/nuts-node/v5/audit" + http2 "github.com/nuts-foundation/nuts-node/v5/test/http" "net/http" "net/http/httptest" "net/url" @@ -34,13 +34,13 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/didman" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/didman" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vdr" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/services/selfsigned/signer.go b/auth/services/selfsigned/signer.go index 550f163fff..e03aa21a8b 100644 --- a/auth/services/selfsigned/signer.go +++ b/auth/services/selfsigned/signer.go @@ -27,15 +27,15 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/auth/services/selfsigned/types" - "github.com/nuts-foundation/nuts-node/auth/services/selfsigned/web" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/holder" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v5/auth/services/selfsigned/web" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/holder" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature/proof" "net/url" "time" ) diff --git a/auth/services/selfsigned/signer_test.go b/auth/services/selfsigned/signer_test.go index 339601b0dd..ea8d573bea 100644 --- a/auth/services/selfsigned/signer_test.go +++ b/auth/services/selfsigned/signer_test.go @@ -25,13 +25,13 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/auth/services/selfsigned/types" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/holder" - "github.com/nuts-foundation/nuts-node/vcr/issuer" - "github.com/nuts-foundation/nuts-node/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/holder" + "github.com/nuts-foundation/nuts-node/v5/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/services/selfsigned/store.go b/auth/services/selfsigned/store.go index 1f3ca6777c..a8d90925d7 100644 --- a/auth/services/selfsigned/store.go +++ b/auth/services/selfsigned/store.go @@ -20,7 +20,7 @@ package selfsigned import ( "context" - "github.com/nuts-foundation/nuts-node/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v5/auth/services/selfsigned/types" "sync" "time" ) diff --git a/auth/services/selfsigned/store_test.go b/auth/services/selfsigned/store_test.go index 3e322ff439..2495eed3e5 100644 --- a/auth/services/selfsigned/store_test.go +++ b/auth/services/selfsigned/store_test.go @@ -20,7 +20,7 @@ package selfsigned import ( "context" - "github.com/nuts-foundation/nuts-node/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v5/auth/services/selfsigned/types" "github.com/stretchr/testify/assert" "testing" "time" diff --git a/auth/services/selfsigned/test/generate_test.go b/auth/services/selfsigned/test/generate_test.go index fc8b1c4372..25e78088bd 100644 --- a/auth/services/selfsigned/test/generate_test.go +++ b/auth/services/selfsigned/test/generate_test.go @@ -21,12 +21,12 @@ package test import ( "context" "encoding/json" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/util" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/signature" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/util" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature/proof" "github.com/stretchr/testify/require" "os" "testing" diff --git a/auth/services/selfsigned/types/types.go b/auth/services/selfsigned/types/types.go index 6c6e32b265..ec3c79e71f 100644 --- a/auth/services/selfsigned/types/types.go +++ b/auth/services/selfsigned/types/types.go @@ -21,7 +21,7 @@ package types import ( "context" "encoding/json" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" "strings" "time" ) diff --git a/auth/services/selfsigned/validator.go b/auth/services/selfsigned/validator.go index 0ec3166863..341047e03b 100644 --- a/auth/services/selfsigned/validator.go +++ b/auth/services/selfsigned/validator.go @@ -25,12 +25,12 @@ import ( "fmt" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/auth/services/selfsigned/types" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" "time" ) diff --git a/auth/services/selfsigned/validator_test.go b/auth/services/selfsigned/validator_test.go index 953b40a96b..d872df67d4 100644 --- a/auth/services/selfsigned/validator_test.go +++ b/auth/services/selfsigned/validator_test.go @@ -22,14 +22,14 @@ import ( "context" "encoding/json" "errors" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/auth/services/selfsigned/types" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/util" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/issuer" - "github.com/nuts-foundation/nuts-node/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/util" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" "go.uber.org/mock/gomock" "os" "testing" @@ -38,9 +38,9 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/auth/services/selfsigned/web/handler.go b/auth/services/selfsigned/web/handler.go index 98bd726795..613bdf83eb 100644 --- a/auth/services/selfsigned/web/handler.go +++ b/auth/services/selfsigned/web/handler.go @@ -29,10 +29,10 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/auth/services/selfsigned/types" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/log" + "github.com/nuts-foundation/nuts-node/v5/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v5/core" ) //go:embed templates/* diff --git a/auth/services/selfsigned/web/handler_test.go b/auth/services/selfsigned/web/handler_test.go index 22e020d99c..a14a6769fe 100644 --- a/auth/services/selfsigned/web/handler_test.go +++ b/auth/services/selfsigned/web/handler_test.go @@ -21,9 +21,9 @@ package web import ( "bytes" "fmt" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services/selfsigned/types" - "github.com/nuts-foundation/nuts-node/mock" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v5/mock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/services/services.go b/auth/services/services.go index fdbe03dd78..22056817d5 100644 --- a/auth/services/services.go +++ b/auth/services/services.go @@ -21,11 +21,11 @@ package services import ( "context" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" ) // SignedToken defines the uniform interface to crypto specific implementations such as Irma or x509 tokens. diff --git a/auth/services/test.go b/auth/services/test.go index e95ee41fdd..b9f7233dbd 100644 --- a/auth/services/test.go +++ b/auth/services/test.go @@ -19,7 +19,7 @@ package services -import "github.com/nuts-foundation/nuts-node/auth/contract" +import "github.com/nuts-foundation/nuts-node/v5/auth/contract" type TestVPVerificationResult struct { Val contract.State diff --git a/auth/services/uzi/validator.go b/auth/services/uzi/validator.go index 4aaabf73ca..2843b70f6b 100644 --- a/auth/services/uzi/validator.go +++ b/auth/services/uzi/validator.go @@ -24,8 +24,8 @@ import ( "time" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" ) // ContractFormat is the contract format type diff --git a/auth/services/uzi/validator_test.go b/auth/services/uzi/validator_test.go index dd852a14ed..3b0387e9ba 100644 --- a/auth/services/uzi/validator_test.go +++ b/auth/services/uzi/validator_test.go @@ -25,12 +25,12 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v5/auth/services" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" - "github.com/nuts-foundation/nuts-node/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" ) func TestUziValidator_VerifyVP(t *testing.T) { diff --git a/auth/services/x509/uzi_validator.go b/auth/services/x509/uzi_validator.go index dfb17ceefa..412d3794d0 100644 --- a/auth/services/x509/uzi_validator.go +++ b/auth/services/x509/uzi_validator.go @@ -26,11 +26,11 @@ import ( "github.com/lestrrat-go/jwx/jwa" - "github.com/nuts-foundation/nuts-node/auth/assets" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/pki" + "github.com/nuts-foundation/nuts-node/v5/auth/assets" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/pki" ) // UziSignedToken implements a SignedToken interface for contracts signed by the UZI means in the JwtX509Token form. diff --git a/auth/services/x509/uzi_validator_test.go b/auth/services/x509/uzi_validator_test.go index 10b5215f42..15066b4e23 100644 --- a/auth/services/x509/uzi_validator_test.go +++ b/auth/services/x509/uzi_validator_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/pki" + "github.com/nuts-foundation/nuts-node/v5/auth/contract" + "github.com/nuts-foundation/nuts-node/v5/auth/services" + "github.com/nuts-foundation/nuts-node/v5/pki" ) const uziSignedJwt = `eyJ4NWMiOlsiTUlJSGN6Q0NCVnVnQXdJQkFnSVVIUFU4cVZYS3FEZXByWUhDQ1dLQmkrdkp0Vll3RFFZSktvWklodmNOQVFFTEJRQXdhakVMTUFrR0ExVUVCaE1DVGt3eERUQUxCZ05WQkFvTUJFTkpRa2N4RnpBVkJnTlZCR0VNRGs1VVVrNU1MVFV3TURBd05UTTFNVE13TVFZRFZRUUREQ3BVUlZOVUlGVmFTUzF5WldkcGMzUmxjaUJOWldSbGQyVnlhMlZ5SUc5d0lHNWhZVzBnUTBFZ1J6TXdIaGNOTWpBd056RTNNVEl6TkRFNVdoY05Nak13TnpFM01USXpOREU1V2pDQmhURUxNQWtHQTFVRUJoTUNUa3d4SURBZUJnTlZCQW9NRjFURHFYTjBJRnB2Y21kcGJuTjBaV3hzYVc1bklEQXpNUll3RkFZRFZRUUVEQTEwWlhOMExUa3dNREUzT1RRek1Rd3dDZ1lEVlFRcURBTktZVzR4RWpBUUJnTlZCQVVUQ1Rrd01EQXlNVEl4T1RFYU1CZ0dBMVVFQXd3UlNtRnVJSFJsYzNRdE9UQXdNVGM1TkRNd2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUUNoVFloUEE3WDBTNWNWQnhHYzdHWi81RHZxSWVzaWowYUpadllMcVhrRmkzOU5EQjRLSDM4c3JIbHRGVWYyOVF3YlBSUm9KOEJJYXpFTnhkdTg4WUQvZXBKSGhmOUhpMkx1UGhoZmdSU3FjSnp4dDNPYStKME91YzdnZzBZaytnV01USkJ5R2ZSYlRQR3V5eVFFMnJOUFJteDRoOUNLSDZiNHVZam1ESDJWdXlhM3BtY0UrR2wxbmUvQnJjYnRsSmpCa2d6Vkw2cmVTYzdPUXhvbi9ZbmFRanhvakJpZ2xhT0hub2JESU9tczluQkZFQ29uUzVKNGZvb1VRVTg3anFMSGlHckJNL2xNdHlaOUVrblhGQ3U2U3VRb3ZDNlR1eUZ2c0JnT0MyNzNGZ0JaR2VybHkzbTFEVXczTlROUG15dlJEUXREWEJHTi9BVkVJLzR4VGdGL0FnTUJBQUdqZ2dMek1JSUM3ekJSQmdOVkhSRUVTakJJb0VZR0ExVUZCYUEvRmoweUxqRTJMalV5T0M0eExqRXdNRGN1T1RrdU1qRTRMVEV0T1RBd01ESXhNakU1TFU0dE9UQXdNREF6T0RJdE1EQXVNREF3TFRBd01EQXdNREF3TUF3R0ExVWRFd0VCL3dRQ01BQXdId1lEVlIwakJCZ3dGb0FVeWZBR0RwTGZOaThJZFRpODMrNUJlYkpkd0Y4d2dhc0dDQ3NHQVFVRkJ3RUJCSUdlTUlHYk1Hc0dDQ3NHQVFVRkJ6QUNobDlvZEhSd09pOHZkM2QzTG5WNmFTMXlaV2RwYzNSbGNpMTBaWE4wTG01c0wyTmhZMlZ5ZEhNdk1qQXhPVEExTURGZmRHVnpkRjkxZW1rdGNtVm5hWE4wWlhKZmJXVmtaWGRsY210bGNsOXZjRjl1WVdGdFgyTmhYMmN6TG1ObGNqQXNCZ2dyQmdFRkJRY3dBWVlnYUhSMGNEb3ZMMjlqYzNBdWRYcHBMWEpsWjJsemRHVnlMWFJsYzNRdWJtd3dnZ0VHQmdOVkhTQUVnZjR3Z2Zzd2dmZ0dDV0NFRUFHSGIyT0JWRENCNmpBL0JnZ3JCZ0VGQlFjQ0FSWXphSFIwY0hNNkx5OWhZMk5sY0hSaGRHbGxMbnB2Y21kamMzQXVibXd2WTNCekwzVjZhUzF5WldkcGMzUmxjaTVvZEcxc01JR21CZ2dyQmdFRkJRY0NBakNCbVF5QmxrTmxjblJwWm1sallXRjBJSFZwZEhOc2RXbDBaVzVrSUdkbFluSjFhV3RsYmlCMFpXNGdZbVZvYjJWMlpTQjJZVzRnWkdVZ1ZFVlRWQ0IyWVc0Z2FHVjBJRlZhU1MxeVpXZHBjM1JsY2k0Z1NHVjBJRlZhU1MxeVpXZHBjM1JsY2lCcGN5QnBiaUJuWldWdUlHZGxkbUZzSUdGaGJuTndjbUZyWld4cGFtc2dkbTl2Y2lCbGRtVnVkSFZsYkdVZ2MyTm9ZV1JsTGpBZkJnTlZIU1VFR0RBV0JnZ3JCZ0VGQlFjREJBWUtLd1lCQkFHQ053b0REREJqQmdOVkhSOEVYREJhTUZpZ1ZxQlVobEpvZEhSd09pOHZkM2QzTG5WNmFTMXlaV2RwYzNSbGNpMTBaWE4wTG01c0wyTmtjQzkwWlhOMFgzVjZhUzF5WldkcGMzUmxjbDl0WldSbGQyVnlhMlZ5WDI5d1gyNWhZVzFmWTJGZlp6TXVZM0pzTUIwR0ExVWREZ1FXQkJTWTBkclhRMEpINmhIdi9zejFTK3lyakVoU1F6QU9CZ05WSFE4QkFmOEVCQU1DQmtBd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dJQkFGMDdXWmhoNkx5ZWdjMjJscDIwb0x5K2tnUlB3Ti9TL0lTdkxGVEY0RFBBSTY2RmtVSnNGUmFmbXVhMFpsL0JPZ2U1SXZwMHM5dEVqaHBaMTZYNGVZQm1qOE1VMHhBTjM0OC9PakFtSUZTR0l1d2kxU2RyendIUnF2VUxmMHNWcXZUOEpEVTZkMHEvaVBPRThEYU9OWXppbUlkZ1dFOXBOODhBb1ptT3VkSDQzSjk3WkRnMXYrWnU3NnMwdFI4WXpXSElUVDEvbmJRbDUzeU9mR3dER1RSdk42T1hkelBMVXpUbGhmdEdYZUZPRmNrb0Q4c2NRTGFaV1loQTVaVDRxLzlncE02WXU1TTMzWVJ0empGek4yTWVWaFpsUmV5NUY1NmVWcDV6MkM0U3NnM2FCemkyandnRzExY3pvMVBGdldod21zckNTTFpJUHdhWFduQ3hnYW5FZkxzeXVKcmpuVXYyUXdaeldCT1VoRjhSN2FtUk9xUHN6VGJwNE9yZWUyWmFyc04wYzNSLzdYdmJvcVdhb3NRa3Q1MFlxOHpCQ0Z4clFMZkZKN1pUcEhHWENEQmtzcVg4WWVrZ2RxdDhIMmdSS2p2OVNLY2RjejA0a2VJUEIyRU85K2ZQTHcwckZqRGVLdFFjYmRXTDlFSHRNOHAwcXBmTHNLcUdqbXdSdHhYbVRYUHNVS0FKQ1RKdWI4cnVRZVpsQlhZVC91YjNEMER1RzB2YUlNcjE3aDZydEdYR1hDWFV2VUxYMzBnczFyS3VUVkZkR0xFRUdid3JHbFVUZUdHRXFQbU4xdWFmNWpEdkR1UDE5R2RTV0VZMW4xTjYvV1paODhVS2ZnZHpxSVlKemt1RzV6bGZLUWdEREJvZXNyd3BCZXlkTXo0M0diZEZieS8zUm9MNSJdLCJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.eyJtZXNzYWdlIjoiTkw6QmVoYW5kZWxhYXJMb2dpbjp2MSBPbmRlcmdldGVrZW5kZSBnZWVmdCB0b2VzdGVtbWluZyBhYW4gRGVtbyBFSFIgb20gbmFtZW5zIHZlcnBsZWVnaHVpcyBEZSBub290amVzIGVuIG9uZGVyZ2V0ZWtlbmRlIGhldCBOdXRzIG5ldHdlcmsgdGUgYmV2cmFnZW4uIERlemUgdG9lc3RlbW1pbmcgaXMgZ2VsZGlnIHZhbiBkaW5zZGFnLCAxIG9rdG9iZXIgMjAxOSAxMzozMDo0MiB0b3QgZGluc2RhZywgMSBva3RvYmVyIDIwMTkgMTQ6MzA6NDIuIiwiaWF0IjoxNjA0MzE3ODg5fQ.FMekUy0UoOwhbEciJ9Q1TESh7fE-MQuUEZI5M65RuwtTlPlqN2P1KGFel8FDh42k2R79S8RB4x1XF0UkZtu8YOkNqFuX2h5Ow3xhaAquHR3iqzJy8wBKo0ZnctPDSJGfn0k-UzF9MS6665JuDAnvE5ETop1ASou2lPC6885Rh8QRxBDSKz48pHsLh2oQrn7Qs5BfhHMgkDrwnPrN1tIhyKPNvbhFvy7nYbrdKg6O3W8xK9jHyES7ts_ahkI3GYH9nOa2VhX3lySLzsY3qH5NPDNCj3IE1St6Ab4rm7RfCQ8tWVRf0qQG1X0bALgCNMY8ALUrIoUUn4zxpAGCNRBmig` diff --git a/auth/services/x509/x509_validator.go b/auth/services/x509/x509_validator.go index 0ff08e2921..07ae9512f7 100644 --- a/auth/services/x509/x509_validator.go +++ b/auth/services/x509/x509_validator.go @@ -27,7 +27,7 @@ import ( "fmt" "time" - "github.com/nuts-foundation/nuts-node/pki" + "github.com/nuts-foundation/nuts-node/v5/pki" "github.com/lestrrat-go/jwx/jwa" "github.com/lestrrat-go/jwx/jws" diff --git a/auth/services/x509/x509_validator_test.go b/auth/services/x509/x509_validator_test.go index 6fb4e39fdd..361335283d 100644 --- a/auth/services/x509/x509_validator_test.go +++ b/auth/services/x509/x509_validator_test.go @@ -31,7 +31,7 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/pki" + "github.com/nuts-foundation/nuts-node/v5/pki" "github.com/lestrrat-go/jwx/jwa" "github.com/lestrrat-go/jwx/jws" diff --git a/auth/test.go b/auth/test.go index 51ca6515ed..4caa6992f9 100644 --- a/auth/test.go +++ b/auth/test.go @@ -21,10 +21,10 @@ package auth import ( "testing" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/pki" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "go.uber.org/mock/gomock" ) diff --git a/cmd/root.go b/cmd/root.go index 2061cd02ae..b7e12ea69b 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -23,44 +23,44 @@ import ( "context" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/golden_hammer" - goldenHammerCmd "github.com/nuts-foundation/nuts-node/golden_hammer/cmd" + "github.com/nuts-foundation/nuts-node/v5/golden_hammer" + goldenHammerCmd "github.com/nuts-foundation/nuts-node/v5/golden_hammer/cmd" "io" "os" "runtime/pprof" - "github.com/nuts-foundation/nuts-node/auth" - authAPI "github.com/nuts-foundation/nuts-node/auth/api/auth/v1" - authMeansAPI "github.com/nuts-foundation/nuts-node/auth/api/means/v1" - authCmd "github.com/nuts-foundation/nuts-node/auth/cmd" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/core/status" - "github.com/nuts-foundation/nuts-node/crypto" - cryptoAPI "github.com/nuts-foundation/nuts-node/crypto/api/v1" - cryptoCmd "github.com/nuts-foundation/nuts-node/crypto/cmd" - "github.com/nuts-foundation/nuts-node/didman" - didmanAPI "github.com/nuts-foundation/nuts-node/didman/api/v1" - didmanCmd "github.com/nuts-foundation/nuts-node/didman/cmd" - "github.com/nuts-foundation/nuts-node/events" - eventsCmd "github.com/nuts-foundation/nuts-node/events/cmd" - httpEngine "github.com/nuts-foundation/nuts-node/http" - httpCmd "github.com/nuts-foundation/nuts-node/http/cmd" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/network" - networkAPI "github.com/nuts-foundation/nuts-node/network/api/v1" - networkCmd "github.com/nuts-foundation/nuts-node/network/cmd" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/storage" - storageCmd "github.com/nuts-foundation/nuts-node/storage/cmd" - "github.com/nuts-foundation/nuts-node/vcr" - openid4vciAPI "github.com/nuts-foundation/nuts-node/vcr/api/openid4vci/v0" - vcrAPI "github.com/nuts-foundation/nuts-node/vcr/api/vcr/v2" - vcrCmd "github.com/nuts-foundation/nuts-node/vcr/cmd" - "github.com/nuts-foundation/nuts-node/vdr" - vdrAPI "github.com/nuts-foundation/nuts-node/vdr/api/v1" - vdrCmd "github.com/nuts-foundation/nuts-node/vdr/cmd" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/auth" + authAPI "github.com/nuts-foundation/nuts-node/v5/auth/api/auth/v1" + authMeansAPI "github.com/nuts-foundation/nuts-node/v5/auth/api/means/v1" + authCmd "github.com/nuts-foundation/nuts-node/v5/auth/cmd" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/core/status" + "github.com/nuts-foundation/nuts-node/v5/crypto" + cryptoAPI "github.com/nuts-foundation/nuts-node/v5/crypto/api/v1" + cryptoCmd "github.com/nuts-foundation/nuts-node/v5/crypto/cmd" + "github.com/nuts-foundation/nuts-node/v5/didman" + didmanAPI "github.com/nuts-foundation/nuts-node/v5/didman/api/v1" + didmanCmd "github.com/nuts-foundation/nuts-node/v5/didman/cmd" + "github.com/nuts-foundation/nuts-node/v5/events" + eventsCmd "github.com/nuts-foundation/nuts-node/v5/events/cmd" + httpEngine "github.com/nuts-foundation/nuts-node/v5/http" + httpCmd "github.com/nuts-foundation/nuts-node/v5/http/cmd" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/network" + networkAPI "github.com/nuts-foundation/nuts-node/v5/network/api/v1" + networkCmd "github.com/nuts-foundation/nuts-node/v5/network/cmd" + "github.com/nuts-foundation/nuts-node/v5/pki" + "github.com/nuts-foundation/nuts-node/v5/storage" + storageCmd "github.com/nuts-foundation/nuts-node/v5/storage/cmd" + "github.com/nuts-foundation/nuts-node/v5/vcr" + openid4vciAPI "github.com/nuts-foundation/nuts-node/v5/vcr/api/openid4vci/v0" + vcrAPI "github.com/nuts-foundation/nuts-node/v5/vcr/api/vcr/v2" + vcrCmd "github.com/nuts-foundation/nuts-node/v5/vcr/cmd" + "github.com/nuts-foundation/nuts-node/v5/vdr" + vdrAPI "github.com/nuts-foundation/nuts-node/v5/vdr/api/v1" + vdrCmd "github.com/nuts-foundation/nuts-node/v5/vdr/cmd" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/cmd/root_test.go b/cmd/root_test.go index 3db937fa69..192fbe58de 100644 --- a/cmd/root_test.go +++ b/cmd/root_test.go @@ -28,8 +28,8 @@ import ( "path" "testing" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/core/client_config_test.go b/core/client_config_test.go index ab381e99f9..67f372d812 100644 --- a/core/client_config_test.go +++ b/core/client_config_test.go @@ -21,7 +21,7 @@ package core import ( "github.com/knadh/koanf" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" "os" diff --git a/core/status/cmd.go b/core/status/cmd.go index 3b1b3b38c2..eca9c79367 100644 --- a/core/status/cmd.go +++ b/core/status/cmd.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" ) // Cmd contains sub-commands for the remote client diff --git a/core/status/cmd_test.go b/core/status/cmd_test.go index 5e2622bbeb..264623cb78 100644 --- a/core/status/cmd_test.go +++ b/core/status/cmd_test.go @@ -24,8 +24,8 @@ import ( "net/http/httptest" "testing" - "github.com/nuts-foundation/nuts-node/core" - http2 "github.com/nuts-foundation/nuts-node/test/http" + "github.com/nuts-foundation/nuts-node/v5/core" + http2 "github.com/nuts-foundation/nuts-node/v5/test/http" "github.com/stretchr/testify/assert" ) diff --git a/core/status/engine.go b/core/status/engine.go index 10603de139..ff84450130 100644 --- a/core/status/engine.go +++ b/core/status/engine.go @@ -28,7 +28,7 @@ import ( "strings" "time" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/labstack/echo/v4" ) diff --git a/core/status/engine_test.go b/core/status/engine_test.go index 3fa6f6a6db..8c761b53a0 100644 --- a/core/status/engine_test.go +++ b/core/status/engine_test.go @@ -19,9 +19,9 @@ package status import ( - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/mock" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/mock" + "github.com/nuts-foundation/nuts-node/v5/test" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" "net/http" diff --git a/core/tls_test.go b/core/tls_test.go index 9201c3f747..594c83cc89 100644 --- a/core/tls_test.go +++ b/core/tls_test.go @@ -19,7 +19,7 @@ package core import ( - "github.com/nuts-foundation/nuts-node/test/pki" + "github.com/nuts-foundation/nuts-node/v5/test/pki" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/crypto/api/v1/api.go b/crypto/api/v1/api.go index 035321f29a..6065e63010 100644 --- a/crypto/api/v1/api.go +++ b/crypto/api/v1/api.go @@ -31,10 +31,10 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) var _ StrictServerInterface = (*Wrapper)(nil) diff --git a/crypto/api/v1/api_test.go b/crypto/api/v1/api_test.go index 7af59456b2..f3c6f8608b 100644 --- a/crypto/api/v1/api_test.go +++ b/crypto/api/v1/api_test.go @@ -22,16 +22,16 @@ import ( "encoding/json" "errors" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "net/http" "testing" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" - "github.com/nuts-foundation/nuts-node/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto" ) func Test_ErrorStatusCodes(t *testing.T) { diff --git a/crypto/api/v1/generated_test.go b/crypto/api/v1/generated_test.go index c4bd572559..1330d92482 100644 --- a/crypto/api/v1/generated_test.go +++ b/crypto/api/v1/generated_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/labstack/echo/v4" "github.com/magiconair/properties/assert" diff --git a/crypto/cmd/cmd.go b/crypto/cmd/cmd.go index 01825f66f9..17563e9818 100644 --- a/crypto/cmd/cmd.go +++ b/crypto/cmd/cmd.go @@ -22,12 +22,12 @@ import ( "context" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/core" - cryptoEngine "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/storage/external" - "github.com/nuts-foundation/nuts-node/crypto/storage/fs" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/crypto/storage/vault" + "github.com/nuts-foundation/nuts-node/v5/core" + cryptoEngine "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/external" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/fs" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/vault" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/crypto/cmd/cmd_test.go b/crypto/cmd/cmd_test.go index de9ccf8f5c..9421d65f16 100644 --- a/crypto/cmd/cmd_test.go +++ b/crypto/cmd/cmd_test.go @@ -24,9 +24,9 @@ import ( "crypto/ecdsa" "crypto/elliptic" "crypto/rand" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/storage/fs" - testIo "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/fs" + testIo "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "io" diff --git a/crypto/crypto.go b/crypto/crypto.go index d0c6060f8b..78a08a8c51 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -30,13 +30,13 @@ import ( "regexp" "time" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/log" - "github.com/nuts-foundation/nuts-node/crypto/storage/external" - "github.com/nuts-foundation/nuts-node/crypto/storage/fs" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/crypto/storage/vault" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/log" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/external" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/fs" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/vault" ) const ( diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index cf922ecf62..02264b1240 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -22,9 +22,9 @@ import ( "context" "crypto" "errors" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/crypto/storage/fs" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/fs" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/spi" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" "net/http" @@ -34,9 +34,9 @@ import ( "go.uber.org/mock/gomock" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/test/io" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/stretchr/testify/assert" ) diff --git a/crypto/decrypter_test.go b/crypto/decrypter_test.go index d07a18a241..623ffee285 100644 --- a/crypto/decrypter_test.go +++ b/crypto/decrypter_test.go @@ -21,7 +21,7 @@ package crypto import ( "context" "crypto/ecdsa" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "github.com/stretchr/testify/assert" "testing" ) diff --git a/crypto/jwx.go b/crypto/jwx.go index 25c015cf4a..0cc919e38f 100644 --- a/crypto/jwx.go +++ b/crypto/jwx.go @@ -32,9 +32,9 @@ import ( "github.com/lestrrat-go/jwx/jwk" "github.com/lestrrat-go/jwx/jws" "github.com/lestrrat-go/jwx/jwt" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/crypto/log" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/crypto/log" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/spi" "github.com/shengdoushi/base58" ) diff --git a/crypto/jwx_test.go b/crypto/jwx_test.go index da6d7d8128..e13751110f 100644 --- a/crypto/jwx_test.go +++ b/crypto/jwx_test.go @@ -30,7 +30,7 @@ import ( "errors" "fmt" "github.com/lestrrat-go/jwx/jwe" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "github.com/stretchr/testify/require" "testing" "time" @@ -43,7 +43,7 @@ import ( "github.com/lestrrat-go/jwx/jws" "github.com/stretchr/testify/assert" - "github.com/nuts-foundation/nuts-node/crypto/test" + "github.com/nuts-foundation/nuts-node/v5/crypto/test" ) func TestSignJWT(t *testing.T) { diff --git a/crypto/log/logger.go b/crypto/log/logger.go index 8584366b6f..2a112d9921 100644 --- a/crypto/log/logger.go +++ b/crypto/log/logger.go @@ -19,7 +19,7 @@ package log import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" ) diff --git a/crypto/storage/external/client.go b/crypto/storage/external/client.go index 5678bca78f..d8f14842a4 100644 --- a/crypto/storage/external/client.go +++ b/crypto/storage/external/client.go @@ -27,9 +27,9 @@ import ( "net/url" "time" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/crypto/util" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v5/crypto/util" ) // StorageType is the name of this storage type, used in health check reports and configuration. diff --git a/crypto/storage/external/client_test.go b/crypto/storage/external/client_test.go index a51d5090e9..f4e6c9dff9 100644 --- a/crypto/storage/external/client_test.go +++ b/crypto/storage/external/client_test.go @@ -34,9 +34,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/crypto/util" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v5/crypto/util" ) var errResponse = ErrorResponse{ diff --git a/crypto/storage/fs/fs.go b/crypto/storage/fs/fs.go index b9f7c93f08..08e8c1015b 100644 --- a/crypto/storage/fs/fs.go +++ b/crypto/storage/fs/fs.go @@ -23,15 +23,15 @@ import ( "crypto" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/crypto/log" + "github.com/nuts-foundation/nuts-node/v5/crypto/log" "io/fs" "os" "path/filepath" "strings" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/crypto/util" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v5/crypto/util" ) type entryType string diff --git a/crypto/storage/fs/fs_test.go b/crypto/storage/fs/fs_test.go index d71aa3e54c..c4c91fedd8 100644 --- a/crypto/storage/fs/fs_test.go +++ b/crypto/storage/fs/fs_test.go @@ -28,8 +28,8 @@ import ( "syscall" "testing" - "github.com/nuts-foundation/nuts-node/crypto/test" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/crypto/test" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/crypto/storage/spi/interface.go b/crypto/storage/spi/interface.go index 2b597280a7..d9725edf46 100644 --- a/crypto/storage/spi/interface.go +++ b/crypto/storage/spi/interface.go @@ -26,7 +26,7 @@ import ( "fmt" "github.com/lestrrat-go/jwx/jwk" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" ) // ErrNotFound indicates that the specified crypto storage entry couldn't be found. diff --git a/crypto/storage/spi/mock.go b/crypto/storage/spi/mock.go index 12f583abc5..1a65748e84 100644 --- a/crypto/storage/spi/mock.go +++ b/crypto/storage/spi/mock.go @@ -9,7 +9,7 @@ import ( crypto "crypto" reflect "reflect" - core "github.com/nuts-foundation/nuts-node/core" + core "github.com/nuts-foundation/nuts-node/v5/core" gomock "go.uber.org/mock/gomock" ) diff --git a/crypto/storage/spi/wrapper.go b/crypto/storage/spi/wrapper.go index c26182a780..73875994e2 100644 --- a/crypto/storage/spi/wrapper.go +++ b/crypto/storage/spi/wrapper.go @@ -22,7 +22,7 @@ import ( "context" "crypto" "fmt" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "regexp" ) diff --git a/crypto/storage/vault/vault.go b/crypto/storage/vault/vault.go index cfc00397e4..45c01acd0d 100644 --- a/crypto/storage/vault/vault.go +++ b/crypto/storage/vault/vault.go @@ -23,10 +23,10 @@ import ( "crypto" "fmt" vault "github.com/hashicorp/vault/api" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/log" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/crypto/util" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/log" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v5/crypto/util" "path/filepath" "time" ) diff --git a/crypto/storage/vault/vault_test.go b/crypto/storage/vault/vault_test.go index f9b1786f7e..37a82c168a 100644 --- a/crypto/storage/vault/vault_test.go +++ b/crypto/storage/vault/vault_test.go @@ -25,7 +25,7 @@ import ( "crypto/rand" "errors" vault "github.com/hashicorp/vault/api" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "net/http" diff --git a/crypto/test.go b/crypto/test.go index 1e90795677..23c3c4af98 100644 --- a/crypto/test.go +++ b/crypto/test.go @@ -21,8 +21,8 @@ package crypto import ( "context" "crypto" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/spi" log "github.com/sirupsen/logrus" ) diff --git a/crypto/util/pem_test.go b/crypto/util/pem_test.go index 332720a3fe..dd5f1fe948 100644 --- a/crypto/util/pem_test.go +++ b/crypto/util/pem_test.go @@ -26,7 +26,7 @@ import ( "os" "testing" - "github.com/nuts-foundation/nuts-node/crypto/test" + "github.com/nuts-foundation/nuts-node/v5/crypto/test" "github.com/stretchr/testify/assert" ) diff --git a/didman/api/v1/api.go b/didman/api/v1/api.go index d3dcfdf8bf..1de80bb6d8 100644 --- a/didman/api/v1/api.go +++ b/didman/api/v1/api.go @@ -23,18 +23,18 @@ import ( "context" "errors" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "net/http" "net/url" "strings" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/didman" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/didman" + "github.com/nuts-foundation/nuts-node/v5/vdr" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) var _ StrictServerInterface = (*Wrapper)(nil) diff --git a/didman/api/v1/api_test.go b/didman/api/v1/api_test.go index 671005a27f..02dfa79ede 100644 --- a/didman/api/v1/api_test.go +++ b/didman/api/v1/api_test.go @@ -21,18 +21,18 @@ package v1 import ( "errors" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/vdr" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/vdr" "net/http" "net/url" "testing" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/didman" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/didman" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/didman/api/v1/client.go b/didman/api/v1/client.go index 6b2b1cd877..e44b5b670f 100644 --- a/didman/api/v1/client.go +++ b/didman/api/v1/client.go @@ -21,7 +21,7 @@ package v1 import ( "context" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "net/http" ) diff --git a/didman/api/v1/client_test.go b/didman/api/v1/client_test.go index 3520f291a5..7e520f50a3 100644 --- a/didman/api/v1/client_test.go +++ b/didman/api/v1/client_test.go @@ -19,14 +19,14 @@ package v1 import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "net/http" "net/http/httptest" "testing" "time" ssi "github.com/nuts-foundation/go-did" - http2 "github.com/nuts-foundation/nuts-node/test/http" + http2 "github.com/nuts-foundation/nuts-node/v5/test/http" "github.com/stretchr/testify/assert" ) diff --git a/didman/api/v1/types.go b/didman/api/v1/types.go index ce2a41ed74..9eb4d62e14 100644 --- a/didman/api/v1/types.go +++ b/didman/api/v1/types.go @@ -20,7 +20,7 @@ package v1 import ( "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/didman" + "github.com/nuts-foundation/nuts-node/v5/didman" "schneider.vip/problem" ) diff --git a/didman/cmd/cmd.go b/didman/cmd/cmd.go index b5ec61fae1..ca32a5dd0f 100644 --- a/didman/cmd/cmd.go +++ b/didman/cmd/cmd.go @@ -21,8 +21,8 @@ package cmd import ( "encoding/json" "fmt" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/didman/api/v1" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/didman/api/v1" "github.com/spf13/cobra" ) diff --git a/didman/cmd/cmd_test.go b/didman/cmd/cmd_test.go index af57b5d00a..887d0606dc 100644 --- a/didman/cmd/cmd_test.go +++ b/didman/cmd/cmd_test.go @@ -21,9 +21,9 @@ package cmd import ( "encoding/json" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - v1 "github.com/nuts-foundation/nuts-node/didman/api/v1" - http2 "github.com/nuts-foundation/nuts-node/test/http" + "github.com/nuts-foundation/nuts-node/v5/core" + v1 "github.com/nuts-foundation/nuts-node/v5/didman/api/v1" + http2 "github.com/nuts-foundation/nuts-node/v5/test/http" "github.com/stretchr/testify/assert" "net/http" "net/http/httptest" diff --git a/didman/didman.go b/didman/didman.go index 4b6bf18f04..60b3ba141e 100644 --- a/didman/didman.go +++ b/didman/didman.go @@ -31,14 +31,14 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/didman/log" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/didman/log" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/shengdoushi/base58" ) diff --git a/didman/didman_test.go b/didman/didman_test.go index d747bd19c0..ce7734a129 100644 --- a/didman/didman_test.go +++ b/didman/didman_test.go @@ -24,7 +24,7 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "io" "net/url" "strings" @@ -34,14 +34,14 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vdr" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/didman/log/logger.go b/didman/log/logger.go index 2fad043914..b4ccf4057f 100644 --- a/didman/log/logger.go +++ b/didman/log/logger.go @@ -19,7 +19,7 @@ package log import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" ) diff --git a/docs/generate_docs.go b/docs/generate_docs.go index 2ebafe894e..22331c978e 100644 --- a/docs/generate_docs.go +++ b/docs/generate_docs.go @@ -28,8 +28,8 @@ import ( "sort" "strings" - "github.com/nuts-foundation/nuts-node/cmd" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/cmd" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/spf13/pflag" ) diff --git a/e2e-tests/auth/selfsigned/apps/selfsigned.go b/e2e-tests/auth/selfsigned/apps/selfsigned.go index 9b9ba6ea04..bddd02b6f9 100644 --- a/e2e-tests/auth/selfsigned/apps/selfsigned.go +++ b/e2e-tests/auth/selfsigned/apps/selfsigned.go @@ -24,9 +24,9 @@ import ( "context" "fmt" "github.com/chromedp/chromedp" - authAPI "github.com/nuts-foundation/nuts-node/auth/api/auth/v1/client" - "github.com/nuts-foundation/nuts-node/core" - vcrAPI "github.com/nuts-foundation/nuts-node/vcr/api/vcr/v2" + authAPI "github.com/nuts-foundation/nuts-node/v5/auth/api/auth/v1/client" + "github.com/nuts-foundation/nuts-node/v5/core" + vcrAPI "github.com/nuts-foundation/nuts-node/v5/vcr/api/vcr/v2" ) var NodeClientConfig = core.ClientConfig{Address: "http://localhost:1323"} diff --git a/e2e-tests/auth/selfsigned/main_test.go b/e2e-tests/auth/selfsigned/main_test.go index d158d893f3..d60de42e22 100644 --- a/e2e-tests/auth/selfsigned/main_test.go +++ b/e2e-tests/auth/selfsigned/main_test.go @@ -22,11 +22,11 @@ package selfsigned import ( "github.com/nuts-foundation/go-did/did" - didmanAPI "github.com/nuts-foundation/nuts-node/didman/api/v1" - "github.com/nuts-foundation/nuts-node/e2e-tests/auth/selfsigned/apps" - "github.com/nuts-foundation/nuts-node/e2e-tests/auth/selfsigned/browser" - vcrAPI "github.com/nuts-foundation/nuts-node/vcr/api/vcr/v2" - didAPI "github.com/nuts-foundation/nuts-node/vdr/api/v1" + didmanAPI "github.com/nuts-foundation/nuts-node/v5/didman/api/v1" + "github.com/nuts-foundation/nuts-node/v5/e2e-tests/auth/selfsigned/apps" + "github.com/nuts-foundation/nuts-node/v5/e2e-tests/auth/selfsigned/browser" + vcrAPI "github.com/nuts-foundation/nuts-node/v5/vcr/api/vcr/v2" + didAPI "github.com/nuts-foundation/nuts-node/v5/vdr/api/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "os" diff --git a/echo/echo_integration_test.go b/echo/echo_integration_test.go index bd086e3964..1512fad0c5 100644 --- a/echo/echo_integration_test.go +++ b/echo/echo_integration_test.go @@ -26,7 +26,7 @@ import ( "net/http" "testing" - "github.com/nuts-foundation/nuts-node/test/node" + "github.com/nuts-foundation/nuts-node/v5/test/node" logTest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" diff --git a/events/cmd/cmd.go b/events/cmd/cmd.go index 0f4d3fd153..c661a2b81d 100644 --- a/events/cmd/cmd.go +++ b/events/cmd/cmd.go @@ -21,7 +21,7 @@ package cmd import ( "github.com/spf13/pflag" - "github.com/nuts-foundation/nuts-node/events" + "github.com/nuts-foundation/nuts-node/v5/events" ) // ConfEventsPort defines the port for the NATS server diff --git a/events/conn.go b/events/conn.go index b7e7cb2f2c..3b238068ca 100644 --- a/events/conn.go +++ b/events/conn.go @@ -27,7 +27,7 @@ import ( "github.com/nats-io/nats.go" - "github.com/nuts-foundation/nuts-node/events/log" + "github.com/nuts-foundation/nuts-node/v5/events/log" ) // Conn defines the methods required in the NATS connection structure diff --git a/events/event.go b/events/event.go index fb3a836dfe..c7301e05bb 100644 --- a/events/event.go +++ b/events/event.go @@ -25,7 +25,7 @@ import ( natsServer "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" ) const moduleName = "Events" diff --git a/events/integration_test.go b/events/integration_test.go index c88c2c7ef6..a9631dd126 100644 --- a/events/integration_test.go +++ b/events/integration_test.go @@ -28,9 +28,9 @@ import ( "time" "github.com/nats-io/nats.go" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/test" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/stretchr/testify/assert" ) diff --git a/events/log/logger.go b/events/log/logger.go index d3edb3b0cf..c732be7da6 100644 --- a/events/log/logger.go +++ b/events/log/logger.go @@ -19,7 +19,7 @@ package log import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" ) diff --git a/events/test.go b/events/test.go index b76e7be9a9..1c7d1c449e 100644 --- a/events/test.go +++ b/events/test.go @@ -20,11 +20,11 @@ package events import ( - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v5/test" "testing" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/test/io" ) func NewTestManager(t *testing.T) Event { diff --git a/events/types.go b/events/types.go index 1f4554097f..b70d3bd9ef 100644 --- a/events/types.go +++ b/events/types.go @@ -23,7 +23,7 @@ import ( "encoding/base64" "encoding/json" - "github.com/nuts-foundation/nuts-node/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/dag" ) // TransactionWithPayload holds the transaction and byte payload diff --git a/events/types_test.go b/events/types_test.go index 6bcc01adc2..a3f81095f4 100644 --- a/events/types_test.go +++ b/events/types_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "testing" - "github.com/nuts-foundation/nuts-node/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/dag" "github.com/stretchr/testify/assert" ) diff --git a/go.mod b/go.mod index 1d868e7657..e5e6a3f533 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/nuts-foundation/nuts-node +module github.com/nuts-foundation/nuts-node/v5 // This is the minimal version, the actual go version is determined by the images in the Dockerfile // This version is used in automated tests such as the 'Scheduled govulncheck' action diff --git a/golden_hammer/cmd/cmd.go b/golden_hammer/cmd/cmd.go index 60822f87ee..64c8717140 100644 --- a/golden_hammer/cmd/cmd.go +++ b/golden_hammer/cmd/cmd.go @@ -19,7 +19,7 @@ package cmd import ( - "github.com/nuts-foundation/nuts-node/golden_hammer" + "github.com/nuts-foundation/nuts-node/v5/golden_hammer" "github.com/spf13/pflag" ) diff --git a/golden_hammer/log/logger.go b/golden_hammer/log/logger.go index ea721c54df..ecf814d78f 100644 --- a/golden_hammer/log/logger.go +++ b/golden_hammer/log/logger.go @@ -19,7 +19,7 @@ package log import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" ) diff --git a/golden_hammer/module.go b/golden_hammer/module.go index 1476f4dd5c..b1c004777c 100644 --- a/golden_hammer/module.go +++ b/golden_hammer/module.go @@ -22,16 +22,16 @@ import ( "context" "crypto/tls" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/didman" - "github.com/nuts-foundation/nuts-node/golden_hammer/log" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/didman" + "github.com/nuts-foundation/nuts-node/v5/golden_hammer/log" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "net/url" "sort" "strings" diff --git a/golden_hammer/module_test.go b/golden_hammer/module_test.go index 54b6489d2e..8e2f87867f 100644 --- a/golden_hammer/module_test.go +++ b/golden_hammer/module_test.go @@ -23,15 +23,15 @@ import ( "crypto/tls" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/didman" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/test/pki" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/didman" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/test" + "github.com/nuts-foundation/nuts-node/v5/test/pki" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/http/cmd/cmd.go b/http/cmd/cmd.go index 97407622ae..d928259506 100644 --- a/http/cmd/cmd.go +++ b/http/cmd/cmd.go @@ -22,10 +22,10 @@ import ( "crypto" "fmt" "github.com/lestrrat-go/jwx/jwt" - "github.com/nuts-foundation/nuts-node/audit" - cryptoCmd "github.com/nuts-foundation/nuts-node/crypto/cmd" - "github.com/nuts-foundation/nuts-node/http" - "github.com/nuts-foundation/nuts-node/network" + "github.com/nuts-foundation/nuts-node/v5/audit" + cryptoCmd "github.com/nuts-foundation/nuts-node/v5/crypto/cmd" + "github.com/nuts-foundation/nuts-node/v5/http" + "github.com/nuts-foundation/nuts-node/v5/network" "github.com/spf13/cobra" "github.com/spf13/pflag" "strconv" diff --git a/http/cmd/cmd_test.go b/http/cmd/cmd_test.go index c6ee2aa9f6..9f54f24f82 100644 --- a/http/cmd/cmd_test.go +++ b/http/cmd/cmd_test.go @@ -21,8 +21,8 @@ package cmd import ( "bytes" "github.com/lestrrat-go/jwx/jwt" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/stretchr/testify/require" "regexp" "strconv" diff --git a/http/echo.go b/http/echo.go index ac3af5bfa8..a02096db0f 100644 --- a/http/echo.go +++ b/http/echo.go @@ -23,7 +23,7 @@ import ( "errors" "fmt" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" "net/http" "strings" diff --git a/http/engine.go b/http/engine.go index c77bba4831..7abc744043 100644 --- a/http/engine.go +++ b/http/engine.go @@ -35,11 +35,11 @@ import ( "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" "github.com/lestrrat-go/jwx/jwa" - "github.com/nuts-foundation/nuts-node/core" - cryptoEngine "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/http/client" - "github.com/nuts-foundation/nuts-node/http/log" - "github.com/nuts-foundation/nuts-node/http/tokenV2" + "github.com/nuts-foundation/nuts-node/v5/core" + cryptoEngine "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/http/client" + "github.com/nuts-foundation/nuts-node/v5/http/log" + "github.com/nuts-foundation/nuts-node/v5/http/tokenV2" ) // AdminTokenSigningKID returns the KID of the signing key used to sign the admin token. diff --git a/http/engine_test.go b/http/engine_test.go index 73c2f94459..1833227ab9 100644 --- a/http/engine_test.go +++ b/http/engine_test.go @@ -28,7 +28,7 @@ import ( "crypto/tls" b64 "encoding/base64" "fmt" - "github.com/nuts-foundation/nuts-node/test/pki" + "github.com/nuts-foundation/nuts-node/v5/test/pki" "io" "net" "net/http" @@ -42,11 +42,11 @@ import ( "github.com/lestrrat-go/jwx/jwa" "github.com/lestrrat-go/jwx/jwk" "github.com/lestrrat-go/jwx/jwt" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/http/client" - "github.com/nuts-foundation/nuts-node/http/log" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/http/client" + "github.com/nuts-foundation/nuts-node/v5/http/log" + "github.com/nuts-foundation/nuts-node/v5/test" "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/writer" "github.com/stretchr/testify/assert" diff --git a/http/log/logger.go b/http/log/logger.go index 88c9b770b0..d5d561d43d 100644 --- a/http/log/logger.go +++ b/http/log/logger.go @@ -19,7 +19,7 @@ package log import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" ) diff --git a/http/requestlogger.go b/http/requestlogger.go index 67385f565a..fa0ff27ffa 100644 --- a/http/requestlogger.go +++ b/http/requestlogger.go @@ -21,7 +21,7 @@ package http import ( "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" "mime" "net/http" diff --git a/http/requestlogger_test.go b/http/requestlogger_test.go index 579f776726..496136b93d 100644 --- a/http/requestlogger_test.go +++ b/http/requestlogger_test.go @@ -26,8 +26,8 @@ import ( "testing" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/mock" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/mock" "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" diff --git a/http/tokenV2/authorized_keys.go b/http/tokenV2/authorized_keys.go index a3300f2962..206600ff11 100644 --- a/http/tokenV2/authorized_keys.go +++ b/http/tokenV2/authorized_keys.go @@ -29,7 +29,7 @@ import ( "golang.org/x/crypto/ssh" - "github.com/nuts-foundation/nuts-node/http/log" + "github.com/nuts-foundation/nuts-node/v5/http/log" "github.com/lestrrat-go/jwx/jwk" ) diff --git a/http/tokenV2/middleware.go b/http/tokenV2/middleware.go index 307a45500c..b77c7a2b6d 100644 --- a/http/tokenV2/middleware.go +++ b/http/tokenV2/middleware.go @@ -27,9 +27,9 @@ import ( "strings" "time" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/http/log" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/http/log" "github.com/labstack/echo/v4" "github.com/lestrrat-go/jwx/jwa" diff --git a/http/tokenV2/middleware_test.go b/http/tokenV2/middleware_test.go index ba48f4708a..74baf7e8d7 100644 --- a/http/tokenV2/middleware_test.go +++ b/http/tokenV2/middleware_test.go @@ -28,13 +28,13 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "net/http" "net/http/httptest" "testing" "time" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "golang.org/x/crypto/ssh" diff --git a/jsonld/jsonld.go b/jsonld/jsonld.go index 8c2434e3bc..e997689ea1 100644 --- a/jsonld/jsonld.go +++ b/jsonld/jsonld.go @@ -19,8 +19,8 @@ package jsonld import ( - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/jsonld/log" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/jsonld/log" "github.com/piprate/json-gold/ld" ) diff --git a/jsonld/jsonld_test.go b/jsonld/jsonld_test.go index ba6532d215..f0082931a7 100644 --- a/jsonld/jsonld_test.go +++ b/jsonld/jsonld_test.go @@ -19,7 +19,7 @@ package jsonld import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/stretchr/testify/assert" "testing" ) diff --git a/jsonld/ldutils.go b/jsonld/ldutils.go index ce84223c6e..629f13345e 100644 --- a/jsonld/ldutils.go +++ b/jsonld/ldutils.go @@ -24,8 +24,8 @@ import ( "errors" "fmt" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/jsonld/log" - "github.com/nuts-foundation/nuts-node/vcr/assets" + "github.com/nuts-foundation/nuts-node/v5/jsonld/log" + "github.com/nuts-foundation/nuts-node/v5/vcr/assets" "github.com/piprate/json-gold/ld" "io/fs" "net/url" diff --git a/jsonld/log/logger.go b/jsonld/log/logger.go index 0edcf4c375..9c0708dd7d 100644 --- a/jsonld/log/logger.go +++ b/jsonld/log/logger.go @@ -19,7 +19,7 @@ package log import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" ) diff --git a/jsonld/test.go b/jsonld/test.go index 9cfd9384f2..d6db576993 100644 --- a/jsonld/test.go +++ b/jsonld/test.go @@ -23,7 +23,7 @@ import ( "encoding/json" "testing" - "github.com/nuts-foundation/nuts-node/vcr/assets" + "github.com/nuts-foundation/nuts-node/v5/vcr/assets" "github.com/piprate/json-gold/ld" "github.com/nuts-foundation/go-did/vc" diff --git a/jsonld/testsuite/compat_test.go b/jsonld/testsuite/compat_test.go index 06269ceb15..22e34da02c 100644 --- a/jsonld/testsuite/compat_test.go +++ b/jsonld/testsuite/compat_test.go @@ -22,11 +22,11 @@ import ( "crypto/x509" "encoding/json" "encoding/pem" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/signature" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature/proof" "github.com/piprate/json-gold/ld" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/main.go b/main.go index e913009eef..1fd9064fc7 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,7 @@ package main import ( "context" - "github.com/nuts-foundation/nuts-node/cmd" + "github.com/nuts-foundation/nuts-node/v5/cmd" "github.com/sirupsen/logrus" "os" "os/signal" diff --git a/main_test.go b/main_test.go index f008ba805c..980967a171 100644 --- a/main_test.go +++ b/main_test.go @@ -25,16 +25,16 @@ import ( "github.com/knadh/koanf" "github.com/knadh/koanf/parsers/yaml" "github.com/knadh/koanf/providers/structs" - "github.com/nuts-foundation/nuts-node/auth" - "github.com/nuts-foundation/nuts-node/cmd" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/events" - httpEngine "github.com/nuts-foundation/nuts-node/http" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/test/pki" - v1 "github.com/nuts-foundation/nuts-node/vdr/api/v1" + "github.com/nuts-foundation/nuts-node/v5/auth" + "github.com/nuts-foundation/nuts-node/v5/cmd" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/events" + httpEngine "github.com/nuts-foundation/nuts-node/v5/http" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/test" + "github.com/nuts-foundation/nuts-node/v5/test/pki" + v1 "github.com/nuts-foundation/nuts-node/v5/vdr/api/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "io" diff --git a/makefile b/makefile index 89c5eac204..f90c97701d 100644 --- a/makefile +++ b/makefile @@ -96,7 +96,7 @@ GIT_COMMIT ?= "$(shell git rev-list -1 HEAD)" GIT_BRANCH ?= "$(shell git symbolic-ref --short HEAD)" GIT_VERSION ?= "$(shell git name-rev --tags --name-only $(shell git rev-parse HEAD))" build: - go build -ldflags="-w -s -X 'github.com/nuts-foundation/nuts-node/core.GitCommit=${GIT_COMMIT}' -X 'github.com/nuts-foundation/nuts-node/core.GitBranch=${GIT_BRANCH}' -X 'github.com/nuts-foundation/nuts-node/core.GitVersion=${GIT_VERSION}'" -o ${OUTPUT} + go build -ldflags="-w -s -X 'github.com/nuts-foundation/nuts-node/v5/core.GitCommit=${GIT_COMMIT}' -X 'github.com/nuts-foundation/nuts-node/v5/core.GitBranch=${GIT_BRANCH}' -X 'github.com/nuts-foundation/nuts-node/v5/core.GitVersion=${GIT_VERSION}'" -o ${OUTPUT} docker: docker build --build-arg GIT_COMMIT=${GIT_COMMIT} --build-arg GIT_BRANCH=${GIT_BRANCH} --build-arg GIT_VERSION=${GIT_VERSION} -t nutsfoundation/nuts-node:latest . diff --git a/network/api/v1/api.go b/network/api/v1/api.go index 5127066a5a..df616463cc 100644 --- a/network/api/v1/api.go +++ b/network/api/v1/api.go @@ -23,14 +23,14 @@ import ( "context" "errors" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/network/log" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/network/log" "time" - "github.com/nuts-foundation/nuts-node/core" - hash2 "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/network/dag" + "github.com/nuts-foundation/nuts-node/v5/core" + hash2 "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/network/dag" ) var _ StrictServerInterface = (*Wrapper)(nil) diff --git a/network/api/v1/api_test.go b/network/api/v1/api_test.go index 344c35b08d..7b68f2393c 100644 --- a/network/api/v1/api_test.go +++ b/network/api/v1/api_test.go @@ -21,17 +21,17 @@ import ( "context" "errors" "github.com/nuts-foundation/go-did/did" - httpTest "github.com/nuts-foundation/nuts-node/test/http" + httpTest "github.com/nuts-foundation/nuts-node/v5/test/http" "github.com/stretchr/testify/require" "strings" "testing" "time" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/network/dag" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/network/dag" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/network/api/v1/client.go b/network/api/v1/client.go index 66469d2651..65a3911d7f 100644 --- a/network/api/v1/client.go +++ b/network/api/v1/client.go @@ -21,13 +21,13 @@ package v1 import ( "context" "encoding/json" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "io" "net/http" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag" ) // HTTPClient holds the server address and other basic settings for the http client diff --git a/network/api/v1/client_test.go b/network/api/v1/client_test.go index f9a36e9184..22cce05d0b 100644 --- a/network/api/v1/client_test.go +++ b/network/api/v1/client_test.go @@ -20,17 +20,17 @@ package v1 import ( "encoding/json" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/stretchr/testify/require" "net/http" "net/http/httptest" "testing" "time" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag" "github.com/stretchr/testify/assert" ) diff --git a/network/api/v1/types.go b/network/api/v1/types.go index 4fdad1c3be..8f98c81817 100644 --- a/network/api/v1/types.go +++ b/network/api/v1/types.go @@ -20,7 +20,7 @@ package v1 import ( "encoding/json" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "time" ) diff --git a/network/cmd/cmd.go b/network/cmd/cmd.go index dc1e58b74d..dd93f58ad4 100644 --- a/network/cmd/cmd.go +++ b/network/cmd/cmd.go @@ -25,16 +25,16 @@ import ( "strconv" "strings" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/nuts-foundation/nuts-node/core" - hash2 "github.com/nuts-foundation/nuts-node/crypto/hash" - v1 "github.com/nuts-foundation/nuts-node/network/api/v1" - "github.com/nuts-foundation/nuts-node/network/dag" + "github.com/nuts-foundation/nuts-node/v5/core" + hash2 "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + v1 "github.com/nuts-foundation/nuts-node/v5/network/api/v1" + "github.com/nuts-foundation/nuts-node/v5/network/dag" ) // FlagSet contains flags relevant for the VDR instance diff --git a/network/cmd/cmd_test.go b/network/cmd/cmd_test.go index 7b6fcd9331..eb4e0d760d 100644 --- a/network/cmd/cmd_test.go +++ b/network/cmd/cmd_test.go @@ -28,12 +28,12 @@ import ( "testing" "time" - v1 "github.com/nuts-foundation/nuts-node/network/api/v1" + v1 "github.com/nuts-foundation/nuts-node/v5/network/api/v1" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag" - http2 "github.com/nuts-foundation/nuts-node/test/http" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + http2 "github.com/nuts-foundation/nuts-node/v5/test/http" "github.com/stretchr/testify/assert" ) diff --git a/network/config.go b/network/config.go index cd56f3888f..d03c0b2faf 100644 --- a/network/config.go +++ b/network/config.go @@ -19,7 +19,7 @@ package network import ( - v2 "github.com/nuts-foundation/nuts-node/network/transport/v2" + v2 "github.com/nuts-foundation/nuts-node/v5/network/transport/v2" "time" ) diff --git a/network/dag/consistency.go b/network/dag/consistency.go index 4c27d50706..1e571f13e0 100644 --- a/network/dag/consistency.go +++ b/network/dag/consistency.go @@ -21,8 +21,8 @@ package dag import ( "context" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/network/dag/tree" - "github.com/nuts-foundation/nuts-node/network/log" + "github.com/nuts-foundation/nuts-node/v5/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v5/network/log" "sync" "time" ) diff --git a/network/dag/consistency_test.go b/network/dag/consistency_test.go index 4f3a172486..9e30068859 100644 --- a/network/dag/consistency_test.go +++ b/network/dag/consistency_test.go @@ -24,10 +24,10 @@ import ( "github.com/magiconair/properties/assert" "github.com/nuts-foundation/go-stoabs" "github.com/nuts-foundation/go-stoabs/bbolt" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag/tree" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v5/test" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/stretchr/testify/require" "go.uber.org/goleak" "path/filepath" diff --git a/network/dag/dag.go b/network/dag/dag.go index 05ad9e77b5..a61f325317 100644 --- a/network/dag/dag.go +++ b/network/dag/dag.go @@ -26,9 +26,9 @@ import ( "sort" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/log" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/log" ) // metadataShelf is the name of the shelf that holds metadata. diff --git a/network/dag/dag_test.go b/network/dag/dag_test.go index 935f85691c..88469ed23a 100644 --- a/network/dag/dag_test.go +++ b/network/dag/dag_test.go @@ -29,8 +29,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/test/io" ) // trackingVisitor just keeps track of which nodes were visited in what order. diff --git a/network/dag/interface.go b/network/dag/interface.go index 6f70d8c349..baed4ca127 100644 --- a/network/dag/interface.go +++ b/network/dag/interface.go @@ -22,9 +22,9 @@ import ( "context" "errors" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag/tree" "math" ) diff --git a/network/dag/mock.go b/network/dag/mock.go index 5fdfcd2669..8d0d38541e 100644 --- a/network/dag/mock.go +++ b/network/dag/mock.go @@ -9,9 +9,9 @@ import ( reflect "reflect" stoabs "github.com/nuts-foundation/go-stoabs" - core "github.com/nuts-foundation/nuts-node/core" - hash "github.com/nuts-foundation/nuts-node/crypto/hash" - tree "github.com/nuts-foundation/nuts-node/network/dag/tree" + core "github.com/nuts-foundation/nuts-node/v5/core" + hash "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + tree "github.com/nuts-foundation/nuts-node/v5/network/dag/tree" gomock "go.uber.org/mock/gomock" ) diff --git a/network/dag/notifier.go b/network/dag/notifier.go index 789d2cca54..a63e04a81d 100644 --- a/network/dag/notifier.go +++ b/network/dag/notifier.go @@ -23,15 +23,15 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/jsonld" + "github.com/nuts-foundation/nuts-node/v5/jsonld" "strings" "time" "github.com/avast/retry-go/v4" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/log" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/log" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" ) diff --git a/network/dag/notifier_mock.go b/network/dag/notifier_mock.go index 19287da987..0eb8e88aab 100644 --- a/network/dag/notifier_mock.go +++ b/network/dag/notifier_mock.go @@ -8,7 +8,7 @@ import ( reflect "reflect" stoabs "github.com/nuts-foundation/go-stoabs" - hash "github.com/nuts-foundation/nuts-node/crypto/hash" + hash "github.com/nuts-foundation/nuts-node/v5/crypto/hash" gomock "go.uber.org/mock/gomock" ) diff --git a/network/dag/notifier_test.go b/network/dag/notifier_test.go index 146d5d904b..251464042f 100644 --- a/network/dag/notifier_test.go +++ b/network/dag/notifier_test.go @@ -25,11 +25,11 @@ import ( "errors" "github.com/nuts-foundation/go-stoabs" "github.com/nuts-foundation/go-stoabs/bbolt" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/test" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/prometheus/client_golang/prometheus" io_prometheus_client "github.com/prometheus/client_model/go" "github.com/stretchr/testify/assert" diff --git a/network/dag/pal.go b/network/dag/pal.go index 9e24dbaf7b..3ca38f0308 100644 --- a/network/dag/pal.go +++ b/network/dag/pal.go @@ -24,13 +24,13 @@ import ( "crypto/ecdsa" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "strings" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/network/log" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // palHeaderDIDSeparator holds the character(s) that separate DID entries in the PAL header, before being encrypted. diff --git a/network/dag/pal_test.go b/network/dag/pal_test.go index 16f9de9992..368a389456 100644 --- a/network/dag/pal_test.go +++ b/network/dag/pal_test.go @@ -28,8 +28,8 @@ import ( "testing" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/network/dag/parser.go b/network/dag/parser.go index 6935164e5d..ee3b27aa77 100644 --- a/network/dag/parser.go +++ b/network/dag/parser.go @@ -29,7 +29,7 @@ import ( "github.com/lestrrat-go/jwx/jwk" "github.com/lestrrat-go/jwx/jws" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ) // errNonCanonicalJWS is returned when the input is not the unique canonical compact JWS encoding of diff --git a/network/dag/parser_test.go b/network/dag/parser_test.go index cb40340f84..c0fa61e0cf 100644 --- a/network/dag/parser_test.go +++ b/network/dag/parser_test.go @@ -31,7 +31,7 @@ import ( "github.com/lestrrat-go/jwx/jwa" "github.com/lestrrat-go/jwx/jwk" "github.com/lestrrat-go/jwx/jws" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/network/dag/payloadstore.go b/network/dag/payloadstore.go index 1c47c8ec7e..e1d4d83899 100644 --- a/network/dag/payloadstore.go +++ b/network/dag/payloadstore.go @@ -22,8 +22,8 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/log" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/log" ) // payloadsShelf is the name of the shelf that holds the payloads of the transactions. diff --git a/network/dag/payloadstore_test.go b/network/dag/payloadstore_test.go index 2445049707..0900e8e73a 100644 --- a/network/dag/payloadstore_test.go +++ b/network/dag/payloadstore_test.go @@ -29,8 +29,8 @@ import ( "go.uber.org/mock/gomock" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/test/io" ) func TestPayloadStore_ReadWrite(t *testing.T) { diff --git a/network/dag/signing.go b/network/dag/signing.go index 406bc8042a..7ad0c5d805 100644 --- a/network/dag/signing.go +++ b/network/dag/signing.go @@ -27,7 +27,7 @@ import ( "github.com/lestrrat-go/jwx/jwk" "github.com/lestrrat-go/jwx/jws" - "github.com/nuts-foundation/nuts-node/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto" ) const errSigningTransactionFmt = "error while signing transaction: %w" diff --git a/network/dag/signing_test.go b/network/dag/signing_test.go index 1bf8fe5887..862c3644af 100644 --- a/network/dag/signing_test.go +++ b/network/dag/signing_test.go @@ -21,14 +21,14 @@ package dag import ( "crypto/sha1" "encoding/base32" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "github.com/stretchr/testify/require" "testing" "time" - "github.com/nuts-foundation/nuts-node/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto" - hash2 "github.com/nuts-foundation/nuts-node/crypto/hash" + hash2 "github.com/nuts-foundation/nuts-node/v5/crypto/hash" "github.com/stretchr/testify/assert" ) diff --git a/network/dag/state.go b/network/dag/state.go index 0df79b02f6..eed86fa2db 100644 --- a/network/dag/state.go +++ b/network/dag/state.go @@ -24,10 +24,10 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag/tree" - "github.com/nuts-foundation/nuts-node/network/log" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v5/network/log" "github.com/prometheus/client_golang/prometheus" "sync" "sync/atomic" diff --git a/network/dag/state_test.go b/network/dag/state_test.go index a7317470e0..c543f63e90 100644 --- a/network/dag/state_test.go +++ b/network/dag/state_test.go @@ -25,7 +25,7 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v5/test" io_prometheus_client "github.com/prometheus/client_model/go" "github.com/stretchr/testify/require" "go.uber.org/atomic" @@ -38,9 +38,9 @@ import ( "time" "github.com/nuts-foundation/go-stoabs/bbolt" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag/tree" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/stretchr/testify/assert" ) diff --git a/network/dag/test.go b/network/dag/test.go index 787e6adf85..6518c55ef8 100644 --- a/network/dag/test.go +++ b/network/dag/test.go @@ -24,16 +24,16 @@ import ( "encoding/binary" "fmt" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "path" "testing" "time" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/nuts-foundation/go-stoabs/bbolt" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" + nutsCrypto "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ) // CreateTestTransactionWithJWK creates a transaction with the given num as payload hash and signs it with a random EC key. diff --git a/network/dag/transaction.go b/network/dag/transaction.go index 6c0156cc90..bfd39c3706 100644 --- a/network/dag/transaction.go +++ b/network/dag/transaction.go @@ -28,7 +28,7 @@ import ( "github.com/lestrrat-go/jwx/jwa" "github.com/lestrrat-go/jwx/jwk" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ) // Version defines a type for distributed transaction format version. diff --git a/network/dag/transaction_test.go b/network/dag/transaction_test.go index a7471ea616..e537360caf 100644 --- a/network/dag/transaction_test.go +++ b/network/dag/transaction_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - hash2 "github.com/nuts-foundation/nuts-node/crypto/hash" + hash2 "github.com/nuts-foundation/nuts-node/v5/crypto/hash" "github.com/stretchr/testify/assert" ) diff --git a/network/dag/tree/benchmark_test.go b/network/dag/tree/benchmark_test.go index c9b83c9265..1d0a82e237 100644 --- a/network/dag/tree/benchmark_test.go +++ b/network/dag/tree/benchmark_test.go @@ -20,7 +20,7 @@ package tree import ( "fmt" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" "math" "testing" ) diff --git a/network/dag/tree/iblt.go b/network/dag/tree/iblt.go index fde1c40f5c..5ab9b73761 100644 --- a/network/dag/tree/iblt.go +++ b/network/dag/tree/iblt.go @@ -23,7 +23,7 @@ import ( "encoding/binary" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" "github.com/twmb/murmur3" ) diff --git a/network/dag/tree/iblt_test.go b/network/dag/tree/iblt_test.go index 150a7d6079..e3f0014be9 100644 --- a/network/dag/tree/iblt_test.go +++ b/network/dag/tree/iblt_test.go @@ -20,7 +20,7 @@ package tree import ( "crypto/rand" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/network/dag/tree/tree.go b/network/dag/tree/tree.go index 10deb98fd2..3b7d2bae89 100644 --- a/network/dag/tree/tree.go +++ b/network/dag/tree/tree.go @@ -23,7 +23,7 @@ import ( "errors" "sort" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ) // Data is the interface for data held in each node of the Tree diff --git a/network/dag/tree/tree_test.go b/network/dag/tree/tree_test.go index 4b9706ddc7..042bcd1213 100644 --- a/network/dag/tree/tree_test.go +++ b/network/dag/tree/tree_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ) const testLeafSize = uint32(4) diff --git a/network/dag/tree/xor.go b/network/dag/tree/xor.go index c260196cf1..162cd52d6d 100644 --- a/network/dag/tree/xor.go +++ b/network/dag/tree/xor.go @@ -21,7 +21,7 @@ package tree import ( "errors" "fmt" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ) // Xor is an alias of hash.SHA256Hash that implements tree.Data to track transaction xors diff --git a/network/dag/tree/xor_test.go b/network/dag/tree/xor_test.go index 77d13d6711..cc7b558f0e 100644 --- a/network/dag/tree/xor_test.go +++ b/network/dag/tree/xor_test.go @@ -19,7 +19,7 @@ package tree import ( - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/network/dag/treestore.go b/network/dag/treestore.go index 0b0b3a828b..f667c62c60 100644 --- a/network/dag/treestore.go +++ b/network/dag/treestore.go @@ -23,7 +23,7 @@ import ( "sync" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v5/network/dag/tree" ) type treeStore struct { diff --git a/network/dag/treestore_test.go b/network/dag/treestore_test.go index 1ddcc6d2fb..7abcf39371 100644 --- a/network/dag/treestore_test.go +++ b/network/dag/treestore_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/network/dag/tree" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v5/test/io" ) const testLeafSize = 512 diff --git a/network/dag/verifier.go b/network/dag/verifier.go index c368974230..e33fb6917e 100644 --- a/network/dag/verifier.go +++ b/network/dag/verifier.go @@ -26,7 +26,7 @@ import ( "github.com/lestrrat-go/jwx/jwa" "github.com/lestrrat-go/jwx/jws" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // ErrPreviousTransactionMissing indicates one or more of the previous transactions (which the transaction refers to) diff --git a/network/dag/verifier_test.go b/network/dag/verifier_test.go index 3ba628fc33..0cd48e5531 100644 --- a/network/dag/verifier_test.go +++ b/network/dag/verifier_test.go @@ -25,7 +25,7 @@ import ( "crypto/elliptic" "crypto/rand" "errors" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "testing" "time" @@ -33,9 +33,9 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-stoabs" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/vdr/types" + nutsCrypto "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/network/interface.go b/network/interface.go index ee49c23094..be55fe48bc 100644 --- a/network/interface.go +++ b/network/interface.go @@ -21,9 +21,9 @@ package network import ( "context" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/transport" ) // MaxReprocessBufferSize is the maximum number of events for Nats resulting from a Reprocess diff --git a/network/log/logger.go b/network/log/logger.go index 4a721bc547..7e372b80c2 100644 --- a/network/log/logger.go +++ b/network/log/logger.go @@ -19,7 +19,7 @@ package log import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" ) diff --git a/network/mock.go b/network/mock.go index 76eaf13b69..c77e05ca83 100644 --- a/network/mock.go +++ b/network/mock.go @@ -9,9 +9,9 @@ import ( reflect "reflect" did "github.com/nuts-foundation/go-did/did" - hash "github.com/nuts-foundation/nuts-node/crypto/hash" - dag "github.com/nuts-foundation/nuts-node/network/dag" - transport "github.com/nuts-foundation/nuts-node/network/transport" + hash "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + dag "github.com/nuts-foundation/nuts-node/v5/network/dag" + transport "github.com/nuts-foundation/nuts-node/v5/network/transport" gomock "go.uber.org/mock/gomock" ) diff --git a/network/network.go b/network/network.go index 15d807610f..457946e4b2 100644 --- a/network/network.go +++ b/network/network.go @@ -25,7 +25,7 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "net" "strings" "sync/atomic" @@ -33,19 +33,19 @@ import ( "github.com/google/uuid" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/events" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/network/transport/grpc" - "github.com/nuts-foundation/nuts-node/network/transport/v2" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/events" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/log" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport/grpc" + "github.com/nuts-foundation/nuts-node/v5/network/transport/v2" + "github.com/nuts-foundation/nuts-node/v5/pki" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "go.etcd.io/bbolt" ) diff --git a/network/network_integration_test.go b/network/network_integration_test.go index a819858f27..b3d5aff24b 100644 --- a/network/network_integration_test.go +++ b/network/network_integration_test.go @@ -23,7 +23,7 @@ import ( "crypto" "encoding/json" "fmt" - testPKI "github.com/nuts-foundation/nuts-node/test/pki" + testPKI "github.com/nuts-foundation/nuts-node/v5/test/pki" "hash/crc32" "net/url" "path" @@ -35,22 +35,22 @@ import ( "github.com/nats-io/nats.go" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/events" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/network/transport/grpc" - v2 "github.com/nuts-foundation/nuts-node/network/transport/v2" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/test/io" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + nutsCrypto "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/events" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/log" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport/grpc" + v2 "github.com/nuts-foundation/nuts-node/v5/network/transport/v2" + "github.com/nuts-foundation/nuts-node/v5/pki" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/test" + "github.com/nuts-foundation/nuts-node/v5/test/io" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" grpcLib "google.golang.org/grpc" diff --git a/network/network_test.go b/network/network_test.go index 9612301edc..a5c2a18601 100644 --- a/network/network_test.go +++ b/network/network_test.go @@ -27,9 +27,9 @@ import ( "crypto/x509" "errors" "fmt" - testPKI "github.com/nuts-foundation/nuts-node/test/pki" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + testPKI "github.com/nuts-foundation/nuts-node/v5/test/pki" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "math" "net/http" "net/http/httptest" @@ -42,18 +42,18 @@ import ( "github.com/nats-io/nats.go" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/events" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test/io" - vdrTypes "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v5/events" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/pki" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/test/io" + vdrTypes "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/network/subscriber.go b/network/subscriber.go index 277d2c6780..aeed3ae4d4 100644 --- a/network/subscriber.go +++ b/network/subscriber.go @@ -20,8 +20,8 @@ package network import ( - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/storage" ) // WithPersistency creates the SubscriberOption that creates the NotifierOption for persistency with the correct DAG KVStore diff --git a/network/test.go b/network/test.go index 1e2fcc0ed8..81eb67ed49 100644 --- a/network/test.go +++ b/network/test.go @@ -21,13 +21,13 @@ package network import ( "testing" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/events" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test/io" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/events" + "github.com/nuts-foundation/nuts-node/v5/pki" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/test/io" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "github.com/sirupsen/logrus" "go.uber.org/mock/gomock" ) diff --git a/network/transport/connection_manager.go b/network/transport/connection_manager.go index f852f7cecc..04ad39c216 100644 --- a/network/transport/connection_manager.go +++ b/network/transport/connection_manager.go @@ -20,7 +20,7 @@ package transport import ( "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "time" ) diff --git a/network/transport/connection_manager_mock.go b/network/transport/connection_manager_mock.go index 37e1631986..924e64d523 100644 --- a/network/transport/connection_manager_mock.go +++ b/network/transport/connection_manager_mock.go @@ -9,7 +9,7 @@ import ( time "time" did "github.com/nuts-foundation/go-did/did" - core "github.com/nuts-foundation/nuts-node/core" + core "github.com/nuts-foundation/nuts-node/v5/core" gomock "go.uber.org/mock/gomock" ) diff --git a/network/transport/grpc/addressbook.go b/network/transport/grpc/addressbook.go index 0470209e64..6eef0c3a2e 100644 --- a/network/transport/grpc/addressbook.go +++ b/network/transport/grpc/addressbook.go @@ -25,7 +25,7 @@ import ( "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" ) // AddressBook provides an API for protocols to query the ConnectionManager's known addresses. diff --git a/network/transport/grpc/addressbook_test.go b/network/transport/grpc/addressbook_test.go index 5bc7dd6ac5..0090c02063 100644 --- a/network/transport/grpc/addressbook_test.go +++ b/network/transport/grpc/addressbook_test.go @@ -20,8 +20,8 @@ package grpc import ( "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/network/transport/grpc/authenticator.go b/network/transport/grpc/authenticator.go index 7eac0c3013..13b93542b1 100644 --- a/network/transport/grpc/authenticator.go +++ b/network/transport/grpc/authenticator.go @@ -22,11 +22,11 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/network/log" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "net/url" "strings" ) diff --git a/network/transport/grpc/authenticator_mock.go b/network/transport/grpc/authenticator_mock.go index f148eb12ed..2f6c95108d 100644 --- a/network/transport/grpc/authenticator_mock.go +++ b/network/transport/grpc/authenticator_mock.go @@ -8,7 +8,7 @@ import ( reflect "reflect" did "github.com/nuts-foundation/go-did/did" - transport "github.com/nuts-foundation/nuts-node/network/transport" + transport "github.com/nuts-foundation/nuts-node/v5/network/transport" gomock "go.uber.org/mock/gomock" ) diff --git a/network/transport/grpc/authenticator_test.go b/network/transport/grpc/authenticator_test.go index 0ae5b306cb..546d374978 100644 --- a/network/transport/grpc/authenticator_test.go +++ b/network/transport/grpc/authenticator_test.go @@ -26,8 +26,8 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/network/transport/grpc/backoff.go b/network/transport/grpc/backoff.go index 3ee3c25058..afd0332b22 100644 --- a/network/transport/grpc/backoff.go +++ b/network/transport/grpc/backoff.go @@ -24,7 +24,7 @@ import ( "encoding/gob" "errors" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/network/log" + "github.com/nuts-foundation/nuts-node/v5/network/log" "math/rand" "sync" "time" diff --git a/network/transport/grpc/backoff_test.go b/network/transport/grpc/backoff_test.go index defb5bbe34..0148026e3e 100644 --- a/network/transport/grpc/backoff_test.go +++ b/network/transport/grpc/backoff_test.go @@ -21,7 +21,7 @@ package grpc import ( "context" "github.com/nuts-foundation/go-stoabs/bbolt" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/test/io" "path" "sync" "testing" diff --git a/network/transport/grpc/config.go b/network/transport/grpc/config.go index 57ac0cb510..9640fa8d84 100644 --- a/network/transport/grpc/config.go +++ b/network/transport/grpc/config.go @@ -22,9 +22,9 @@ import ( "crypto/tls" "crypto/x509" "errors" - "github.com/nuts-foundation/nuts-node/core" - networkTypes "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/pki" + "github.com/nuts-foundation/nuts-node/v5/core" + networkTypes "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/pki" "google.golang.org/grpc" "net" "time" diff --git a/network/transport/grpc/config_test.go b/network/transport/grpc/config_test.go index 1afb50f3dc..bac5fc4762 100644 --- a/network/transport/grpc/config_test.go +++ b/network/transport/grpc/config_test.go @@ -20,10 +20,10 @@ package grpc import ( "crypto/x509" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/pki" - testPKI "github.com/nuts-foundation/nuts-node/test/pki" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/pki" + testPKI "github.com/nuts-foundation/nuts-node/v5/test/pki" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/network/transport/grpc/connection.go b/network/transport/grpc/connection.go index 8f938f5a5b..92589122a8 100644 --- a/network/transport/grpc/connection.go +++ b/network/transport/grpc/connection.go @@ -23,13 +23,13 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "io" "sync" "sync/atomic" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/log" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/network/transport/grpc/connection_list.go b/network/transport/grpc/connection_list.go index f037c3bc21..57464e6023 100644 --- a/network/transport/grpc/connection_list.go +++ b/network/transport/grpc/connection_list.go @@ -23,8 +23,8 @@ import ( "errors" "sync" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/network/transport" ) // ErrNoConnection can be used when no connection is available but one is required. diff --git a/network/transport/grpc/connection_list_test.go b/network/transport/grpc/connection_list_test.go index cb4a7d1b45..248aa60931 100644 --- a/network/transport/grpc/connection_list_test.go +++ b/network/transport/grpc/connection_list_test.go @@ -21,7 +21,7 @@ package grpc import ( "context" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "github.com/stretchr/testify/assert" "testing" ) diff --git a/network/transport/grpc/connection_manager.go b/network/transport/grpc/connection_manager.go index 12371dd029..fb35398d5a 100644 --- a/network/transport/grpc/connection_manager.go +++ b/network/transport/grpc/connection_manager.go @@ -30,9 +30,9 @@ import ( "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/network/log" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/network/transport/grpc/connection_manager_test.go b/network/transport/grpc/connection_manager_test.go index 0eb393f838..3ebf89a7ee 100644 --- a/network/transport/grpc/connection_manager_test.go +++ b/network/transport/grpc/connection_manager_test.go @@ -24,8 +24,8 @@ import ( "crypto/x509" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/core" - testPKI "github.com/nuts-foundation/nuts-node/test/pki" + "github.com/nuts-foundation/nuts-node/v5/core" + testPKI "github.com/nuts-foundation/nuts-node/v5/test/pki" "go.uber.org/goleak" "google.golang.org/grpc/credentials" "hash/crc32" @@ -39,11 +39,11 @@ import ( "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test" - io2 "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/pki" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/test" + io2 "github.com/nuts-foundation/nuts-node/v5/test/io" "go.uber.org/mock/gomock" io_prometheus_client "github.com/prometheus/client_model/go" diff --git a/network/transport/grpc/connection_mock.go b/network/transport/grpc/connection_mock.go index 777b61afdd..3d2e22b433 100644 --- a/network/transport/grpc/connection_mock.go +++ b/network/transport/grpc/connection_mock.go @@ -7,7 +7,7 @@ package grpc import ( reflect "reflect" - transport "github.com/nuts-foundation/nuts-node/network/transport" + transport "github.com/nuts-foundation/nuts-node/v5/network/transport" gomock "go.uber.org/mock/gomock" status "google.golang.org/grpc/status" ) diff --git a/network/transport/grpc/connection_test.go b/network/transport/grpc/connection_test.go index 1ca7652176..b260527a5f 100644 --- a/network/transport/grpc/connection_test.go +++ b/network/transport/grpc/connection_test.go @@ -20,7 +20,7 @@ package grpc import ( "context" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v5/test" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" "sync" @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "github.com/stretchr/testify/assert" ) diff --git a/network/transport/grpc/interface.go b/network/transport/grpc/interface.go index 960c725726..732ad02e0f 100644 --- a/network/transport/grpc/interface.go +++ b/network/transport/grpc/interface.go @@ -20,7 +20,7 @@ package grpc import ( "context" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "google.golang.org/grpc" ) diff --git a/network/transport/grpc/interface_mock.go b/network/transport/grpc/interface_mock.go index e039807319..af189309e3 100644 --- a/network/transport/grpc/interface_mock.go +++ b/network/transport/grpc/interface_mock.go @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - core "github.com/nuts-foundation/nuts-node/core" - transport "github.com/nuts-foundation/nuts-node/network/transport" + core "github.com/nuts-foundation/nuts-node/v5/core" + transport "github.com/nuts-foundation/nuts-node/v5/network/transport" gomock "go.uber.org/mock/gomock" grpc "google.golang.org/grpc" metadata "google.golang.org/grpc/metadata" diff --git a/network/transport/grpc/predicate.go b/network/transport/grpc/predicate.go index 020341e56e..bd4375c2e5 100644 --- a/network/transport/grpc/predicate.go +++ b/network/transport/grpc/predicate.go @@ -20,7 +20,7 @@ package grpc import ( "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" ) // Predicate matches the connection based on a condition diff --git a/network/transport/grpc/stats.go b/network/transport/grpc/stats.go index 771be6e35a..fc6d4d2060 100644 --- a/network/transport/grpc/stats.go +++ b/network/transport/grpc/stats.go @@ -21,7 +21,7 @@ package grpc import ( "context" "fmt" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "github.com/prometheus/client_golang/prometheus" "sort" "strings" diff --git a/network/transport/grpc/stats_test.go b/network/transport/grpc/stats_test.go index b98e059c4c..e160e54eb7 100644 --- a/network/transport/grpc/stats_test.go +++ b/network/transport/grpc/stats_test.go @@ -21,7 +21,7 @@ package grpc import ( "errors" "github.com/magiconair/properties/assert" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "github.com/prometheus/client_golang/prometheus" io_prometheus_client "github.com/prometheus/client_model/go" "go.uber.org/mock/gomock" diff --git a/network/transport/grpc/test.go b/network/transport/grpc/test.go index 8fb624747c..3e007cbadf 100644 --- a/network/transport/grpc/test.go +++ b/network/transport/grpc/test.go @@ -21,7 +21,7 @@ package grpc import ( "crypto/x509" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "google.golang.org/grpc/status" "testing" ) diff --git a/network/transport/grpc/testprotocol.proto b/network/transport/grpc/testprotocol.proto index a9e718be39..b275a7f51c 100644 --- a/network/transport/grpc/testprotocol.proto +++ b/network/transport/grpc/testprotocol.proto @@ -17,7 +17,7 @@ */ syntax = "proto3"; -option go_package = "github.com/nuts-foundation/nuts-node/network/transport/grpc"; +option go_package = "github.com/nuts-foundation/nuts-node/v5/network/transport/grpc"; package grpc; diff --git a/network/transport/grpc/testprotocol_impl.pb.go b/network/transport/grpc/testprotocol_impl.pb.go index 717d7a916d..af9d63e910 100644 --- a/network/transport/grpc/testprotocol_impl.pb.go +++ b/network/transport/grpc/testprotocol_impl.pb.go @@ -21,8 +21,8 @@ package grpc import ( "context" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "google.golang.org/grpc" ) diff --git a/network/transport/grpc/tls_offloading.go b/network/transport/grpc/tls_offloading.go index 89223b87c1..6dfba89fdb 100644 --- a/network/transport/grpc/tls_offloading.go +++ b/network/transport/grpc/tls_offloading.go @@ -28,9 +28,9 @@ import ( "net/url" "strings" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/pki" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/network/log" + "github.com/nuts-foundation/nuts-node/v5/pki" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" diff --git a/network/transport/grpc/tls_offloading_test.go b/network/transport/grpc/tls_offloading_test.go index 810373f59e..5dc0b0fc95 100644 --- a/network/transport/grpc/tls_offloading_test.go +++ b/network/transport/grpc/tls_offloading_test.go @@ -21,7 +21,7 @@ package grpc import ( "context" "errors" - "github.com/nuts-foundation/nuts-node/pki" + "github.com/nuts-foundation/nuts-node/v5/pki" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" "google.golang.org/grpc" diff --git a/network/transport/grpc/util.go b/network/transport/grpc/util.go index 0b709fefb6..0a3f8d4e56 100644 --- a/network/transport/grpc/util.go +++ b/network/transport/grpc/util.go @@ -22,7 +22,7 @@ import ( "context" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "google.golang.org/grpc" "google.golang.org/grpc/metadata" "strings" diff --git a/network/transport/protocol.go b/network/transport/protocol.go index 5e972e0747..877ee9f946 100644 --- a/network/transport/protocol.go +++ b/network/transport/protocol.go @@ -19,7 +19,7 @@ package transport import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" ) // Protocol is a self-contained process that can exchange network data (e.g. DAG transactions or private credentials) with other parties on the network. diff --git a/network/transport/protocol_mock.go b/network/transport/protocol_mock.go index 6be3b80aa3..7dab74cb44 100644 --- a/network/transport/protocol_mock.go +++ b/network/transport/protocol_mock.go @@ -7,7 +7,7 @@ package transport import ( reflect "reflect" - core "github.com/nuts-foundation/nuts-node/core" + core "github.com/nuts-foundation/nuts-node/v5/core" gomock "go.uber.org/mock/gomock" ) diff --git a/network/transport/types.go b/network/transport/types.go index 69ae9a28fc..86219e9a43 100644 --- a/network/transport/types.go +++ b/network/transport/types.go @@ -31,7 +31,7 @@ import ( "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" ) diff --git a/network/transport/types_test.go b/network/transport/types_test.go index 72eaec7fe4..b7cf784788 100644 --- a/network/transport/types_test.go +++ b/network/transport/types_test.go @@ -20,7 +20,7 @@ package transport import ( "errors" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "testing" "github.com/nuts-foundation/go-did/did" diff --git a/network/transport/v2/conversation.go b/network/transport/v2/conversation.go index 583c9a5086..2778071c32 100644 --- a/network/transport/v2/conversation.go +++ b/network/transport/v2/conversation.go @@ -27,9 +27,9 @@ import ( "time" "github.com/google/uuid" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/transport" ) var maxValidity = 30 * time.Second diff --git a/network/transport/v2/conversation_test.go b/network/transport/v2/conversation_test.go index 47a7837522..deb636f5ab 100644 --- a/network/transport/v2/conversation_test.go +++ b/network/transport/v2/conversation_test.go @@ -21,13 +21,13 @@ package v2 import ( "context" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "testing" "time" "github.com/google/uuid" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/test" "github.com/stretchr/testify/assert" ) diff --git a/network/transport/v2/gossip/manager.go b/network/transport/v2/gossip/manager.go index ff322a935c..8ab5f94ad8 100644 --- a/network/transport/v2/gossip/manager.go +++ b/network/transport/v2/gossip/manager.go @@ -21,13 +21,13 @@ package gossip import ( "context" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "sync" "time" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/log" + "github.com/nuts-foundation/nuts-node/v5/network/transport" ) const maxQueueSize = 100 diff --git a/network/transport/v2/gossip/manager_test.go b/network/transport/v2/gossip/manager_test.go index d92d8a56a9..1fa95159ff 100644 --- a/network/transport/v2/gossip/manager_test.go +++ b/network/transport/v2/gossip/manager_test.go @@ -28,8 +28,8 @@ import ( "go.uber.org/goleak" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "github.com/stretchr/testify/assert" ) diff --git a/network/transport/v2/gossip/mock.go b/network/transport/v2/gossip/mock.go index f3950c05ba..e0fe73e3d7 100644 --- a/network/transport/v2/gossip/mock.go +++ b/network/transport/v2/gossip/mock.go @@ -7,8 +7,8 @@ package gossip import ( reflect "reflect" - hash "github.com/nuts-foundation/nuts-node/crypto/hash" - transport "github.com/nuts-foundation/nuts-node/network/transport" + hash "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + transport "github.com/nuts-foundation/nuts-node/v5/network/transport" gomock "go.uber.org/mock/gomock" ) diff --git a/network/transport/v2/gossip/queue.go b/network/transport/v2/gossip/queue.go index 26ad93984e..ec7e156d63 100644 --- a/network/transport/v2/gossip/queue.go +++ b/network/transport/v2/gossip/queue.go @@ -23,7 +23,7 @@ import ( "context" "sync" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ) // peerQueue contains a log of received transaction references and a queue of references to send for a specific peer. diff --git a/network/transport/v2/gossip/queue_test.go b/network/transport/v2/gossip/queue_test.go index e4284c2997..e68bca64b7 100644 --- a/network/transport/v2/gossip/queue_test.go +++ b/network/transport/v2/gossip/queue_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/test" "github.com/stretchr/testify/assert" "go.uber.org/atomic" ) diff --git a/network/transport/v2/gossip/set.go b/network/transport/v2/gossip/set.go index 23b156e469..1a02575581 100644 --- a/network/transport/v2/gossip/set.go +++ b/network/transport/v2/gossip/set.go @@ -22,7 +22,7 @@ package gossip import ( "container/list" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ) // uniqueList represents an ordered list where each element is unique diff --git a/network/transport/v2/gossip/set_test.go b/network/transport/v2/gossip/set_test.go index f16d01b460..33f02538ad 100644 --- a/network/transport/v2/gossip/set_test.go +++ b/network/transport/v2/gossip/set_test.go @@ -22,7 +22,7 @@ package gossip import ( "testing" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" "github.com/stretchr/testify/assert" ) diff --git a/network/transport/v2/handlers.go b/network/transport/v2/handlers.go index 1e9062aae4..ad32d9bd29 100644 --- a/network/transport/v2/handlers.go +++ b/network/transport/v2/handlers.go @@ -22,14 +22,14 @@ import ( "context" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/network/transport/grpc" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/network/transport/grpc" "sort" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/network/dag/tree" - "github.com/nuts-foundation/nuts-node/network/log" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v5/network/log" ) // errInternalError is returned to the node's peer when an internal error occurs. diff --git a/network/transport/v2/handlers_test.go b/network/transport/v2/handlers_test.go index 10a19a2f4f..12895c656c 100644 --- a/network/transport/v2/handlers_test.go +++ b/network/transport/v2/handlers_test.go @@ -25,16 +25,16 @@ import ( "strings" "testing" - "github.com/nuts-foundation/nuts-node/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v5/network/dag/tree" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/network/transport/grpc" + "github.com/nuts-foundation/nuts-node/v5/network/transport/grpc" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/transport" ) var ( diff --git a/network/transport/v2/peer_diagnostics.go b/network/transport/v2/peer_diagnostics.go index 28415c7081..d254de6d28 100644 --- a/network/transport/v2/peer_diagnostics.go +++ b/network/transport/v2/peer_diagnostics.go @@ -20,7 +20,7 @@ package v2 import ( "context" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "sync" "time" ) diff --git a/network/transport/v2/peer_diagnostics_test.go b/network/transport/v2/peer_diagnostics_test.go index 60b8c14be4..ef50744e87 100644 --- a/network/transport/v2/peer_diagnostics_test.go +++ b/network/transport/v2/peer_diagnostics_test.go @@ -20,8 +20,8 @@ package v2 import ( "context" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "sync" diff --git a/network/transport/v2/protocol.go b/network/transport/v2/protocol.go index d702cf9f3b..31d7b5c6bb 100644 --- a/network/transport/v2/protocol.go +++ b/network/transport/v2/protocol.go @@ -28,17 +28,17 @@ import ( "sync" "time" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/network/transport/v2/gossip" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/log" + "github.com/nuts-foundation/nuts-node/v5/network/transport/v2/gossip" grpcLib "google.golang.org/grpc" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/network/transport/grpc" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport/grpc" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) var _ grpc.Protocol = (*protocol)(nil) diff --git a/network/transport/v2/protocol.proto b/network/transport/v2/protocol.proto index 35edd5e438..4da54b4144 100644 --- a/network/transport/v2/protocol.proto +++ b/network/transport/v2/protocol.proto @@ -17,7 +17,7 @@ */ syntax = "proto3"; -option go_package = "github.com/nuts-foundation/nuts-node/network/transport/v2"; +option go_package = "github.com/nuts-foundation/nuts-node/v5/network/transport/v2"; package v2; diff --git a/network/transport/v2/protocol_integration_test.go b/network/transport/v2/protocol_integration_test.go index ac2f2f2328..bca4b99758 100644 --- a/network/transport/v2/protocol_integration_test.go +++ b/network/transport/v2/protocol_integration_test.go @@ -29,17 +29,17 @@ import ( "time" "github.com/nuts-foundation/go-did/did" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/network/transport/grpc" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/test/io" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + nutsCrypto "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/log" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport/grpc" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/test" + "github.com/nuts-foundation/nuts-node/v5/test/io" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/network/transport/v2/protocol_test.go b/network/transport/v2/protocol_test.go index 5705654348..233cc6f700 100644 --- a/network/transport/v2/protocol_test.go +++ b/network/transport/v2/protocol_test.go @@ -31,19 +31,19 @@ import ( "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/network/transport/v2/gossip" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/network/transport/v2/gossip" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" grpcLib "google.golang.org/grpc" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/network/transport/grpc" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport/grpc" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) type protocolMocks struct { diff --git a/network/transport/v2/senders.go b/network/transport/v2/senders.go index 4509dc48ef..3d3eca89c5 100644 --- a/network/transport/v2/senders.go +++ b/network/transport/v2/senders.go @@ -20,12 +20,12 @@ package v2 import ( - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag/tree" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/network/transport/grpc" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v5/network/log" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport/grpc" ) const transactionListMessageOverhead = 512 diff --git a/network/transport/v2/senders_mock.go b/network/transport/v2/senders_mock.go index 7d64b02a79..dde2c9202c 100644 --- a/network/transport/v2/senders_mock.go +++ b/network/transport/v2/senders_mock.go @@ -7,10 +7,10 @@ package v2 import ( reflect "reflect" - hash "github.com/nuts-foundation/nuts-node/crypto/hash" - tree "github.com/nuts-foundation/nuts-node/network/dag/tree" - transport "github.com/nuts-foundation/nuts-node/network/transport" - grpc "github.com/nuts-foundation/nuts-node/network/transport/grpc" + hash "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + tree "github.com/nuts-foundation/nuts-node/v5/network/dag/tree" + transport "github.com/nuts-foundation/nuts-node/v5/network/transport" + grpc "github.com/nuts-foundation/nuts-node/v5/network/transport/grpc" gomock "go.uber.org/mock/gomock" ) diff --git a/network/transport/v2/senders_test.go b/network/transport/v2/senders_test.go index 8739d667e6..5982bea2b8 100644 --- a/network/transport/v2/senders_test.go +++ b/network/transport/v2/senders_test.go @@ -31,11 +31,11 @@ import ( "go.uber.org/mock/gomock" "google.golang.org/protobuf/proto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/network/dag/tree" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/network/transport/grpc" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport/grpc" ) func TestProtocol_sendGossip(t *testing.T) { diff --git a/network/transport/v2/transactionlist_handler.go b/network/transport/v2/transactionlist_handler.go index ba4768c1c9..678420914f 100644 --- a/network/transport/v2/transactionlist_handler.go +++ b/network/transport/v2/transactionlist_handler.go @@ -23,10 +23,10 @@ import ( "context" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/network/transport/grpc" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/log" + "github.com/nuts-foundation/nuts-node/v5/network/transport/grpc" ) // connectionEnvelope is a structure to communicate both the message and the peer over a channel diff --git a/network/transport/v2/transactionlist_handler_test.go b/network/transport/v2/transactionlist_handler_test.go index 65326953bb..fb52d04fe5 100644 --- a/network/transport/v2/transactionlist_handler_test.go +++ b/network/transport/v2/transactionlist_handler_test.go @@ -23,15 +23,15 @@ import ( "context" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/network/transport/grpc" + "github.com/nuts-foundation/nuts-node/v5/network/transport/grpc" "sync/atomic" "testing" "time" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/test" "github.com/stretchr/testify/assert" "go.uber.org/goleak" ) diff --git a/network/tx.go b/network/tx.go index cefa916bec..b712070756 100644 --- a/network/tx.go +++ b/network/tx.go @@ -22,9 +22,9 @@ import ( "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network/dag" ) // TransactionTemplate creates a new Template with the given required properties. diff --git a/pki/interface.go b/pki/interface.go index 95fd2c026b..83644be892 100644 --- a/pki/interface.go +++ b/pki/interface.go @@ -22,7 +22,7 @@ import ( "crypto/tls" "crypto/x509" "errors" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "time" ) diff --git a/pki/logger.go b/pki/logger.go index ed49e47999..3c6034d790 100644 --- a/pki/logger.go +++ b/pki/logger.go @@ -19,7 +19,7 @@ package pki import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" ) diff --git a/pki/mock.go b/pki/mock.go index a59e3cbe52..93d21f602a 100644 --- a/pki/mock.go +++ b/pki/mock.go @@ -10,7 +10,7 @@ import ( reflect "reflect" time "time" - core "github.com/nuts-foundation/nuts-node/core" + core "github.com/nuts-foundation/nuts-node/v5/core" gomock "go.uber.org/mock/gomock" ) diff --git a/pki/pki.go b/pki/pki.go index f158a650ab..54d72c2984 100644 --- a/pki/pki.go +++ b/pki/pki.go @@ -22,7 +22,7 @@ import ( "context" "crypto/tls" "fmt" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "time" ) diff --git a/pki/pki_test.go b/pki/pki_test.go index 5722015d4c..41ab5ced64 100644 --- a/pki/pki_test.go +++ b/pki/pki_test.go @@ -20,7 +20,7 @@ package pki import ( "context" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/pki/validator_test.go b/pki/validator_test.go index 8115e426d2..688f0bea90 100644 --- a/pki/validator_test.go +++ b/pki/validator_test.go @@ -27,7 +27,7 @@ import ( "crypto/x509" "encoding/pem" "errors" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "go.uber.org/goleak" "go.uber.org/mock/gomock" "math/big" diff --git a/storage/bbolt.go b/storage/bbolt.go index 258659d15b..eda952c771 100644 --- a/storage/bbolt.go +++ b/storage/bbolt.go @@ -29,8 +29,8 @@ import ( "github.com/nuts-foundation/go-stoabs" "github.com/nuts-foundation/go-stoabs/bbolt" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/storage/log" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/storage/log" bboltLib "go.etcd.io/bbolt" ) diff --git a/storage/bbolt_test.go b/storage/bbolt_test.go index 5328ce2f6d..851e8393fd 100644 --- a/storage/bbolt_test.go +++ b/storage/bbolt_test.go @@ -28,8 +28,8 @@ import ( "github.com/nuts-foundation/go-stoabs" "github.com/nuts-foundation/go-stoabs/bbolt" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/test" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/storage/cmd/cmd.go b/storage/cmd/cmd.go index 4e6740aece..361aa58fbe 100644 --- a/storage/cmd/cmd.go +++ b/storage/cmd/cmd.go @@ -19,7 +19,7 @@ package cmd import ( - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v5/storage" "github.com/spf13/pflag" ) diff --git a/storage/engine.go b/storage/engine.go index e42f5f7692..17353a8ef3 100644 --- a/storage/engine.go +++ b/storage/engine.go @@ -27,8 +27,8 @@ import ( "github.com/nuts-foundation/go-leia/v4" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/storage/log" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/storage/log" "github.com/piprate/json-gold/ld" "github.com/redis/go-redis/v9" ) diff --git a/storage/engine_test.go b/storage/engine_test.go index dc1308166e..40d83201c3 100644 --- a/storage/engine_test.go +++ b/storage/engine_test.go @@ -24,8 +24,8 @@ import ( leia "github.com/nuts-foundation/go-leia/v4" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" diff --git a/storage/interface.go b/storage/interface.go index b98a38a9d1..26a2179119 100644 --- a/storage/interface.go +++ b/storage/interface.go @@ -22,7 +22,7 @@ import ( "time" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" ) const lockAcquireTimeout = time.Second diff --git a/storage/leia.go b/storage/leia.go index 5ef26da06f..2c4fe10ec5 100644 --- a/storage/leia.go +++ b/storage/leia.go @@ -24,8 +24,8 @@ import ( "fmt" "github.com/nuts-foundation/go-leia/v4" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/storage/log" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/storage/log" ) // KVBackedLeiaStore is a wrapper interface for a leia.Store that uses a stoabs.KVStore as backup for any documents added. diff --git a/storage/leia_test.go b/storage/leia_test.go index e331ee4486..fe8668e51a 100644 --- a/storage/leia_test.go +++ b/storage/leia_test.go @@ -27,8 +27,8 @@ import ( "github.com/nuts-foundation/go-leia/v4" "github.com/nuts-foundation/go-stoabs" "github.com/nuts-foundation/go-stoabs/bbolt" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/storage/log/logger.go b/storage/log/logger.go index 783ce3aa83..449ee98cb4 100644 --- a/storage/log/logger.go +++ b/storage/log/logger.go @@ -19,7 +19,7 @@ package log import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" ) diff --git a/storage/mock.go b/storage/mock.go index 3f2c3e2d2e..8c6ca964b2 100644 --- a/storage/mock.go +++ b/storage/mock.go @@ -8,7 +8,7 @@ import ( reflect "reflect" stoabs "github.com/nuts-foundation/go-stoabs" - core "github.com/nuts-foundation/nuts-node/core" + core "github.com/nuts-foundation/nuts-node/v5/core" gomock "go.uber.org/mock/gomock" ) diff --git a/storage/redis.go b/storage/redis.go index 21dd1423f9..c820e6b09f 100644 --- a/storage/redis.go +++ b/storage/redis.go @@ -25,8 +25,8 @@ import ( "fmt" "github.com/nuts-foundation/go-stoabs" "github.com/nuts-foundation/go-stoabs/redis7" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/storage/log" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/storage/log" "github.com/redis/go-redis/v9" "github.com/sirupsen/logrus" "path" diff --git a/storage/test.go b/storage/test.go index e37b657022..4e406f8cf7 100644 --- a/storage/test.go +++ b/storage/test.go @@ -25,7 +25,7 @@ import ( "github.com/nuts-foundation/go-stoabs" "github.com/nuts-foundation/go-stoabs/bbolt" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" ) func NewTestStorageEngine(testDirectory string) Engine { diff --git a/test/node/server.go b/test/node/server.go index dde6da4377..ad4b79b9c5 100644 --- a/test/node/server.go +++ b/test/node/server.go @@ -22,7 +22,7 @@ import ( "context" "crypto/tls" "fmt" - "github.com/nuts-foundation/nuts-node/test/pki" + "github.com/nuts-foundation/nuts-node/v5/test/pki" "github.com/stretchr/testify/require" "net/http" "os" @@ -31,10 +31,10 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/cmd" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/cmd" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/test" + "github.com/nuts-foundation/nuts-node/v5/test/io" ) const testServerConfig = `verbosity: debug diff --git a/test/pki/test.go b/test/pki/test.go index 7c5cc8c35a..4162d3b6f2 100644 --- a/test/pki/test.go +++ b/test/pki/test.go @@ -22,7 +22,7 @@ import ( "crypto/tls" "crypto/x509" _ "embed" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/test/io" "os" "path" "testing" diff --git a/vcr/ambassador.go b/vcr/ambassador.go index 817e103170..c983ae432e 100644 --- a/vcr/ambassador.go +++ b/vcr/ambassador.go @@ -26,15 +26,15 @@ import ( "fmt" "github.com/nats-io/nats.go" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/events" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/log" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/events" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/vcr/types" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" "github.com/piprate/json-gold/ld" ) diff --git a/vcr/ambassador_test.go b/vcr/ambassador_test.go index 0b66a9d804..16dde5b4d3 100644 --- a/vcr/ambassador_test.go +++ b/vcr/ambassador_test.go @@ -24,7 +24,7 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "github.com/piprate/json-gold/ld" "github.com/stretchr/testify/require" "net/http" @@ -33,17 +33,17 @@ import ( "time" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/crypto/util" - "github.com/nuts-foundation/nuts-node/events" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/util" + "github.com/nuts-foundation/nuts-node/v5/events" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/test" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/types" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/vcr/api/openid4vci/v0/api.go b/vcr/api/openid4vci/v0/api.go index 06f3d20566..7b5f818f5d 100644 --- a/vcr/api/openid4vci/v0/api.go +++ b/vcr/api/openid4vci/v0/api.go @@ -23,12 +23,12 @@ import ( "errors" "github.com/labstack/echo/v4" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/log" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "net/http" ) diff --git a/vcr/api/openid4vci/v0/api_test.go b/vcr/api/openid4vci/v0/api_test.go index fbc6a8d987..7e0e96508f 100644 --- a/vcr/api/openid4vci/v0/api_test.go +++ b/vcr/api/openid4vci/v0/api_test.go @@ -22,7 +22,7 @@ import ( "errors" "fmt" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" diff --git a/vcr/api/openid4vci/v0/holder.go b/vcr/api/openid4vci/v0/holder.go index 4dfeeb85d2..a686ee8cba 100644 --- a/vcr/api/openid4vci/v0/holder.go +++ b/vcr/api/openid4vci/v0/holder.go @@ -21,9 +21,9 @@ package v0 import ( "context" "encoding/json" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vcr/holder" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/vcr/holder" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" ) func (w Wrapper) getHolderHandler(ctx context.Context, holder string) (holder.OpenIDHandler, error) { diff --git a/vcr/api/openid4vci/v0/holder_test.go b/vcr/api/openid4vci/v0/holder_test.go index ae4433397c..36031a74f4 100644 --- a/vcr/api/openid4vci/v0/holder_test.go +++ b/vcr/api/openid4vci/v0/holder_test.go @@ -23,10 +23,10 @@ import ( "encoding/json" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/holder" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/holder" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vcr/api/openid4vci/v0/issuer.go b/vcr/api/openid4vci/v0/issuer.go index 292b9eda05..09b85512d6 100644 --- a/vcr/api/openid4vci/v0/issuer.go +++ b/vcr/api/openid4vci/v0/issuer.go @@ -23,8 +23,8 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/vcr/issuer" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" "net/http" "strings" ) diff --git a/vcr/api/openid4vci/v0/issuer_test.go b/vcr/api/openid4vci/v0/issuer_test.go index 5c77853944..9f651295fc 100644 --- a/vcr/api/openid4vci/v0/issuer_test.go +++ b/vcr/api/openid4vci/v0/issuer_test.go @@ -22,10 +22,10 @@ import ( "context" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/issuer" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vcr/api/vcr/v2/api.go b/vcr/api/vcr/v2/api.go index f6d4ed03ed..380a91a187 100644 --- a/vcr/api/vcr/v2/api.go +++ b/vcr/api/vcr/v2/api.go @@ -22,15 +22,15 @@ import ( "context" "encoding/json" "errors" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/vcr/holder" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/vcr/holder" "net/http" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/credential" - vcrTypes "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vcr/verifier" - vdrTypes "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + vcrTypes "github.com/nuts-foundation/nuts-node/v5/vcr/types" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" + vdrTypes "github.com/nuts-foundation/nuts-node/v5/vdr/types" "time" @@ -38,9 +38,9 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature/proof" ) var clockFn = func() time.Time { diff --git a/vcr/api/vcr/v2/api_test.go b/vcr/api/vcr/v2/api_test.go index f4ef819e99..70f7c5a926 100644 --- a/vcr/api/vcr/v2/api_test.go +++ b/vcr/api/vcr/v2/api_test.go @@ -30,16 +30,16 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/holder" - "github.com/nuts-foundation/nuts-node/vcr/issuer" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vcr/verifier" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/holder" + "github.com/nuts-foundation/nuts-node/v5/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vcr/api/vcr/v2/client.go b/vcr/api/vcr/v2/client.go index b9020ca95b..729d34efdc 100644 --- a/vcr/api/vcr/v2/client.go +++ b/vcr/api/vcr/v2/client.go @@ -23,7 +23,7 @@ import ( "context" "encoding/json" "fmt" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "io" "net/http" ) diff --git a/vcr/api/vcr/v2/client_test.go b/vcr/api/vcr/v2/client_test.go index df4d3b5700..c8c3255ddc 100644 --- a/vcr/api/vcr/v2/client_test.go +++ b/vcr/api/vcr/v2/client_test.go @@ -20,14 +20,14 @@ package v2 import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/stretchr/testify/require" "net/http" "net/http/httptest" "testing" "time" - http2 "github.com/nuts-foundation/nuts-node/test/http" + http2 "github.com/nuts-foundation/nuts-node/v5/test/http" "github.com/stretchr/testify/assert" ) diff --git a/vcr/api/vcr/v2/registry.go b/vcr/api/vcr/v2/registry.go index 65d09fd5fa..834321571a 100644 --- a/vcr/api/vcr/v2/registry.go +++ b/vcr/api/vcr/v2/registry.go @@ -21,15 +21,15 @@ package v2 import ( "context" "encoding/json" - "github.com/nuts-foundation/nuts-node/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" "github.com/sirupsen/logrus" "sort" "strings" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr" ) // ResolveVC handles the API request for resolving a VC diff --git a/vcr/api/vcr/v2/registry_test.go b/vcr/api/vcr/v2/registry_test.go index 68d7ee2cc2..ac445f0a51 100644 --- a/vcr/api/vcr/v2/registry_test.go +++ b/vcr/api/vcr/v2/registry_test.go @@ -23,9 +23,9 @@ import ( "errors" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" "github.com/stretchr/testify/require" "testing" diff --git a/vcr/api/vcr/v2/types.go b/vcr/api/vcr/v2/types.go index bf0d66d2a8..6cd8e6a811 100644 --- a/vcr/api/vcr/v2/types.go +++ b/vcr/api/vcr/v2/types.go @@ -22,7 +22,7 @@ package v2 import ( "encoding/json" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" ) // VerifiableCredential is an alias to use from within the API diff --git a/vcr/cmd/cmd.go b/vcr/cmd/cmd.go index 41a4fe13d3..5ee30addff 100644 --- a/vcr/cmd/cmd.go +++ b/vcr/cmd/cmd.go @@ -21,14 +21,14 @@ package cmd import ( "encoding/json" "fmt" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" "github.com/spf13/pflag" "strings" "time" - "github.com/nuts-foundation/nuts-node/core" - api "github.com/nuts-foundation/nuts-node/vcr/api/vcr/v2" + "github.com/nuts-foundation/nuts-node/v5/core" + api "github.com/nuts-foundation/nuts-node/v5/vcr/api/vcr/v2" "github.com/spf13/cobra" ) diff --git a/vcr/cmd/cmd_test.go b/vcr/cmd/cmd_test.go index bb5cf82891..d81de348e7 100644 --- a/vcr/cmd/cmd_test.go +++ b/vcr/cmd/cmd_test.go @@ -22,14 +22,14 @@ package cmd import ( "bytes" "encoding/json" - "github.com/nuts-foundation/nuts-node/core" - v2 "github.com/nuts-foundation/nuts-node/vcr/api/vcr/v2" + "github.com/nuts-foundation/nuts-node/v5/core" + v2 "github.com/nuts-foundation/nuts-node/v5/vcr/api/vcr/v2" "github.com/stretchr/testify/require" "net/http" "net/http/httptest" "testing" - http2 "github.com/nuts-foundation/nuts-node/test/http" + http2 "github.com/nuts-foundation/nuts-node/v5/test/http" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" ) diff --git a/vcr/config.go b/vcr/config.go index 614ddf7291..55f7a5bc0e 100644 --- a/vcr/config.go +++ b/vcr/config.go @@ -20,7 +20,7 @@ package vcr import ( - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" "time" ) diff --git a/vcr/context_test.go b/vcr/context_test.go index b29d06d096..81850c2052 100644 --- a/vcr/context_test.go +++ b/vcr/context_test.go @@ -20,9 +20,9 @@ package vcr import ( - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" "github.com/piprate/json-gold/ld" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/vcr/credential/test.go b/vcr/credential/test.go index c6e0e6e2a0..b79db534a3 100644 --- a/vcr/credential/test.go +++ b/vcr/credential/test.go @@ -26,7 +26,7 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/vdr" + "github.com/nuts-foundation/nuts-node/v5/vdr" ) func ValidNutsAuthorizationCredential() *vc.VerifiableCredential { diff --git a/vcr/credential/validator.go b/vcr/credential/validator.go index 1bfae34b06..b543b74c5c 100644 --- a/vcr/credential/validator.go +++ b/vcr/credential/validator.go @@ -24,7 +24,7 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" "github.com/piprate/json-gold/ld" "strings" diff --git a/vcr/credential/validator_test.go b/vcr/credential/validator_test.go index 39531b3d53..ddf32e1cfb 100644 --- a/vcr/credential/validator_test.go +++ b/vcr/credential/validator_test.go @@ -22,8 +22,8 @@ package credential import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vdr" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vdr" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "testing" diff --git a/vcr/holder/holder.go b/vcr/holder/holder.go index 6af96e9439..d1c0d8e0a8 100644 --- a/vcr/holder/holder.go +++ b/vcr/holder/holder.go @@ -27,13 +27,13 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/signature" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vcr/verifier" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) type vcHolder struct { diff --git a/vcr/holder/holder_test.go b/vcr/holder/holder_test.go index cc5b0c9dd7..3759ad50cf 100644 --- a/vcr/holder/holder_test.go +++ b/vcr/holder/holder_test.go @@ -21,20 +21,20 @@ package holder import ( "encoding/json" "errors" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" "github.com/stretchr/testify/require" "testing" "time" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vcr/verifier" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v5/vdr" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/vcr/holder/interface.go b/vcr/holder/interface.go index 53634c7952..afbe8525d3 100644 --- a/vcr/holder/interface.go +++ b/vcr/holder/interface.go @@ -23,7 +23,7 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature/proof" ) // VerifiableCredentialLDContextV1 holds the URI of the JSON-LD context for Verifiable Credentials. diff --git a/vcr/holder/openid.go b/vcr/holder/openid.go index 9d3e78ed18..fd66e92e0c 100644 --- a/vcr/holder/openid.go +++ b/vcr/holder/openid.go @@ -27,14 +27,14 @@ import ( "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/log" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - vcrTypes "github.com/nuts-foundation/nuts-node/vcr/types" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" + vcrTypes "github.com/nuts-foundation/nuts-node/v5/vcr/types" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // OpenIDHandler is the interface for handling issuer operations using OpenID4VCI. diff --git a/vcr/holder/openid_mock.go b/vcr/holder/openid_mock.go index 7ac57f4d5c..3a2a12ad52 100644 --- a/vcr/holder/openid_mock.go +++ b/vcr/holder/openid_mock.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - openid4vci "github.com/nuts-foundation/nuts-node/vcr/openid4vci" + openid4vci "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" gomock "go.uber.org/mock/gomock" ) diff --git a/vcr/holder/openid_test.go b/vcr/holder/openid_test.go index e6484aa36b..56b1e34e72 100644 --- a/vcr/holder/openid_test.go +++ b/vcr/holder/openid_test.go @@ -24,12 +24,12 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vcr/types" - vdrTypes "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/vcr/types" + vdrTypes "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vcr/interface.go b/vcr/interface.go index 1d8dcdfa42..70e12da934 100644 --- a/vcr/interface.go +++ b/vcr/interface.go @@ -23,14 +23,14 @@ import ( "context" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vcr/types" + "github.com/nuts-foundation/nuts-node/v5/vcr/types" "time" - "github.com/nuts-foundation/nuts-node/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/vcr/holder" - "github.com/nuts-foundation/nuts-node/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v5/vcr/holder" + "github.com/nuts-foundation/nuts-node/v5/vcr/issuer" ) // Finder is the VCR interface for searching VCs diff --git a/vcr/issuer/interface.go b/vcr/issuer/interface.go index f6e55c002a..407443a548 100644 --- a/vcr/issuer/interface.go +++ b/vcr/issuer/interface.go @@ -20,14 +20,14 @@ package issuer import ( "context" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "io" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" ) // Publisher publishes new credentials and revocations to a channel. Used by a credential issuer. diff --git a/vcr/issuer/issuer.go b/vcr/issuer/issuer.go index 17c3d3efa9..dc7eadaa2c 100644 --- a/vcr/issuer/issuer.go +++ b/vcr/issuer/issuer.go @@ -22,25 +22,25 @@ import ( "context" "encoding/json" "fmt" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "time" "github.com/google/uuid" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/log" - "github.com/nuts-foundation/nuts-node/vcr/signature" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vcr/trust" - "github.com/nuts-foundation/nuts-node/vcr/types" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v5/vcr/trust" + "github.com/nuts-foundation/nuts-node/v5/vcr/types" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // TimeFunc is a function that returns the time used, for e.g. signing time. It can be set for testing purposes. diff --git a/vcr/issuer/issuer_test.go b/vcr/issuer/issuer_test.go index 8ee88e42b9..42339807af 100644 --- a/vcr/issuer/issuer_test.go +++ b/vcr/issuer/issuer_test.go @@ -23,9 +23,9 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" "github.com/stretchr/testify/require" "path" "testing" @@ -38,14 +38,14 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/test/io" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/signature" - "github.com/nuts-foundation/nuts-node/vcr/trust" - vcr "github.com/nuts-foundation/nuts-node/vcr/types" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/test/io" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature" + "github.com/nuts-foundation/nuts-node/v5/vcr/trust" + vcr "github.com/nuts-foundation/nuts-node/v5/vcr/types" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) func Test_issuer_buildVC(t *testing.T) { diff --git a/vcr/issuer/keyresolver.go b/vcr/issuer/keyresolver.go index 69bfb92eae..59307867d8 100644 --- a/vcr/issuer/keyresolver.go +++ b/vcr/issuer/keyresolver.go @@ -22,9 +22,9 @@ import ( "context" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // vdrKeyResolver resolves private keys based upon the VDR document resolver diff --git a/vcr/issuer/keyresolver_test.go b/vcr/issuer/keyresolver_test.go index 47b0b53cf1..3012a32e0c 100644 --- a/vcr/issuer/keyresolver_test.go +++ b/vcr/issuer/keyresolver_test.go @@ -23,8 +23,8 @@ import ( "errors" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vcr/issuer/leia_store.go b/vcr/issuer/leia_store.go index 7be721f169..772692e9cf 100644 --- a/vcr/issuer/leia_store.go +++ b/vcr/issuer/leia_store.go @@ -25,15 +25,15 @@ import ( "github.com/nuts-foundation/go-leia/v4" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr/log" - "github.com/nuts-foundation/nuts-node/vcr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/vcr/types" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" ) const issuedBackupShelf = "credentials" diff --git a/vcr/issuer/leia_store_test.go b/vcr/issuer/leia_store_test.go index af7d8162f2..b6ccfd8dc9 100644 --- a/vcr/issuer/leia_store_test.go +++ b/vcr/issuer/leia_store_test.go @@ -26,7 +26,7 @@ import ( "github.com/nuts-foundation/go-leia/v4" "github.com/nuts-foundation/go-stoabs" "github.com/nuts-foundation/go-stoabs/bbolt" - "github.com/nuts-foundation/nuts-node/vcr/types" + "github.com/nuts-foundation/nuts-node/v5/vcr/types" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" "path" @@ -37,9 +37,9 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/test/io" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/test/io" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" ) func TestNewLeiaStore(t *testing.T) { diff --git a/vcr/issuer/mock.go b/vcr/issuer/mock.go index d0987f97b0..9c277fb409 100644 --- a/vcr/issuer/mock.go +++ b/vcr/issuer/mock.go @@ -11,9 +11,9 @@ import ( ssi "github.com/nuts-foundation/go-did" did "github.com/nuts-foundation/go-did/did" vc "github.com/nuts-foundation/go-did/vc" - core "github.com/nuts-foundation/nuts-node/core" - crypto "github.com/nuts-foundation/nuts-node/crypto" - credential "github.com/nuts-foundation/nuts-node/vcr/credential" + core "github.com/nuts-foundation/nuts-node/v5/core" + crypto "github.com/nuts-foundation/nuts-node/v5/crypto" + credential "github.com/nuts-foundation/nuts-node/v5/vcr/credential" gomock "go.uber.org/mock/gomock" ) diff --git a/vcr/issuer/network_publisher.go b/vcr/issuer/network_publisher.go index 5d53be6f0d..0d08460b18 100644 --- a/vcr/issuer/network_publisher.go +++ b/vcr/issuer/network_publisher.go @@ -24,16 +24,16 @@ import ( "fmt" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/network/transport" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/log" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/network/transport" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/vcr/types" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) type networkPublisher struct { diff --git a/vcr/issuer/network_publisher_test.go b/vcr/issuer/network_publisher_test.go index 237c7e2272..07a7089ccb 100644 --- a/vcr/issuer/network_publisher_test.go +++ b/vcr/issuer/network_publisher_test.go @@ -25,13 +25,13 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/vcr/credential" - types "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vdr" - vdrTypes "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + types "github.com/nuts-foundation/nuts-node/v5/vcr/types" + "github.com/nuts-foundation/nuts-node/v5/vdr" + vdrTypes "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vcr/issuer/openid.go b/vcr/issuer/openid.go index e1d214e4c3..f7c34e7d3c 100644 --- a/vcr/issuer/openid.go +++ b/vcr/issuer/openid.go @@ -31,14 +31,14 @@ import ( "github.com/lestrrat-go/jwx/jwt" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vcr/issuer/assets" - "github.com/nuts-foundation/nuts-node/vcr/log" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vcr/issuer/assets" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "io/fs" "net/http" "os" diff --git a/vcr/issuer/openid_mock.go b/vcr/issuer/openid_mock.go index 1785bb3d62..cf3fdcb177 100644 --- a/vcr/issuer/openid_mock.go +++ b/vcr/issuer/openid_mock.go @@ -9,7 +9,7 @@ import ( reflect "reflect" vc "github.com/nuts-foundation/go-did/vc" - openid4vci "github.com/nuts-foundation/nuts-node/vcr/openid4vci" + openid4vci "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" gomock "go.uber.org/mock/gomock" ) diff --git a/vcr/issuer/openid_store.go b/vcr/issuer/openid_store.go index 689556cae8..f5b307bfca 100644 --- a/vcr/issuer/openid_store.go +++ b/vcr/issuer/openid_store.go @@ -21,7 +21,7 @@ package issuer import ( "context" "errors" - "github.com/nuts-foundation/nuts-node/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" "sync" "time" ) diff --git a/vcr/issuer/openid_store_test.go b/vcr/issuer/openid_store_test.go index a779e949ce..f86d36bc9d 100644 --- a/vcr/issuer/openid_store_test.go +++ b/vcr/issuer/openid_store_test.go @@ -20,7 +20,7 @@ package issuer import ( "context" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v5/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/vcr/issuer/openid_test.go b/vcr/issuer/openid_test.go index 37c453ecbc..2542fc5270 100644 --- a/vcr/issuer/openid_test.go +++ b/vcr/issuer/openid_test.go @@ -25,11 +25,11 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vcr/log/log.go b/vcr/log/log.go index b00de90daa..a90a0d9981 100644 --- a/vcr/log/log.go +++ b/vcr/log/log.go @@ -19,7 +19,7 @@ package log import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" ) diff --git a/vcr/mock.go b/vcr/mock.go index 7c6e563b6b..43b95142f5 100644 --- a/vcr/mock.go +++ b/vcr/mock.go @@ -12,9 +12,9 @@ import ( ssi "github.com/nuts-foundation/go-did" did "github.com/nuts-foundation/go-did/did" vc "github.com/nuts-foundation/go-did/vc" - holder "github.com/nuts-foundation/nuts-node/vcr/holder" - issuer "github.com/nuts-foundation/nuts-node/vcr/issuer" - verifier "github.com/nuts-foundation/nuts-node/vcr/verifier" + holder "github.com/nuts-foundation/nuts-node/v5/vcr/holder" + issuer "github.com/nuts-foundation/nuts-node/v5/vcr/issuer" + verifier "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" gomock "go.uber.org/mock/gomock" ) diff --git a/vcr/openid4vci/identifiers.go b/vcr/openid4vci/identifiers.go index 1abf15ab4a..27a707f066 100644 --- a/vcr/openid4vci/identifiers.go +++ b/vcr/openid4vci/identifiers.go @@ -22,12 +22,12 @@ import ( "crypto/tls" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - httpclient "github.com/nuts-foundation/nuts-node/http/client" + "github.com/nuts-foundation/nuts-node/v5/core" + httpclient "github.com/nuts-foundation/nuts-node/v5/http/client" - "github.com/nuts-foundation/nuts-node/vcr/log" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "net/http" "net/url" "sync/atomic" diff --git a/vcr/openid4vci/identifiers_test.go b/vcr/openid4vci/identifiers_test.go index e894fec216..cb81847d84 100644 --- a/vcr/openid4vci/identifiers_test.go +++ b/vcr/openid4vci/identifiers_test.go @@ -23,10 +23,10 @@ import ( "errors" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/test/pki" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/test/pki" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vcr/openid4vci/issuer_client.go b/vcr/openid4vci/issuer_client.go index 7a20812bae..26cccf7b12 100644 --- a/vcr/openid4vci/issuer_client.go +++ b/vcr/openid4vci/issuer_client.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" "io" "net/http" "net/http/httptrace" diff --git a/vcr/openid4vci/test.go b/vcr/openid4vci/test.go index eb5c88dc70..b3de4436f8 100644 --- a/vcr/openid4vci/test.go +++ b/vcr/openid4vci/test.go @@ -22,7 +22,7 @@ import ( "context" "encoding/json" "fmt" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v5/test" "net/http" "testing" "time" diff --git a/vcr/openid4vci/wallet_client.go b/vcr/openid4vci/wallet_client.go index e1b4fc1fa5..2baa8bcef9 100644 --- a/vcr/openid4vci/wallet_client.go +++ b/vcr/openid4vci/wallet_client.go @@ -23,7 +23,7 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "net/url" ) diff --git a/vcr/search.go b/vcr/search.go index 2e6ffc2eb1..26f30d3283 100644 --- a/vcr/search.go +++ b/vcr/search.go @@ -23,8 +23,8 @@ import ( "context" "encoding/json" "fmt" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" "github.com/sirupsen/logrus" "reflect" "sort" diff --git a/vcr/search_test.go b/vcr/search_test.go index 688bace86e..a0b0a1489a 100644 --- a/vcr/search_test.go +++ b/vcr/search_test.go @@ -27,9 +27,9 @@ import ( "time" "github.com/nuts-foundation/go-leia/v4" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr/types" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/vcr/signature/json_web_signature.go b/vcr/signature/json_web_signature.go index cc475790da..08cf63e16d 100644 --- a/vcr/signature/json_web_signature.go +++ b/vcr/signature/json_web_signature.go @@ -23,9 +23,9 @@ import ( "fmt" "github.com/lestrrat-go/jwx/jws" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/jsonld" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/jsonld" "github.com/piprate/json-gold/ld" ) diff --git a/vcr/signature/json_web_signature_test.go b/vcr/signature/json_web_signature_test.go index d54fee5d17..f2c049a76b 100644 --- a/vcr/signature/json_web_signature_test.go +++ b/vcr/signature/json_web_signature_test.go @@ -24,9 +24,9 @@ import ( "github.com/lestrrat-go/jwx/jwa" "github.com/lestrrat-go/jwx/jws" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/jsonld" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/jsonld" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/vcr/signature/mock.go b/vcr/signature/mock.go index 2c52ac4834..35613ab1e6 100644 --- a/vcr/signature/mock.go +++ b/vcr/signature/mock.go @@ -9,7 +9,7 @@ import ( reflect "reflect" ssi "github.com/nuts-foundation/go-did" - crypto "github.com/nuts-foundation/nuts-node/crypto" + crypto "github.com/nuts-foundation/nuts-node/v5/crypto" gomock "go.uber.org/mock/gomock" ) diff --git a/vcr/signature/proof/jsonld.go b/vcr/signature/proof/jsonld.go index 8e80ca69b2..7651fff8a9 100644 --- a/vcr/signature/proof/jsonld.go +++ b/vcr/signature/proof/jsonld.go @@ -25,14 +25,14 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/jsonld" + "github.com/nuts-foundation/nuts-node/v5/jsonld" "strings" "time" "github.com/lestrrat-go/jwx/jws" ssi "github.com/nuts-foundation/go-did" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vcr/signature" + nutsCrypto "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature" ) // RsaSignature2018 contains the string value for the RsaSignature2018 signature type diff --git a/vcr/signature/proof/jsonld_test.go b/vcr/signature/proof/jsonld_test.go index 365169c445..9623fc4717 100644 --- a/vcr/signature/proof/jsonld_test.go +++ b/vcr/signature/proof/jsonld_test.go @@ -21,16 +21,16 @@ package proof import ( "encoding/json" "errors" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/jsonld" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/jsonld" "github.com/stretchr/testify/require" "testing" "time" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vcr/signature" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/vcr/signature/proof/proof.go b/vcr/signature/proof/proof.go index 164b3d8a02..863cb9335d 100644 --- a/vcr/signature/proof/proof.go +++ b/vcr/signature/proof/proof.go @@ -21,8 +21,8 @@ package proof import ( "crypto" "encoding/json" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vcr/signature" + nutsCrypto "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature" ) // Document represents the document to sign. It does not contain proofs or signatures diff --git a/vcr/signature/signature.go b/vcr/signature/signature.go index 71304fda52..95694d151f 100644 --- a/vcr/signature/signature.go +++ b/vcr/signature/signature.go @@ -21,7 +21,7 @@ package signature import ( "context" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto" ) // W3idSecurityV1Context defines the v1 of the w3id json-ld context diff --git a/vcr/store.go b/vcr/store.go index 6d43c23990..4afad6851e 100644 --- a/vcr/store.go +++ b/vcr/store.go @@ -24,16 +24,16 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-leia/v4" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "reflect" "time" - "github.com/nuts-foundation/nuts-node/vcr/types" + "github.com/nuts-foundation/nuts-node/v5/vcr/types" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" ) // maxFindExecutionTime indicates how long a "find by id" type query may take diff --git a/vcr/store_test.go b/vcr/store_test.go index f984ee8253..f307857d5d 100644 --- a/vcr/store_test.go +++ b/vcr/store_test.go @@ -23,7 +23,7 @@ import ( "crypto/ecdsa" "crypto/sha1" "encoding/json" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/spi" "github.com/stretchr/testify/require" "os" "testing" diff --git a/vcr/test.go b/vcr/test.go index 883c93b8c3..9929799ef3 100644 --- a/vcr/test.go +++ b/vcr/test.go @@ -20,18 +20,18 @@ package vcr import ( - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/events" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test/io" - "github.com/nuts-foundation/nuts-node/vcr/trust" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/events" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/pki" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/test/io" + "github.com/nuts-foundation/nuts-node/v5/vcr/trust" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "go.uber.org/mock/gomock" "path" "testing" diff --git a/vcr/test/openid4vci_integration_test.go b/vcr/test/openid4vci_integration_test.go index 6352a968b1..5ac772b5d6 100644 --- a/vcr/test/openid4vci_integration_test.go +++ b/vcr/test/openid4vci_integration_test.go @@ -21,11 +21,11 @@ package test import ( "bytes" "encoding/json" - "github.com/nuts-foundation/nuts-node/core" - httpModule "github.com/nuts-foundation/nuts-node/http" - httpclient "github.com/nuts-foundation/nuts-node/http/client" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/core" + httpModule "github.com/nuts-foundation/nuts-node/v5/http" + httpclient "github.com/nuts-foundation/nuts-node/v5/http/client" + "github.com/nuts-foundation/nuts-node/v5/network/log" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" "github.com/stretchr/testify/assert" "io" "net/http" @@ -37,17 +37,17 @@ import ( "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/didman" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/test/node" - "github.com/nuts-foundation/nuts-node/vcr" - credentialTypes "github.com/nuts-foundation/nuts-node/vcr/credential" - vdrTypes "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/didman" + "github.com/nuts-foundation/nuts-node/v5/test" + "github.com/nuts-foundation/nuts-node/v5/test/node" + "github.com/nuts-foundation/nuts-node/v5/vcr" + credentialTypes "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + vdrTypes "github.com/nuts-foundation/nuts-node/v5/vdr/types" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" "github.com/stretchr/testify/require" ) diff --git a/vcr/trust/trust_test.go b/vcr/trust/trust_test.go index 524d61c84e..9480b99f3b 100644 --- a/vcr/trust/trust_test.go +++ b/vcr/trust/trust_test.go @@ -26,7 +26,7 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/stretchr/testify/assert" ) diff --git a/vcr/vcr.go b/vcr/vcr.go index c8e95582a7..1dcff33c8a 100644 --- a/vcr/vcr.go +++ b/vcr/vcr.go @@ -31,30 +31,30 @@ import ( "time" "github.com/nuts-foundation/go-leia/v4" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/pki" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/events" - httpclient "github.com/nuts-foundation/nuts-node/http/client" - "github.com/nuts-foundation/nuts-node/jsonld" - - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr/assets" - "github.com/nuts-foundation/nuts-node/vcr/holder" - "github.com/nuts-foundation/nuts-node/vcr/issuer" - "github.com/nuts-foundation/nuts-node/vcr/log" - "github.com/nuts-foundation/nuts-node/vcr/trust" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vcr/verifier" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/events" + httpclient "github.com/nuts-foundation/nuts-node/v5/http/client" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/vcr/assets" + "github.com/nuts-foundation/nuts-node/v5/vcr/holder" + "github.com/nuts-foundation/nuts-node/v5/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/vcr/trust" + "github.com/nuts-foundation/nuts-node/v5/vcr/types" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" "gopkg.in/yaml.v3" ) diff --git a/vcr/vcr_test.go b/vcr/vcr_test.go index b9b0b0c4a6..6def14dab5 100644 --- a/vcr/vcr_test.go +++ b/vcr/vcr_test.go @@ -27,9 +27,9 @@ import ( "github.com/nuts-foundation/go-leia/v4" "github.com/nuts-foundation/go-stoabs" bbolt2 "github.com/nuts-foundation/go-stoabs/bbolt" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v5/pki" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/vcr/openid4vci" "github.com/stretchr/testify/require" "os" "path" @@ -37,19 +37,19 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/events" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v5/events" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr/verifier" "go.etcd.io/bbolt" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/test/io" - vcrTypes "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/test/io" + vcrTypes "github.com/nuts-foundation/nuts-node/v5/vcr/types" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/vcr/verifier/interface.go b/vcr/verifier/interface.go index 793d92acf1..f8f05f0d1d 100644 --- a/vcr/verifier/interface.go +++ b/vcr/verifier/interface.go @@ -20,13 +20,13 @@ package verifier import ( "errors" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "io" "time" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" ) // Verifier defines the interface for verifying verifiable credentials. diff --git a/vcr/verifier/leia_store.go b/vcr/verifier/leia_store.go index cd52a141cf..190e8efdd9 100644 --- a/vcr/verifier/leia_store.go +++ b/vcr/verifier/leia_store.go @@ -25,12 +25,12 @@ import ( "github.com/nuts-foundation/go-leia/v4" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr/log" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/vcr/log" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" ) const revocationBackupShelf = "revocations" diff --git a/vcr/verifier/leia_store_test.go b/vcr/verifier/leia_store_test.go index 070d74b30c..69de803198 100644 --- a/vcr/verifier/leia_store_test.go +++ b/vcr/verifier/leia_store_test.go @@ -30,8 +30,8 @@ import ( "testing" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/test/io" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/test/io" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" "github.com/stretchr/testify/assert" ) diff --git a/vcr/verifier/mock.go b/vcr/verifier/mock.go index b7c6a716ee..5ac8c740a4 100644 --- a/vcr/verifier/mock.go +++ b/vcr/verifier/mock.go @@ -10,8 +10,8 @@ import ( ssi "github.com/nuts-foundation/go-did" vc "github.com/nuts-foundation/go-did/vc" - core "github.com/nuts-foundation/nuts-node/core" - credential "github.com/nuts-foundation/nuts-node/vcr/credential" + core "github.com/nuts-foundation/nuts-node/v5/core" + credential "github.com/nuts-foundation/nuts-node/v5/vcr/credential" gomock "go.uber.org/mock/gomock" ) diff --git a/vcr/verifier/verifier.go b/vcr/verifier/verifier.go index 9ae018bc79..4b1540ed01 100644 --- a/vcr/verifier/verifier.go +++ b/vcr/verifier/verifier.go @@ -28,13 +28,13 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/signature" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vcr/trust" - "github.com/nuts-foundation/nuts-node/vcr/types" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v5/vcr/trust" + "github.com/nuts-foundation/nuts-node/v5/vcr/types" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) var timeFunc = time.Now diff --git a/vcr/verifier/verifier_test.go b/vcr/verifier/verifier_test.go index cae2e2e100..9965f49816 100644 --- a/vcr/verifier/verifier_test.go +++ b/vcr/verifier/verifier_test.go @@ -22,7 +22,7 @@ import ( "crypto/ecdsa" "encoding/json" "errors" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v5/crypto/storage/spi" "github.com/stretchr/testify/require" "os" "path" @@ -32,15 +32,15 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/test/io" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vcr/trust" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vdr" - vdrTypes "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/jsonld" + "github.com/nuts-foundation/nuts-node/v5/test/io" + "github.com/nuts-foundation/nuts-node/v5/vcr/credential" + "github.com/nuts-foundation/nuts-node/v5/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v5/vcr/trust" + "github.com/nuts-foundation/nuts-node/v5/vcr/types" + "github.com/nuts-foundation/nuts-node/v5/vdr" + vdrTypes "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/vdr/ambassador.go b/vdr/ambassador.go index d239b4c55c..6f99150177 100644 --- a/vdr/ambassador.go +++ b/vdr/ambassador.go @@ -28,20 +28,20 @@ import ( "fmt" "github.com/nats-io/nats.go" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" "sort" "github.com/lestrrat-go/jwx/jwk" "github.com/nuts-foundation/go-did/did" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/events" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/log" - "github.com/nuts-foundation/nuts-node/vdr/types" + nutsCrypto "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/events" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/log" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // didDocumentType contains network transaction mime-type to identify a DID Document in the network. diff --git a/vdr/ambassador_test.go b/vdr/ambassador_test.go index e0e49f7b22..a144c77f0b 100644 --- a/vdr/ambassador_test.go +++ b/vdr/ambassador_test.go @@ -27,8 +27,8 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/network" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/network" "testing" "time" @@ -36,13 +36,13 @@ import ( "github.com/nats-io/nats.go" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/events" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/events" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vdr/api/v1/api.go b/vdr/api/v1/api.go index c5723e003d..daa90886c3 100644 --- a/vdr/api/v1/api.go +++ b/vdr/api/v1/api.go @@ -22,18 +22,18 @@ package v1 import ( "context" "fmt" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/vdr" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/vdr" "net/http" "time" "github.com/nuts-foundation/go-did/did" - vdrDoc "github.com/nuts-foundation/nuts-node/vdr/didservice" + vdrDoc "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) var _ StrictServerInterface = (*Wrapper)(nil) diff --git a/vdr/api/v1/api_test.go b/vdr/api/v1/api_test.go index 575f346dce..c4d1e2c3a4 100644 --- a/vdr/api/v1/api_test.go +++ b/vdr/api/v1/api_test.go @@ -18,16 +18,16 @@ package v1 import ( "context" "errors" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "net/http" "testing" "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vdr/api/v1/client.go b/vdr/api/v1/client.go index 93db80fb60..46f6557b37 100644 --- a/vdr/api/v1/client.go +++ b/vdr/api/v1/client.go @@ -24,7 +24,7 @@ import ( "encoding/json" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "io" "net/http" ) diff --git a/vdr/api/v1/client_test.go b/vdr/api/v1/client_test.go index b5f52cce42..2e6f7e1f03 100644 --- a/vdr/api/v1/client_test.go +++ b/vdr/api/v1/client_test.go @@ -21,7 +21,7 @@ import ( "crypto/rand" "encoding/json" "errors" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/stretchr/testify/require" "net/http" "net/http/httptest" @@ -30,9 +30,9 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - http2 "github.com/nuts-foundation/nuts-node/test/http" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/types" + http2 "github.com/nuts-foundation/nuts-node/v5/test/http" + "github.com/nuts-foundation/nuts-node/v5/vdr" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "schneider.vip/problem" ) diff --git a/vdr/api/v1/types.go b/vdr/api/v1/types.go index 5dcb823d28..4443cd251a 100644 --- a/vdr/api/v1/types.go +++ b/vdr/api/v1/types.go @@ -17,7 +17,7 @@ package v1 import ( "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // DIDDocument is an alias diff --git a/vdr/cmd/cmd.go b/vdr/cmd/cmd.go index cebc989efd..736399991b 100644 --- a/vdr/cmd/cmd.go +++ b/vdr/cmd/cmd.go @@ -28,10 +28,10 @@ import ( "strings" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - api "github.com/nuts-foundation/nuts-node/vdr/api/v1" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + api "github.com/nuts-foundation/nuts-node/v5/vdr/api/v1" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/vdr/cmd/cmd_test.go b/vdr/cmd/cmd_test.go index 5e1f216f9e..32074e8ee7 100644 --- a/vdr/cmd/cmd_test.go +++ b/vdr/cmd/cmd_test.go @@ -31,10 +31,10 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - http2 "github.com/nuts-foundation/nuts-node/test/http" - "github.com/nuts-foundation/nuts-node/vdr" - v1 "github.com/nuts-foundation/nuts-node/vdr/api/v1" + "github.com/nuts-foundation/nuts-node/v5/core" + http2 "github.com/nuts-foundation/nuts-node/v5/test/http" + "github.com/nuts-foundation/nuts-node/v5/vdr" + v1 "github.com/nuts-foundation/nuts-node/v5/vdr/api/v1" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" ) diff --git a/vdr/did_owner.go b/vdr/did_owner.go index 190edcddf3..e3d4f4bbbe 100644 --- a/vdr/did_owner.go +++ b/vdr/did_owner.go @@ -22,9 +22,9 @@ import ( "context" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "strings" "sync" ) diff --git a/vdr/did_owner_test.go b/vdr/did_owner_test.go index d0bfdbed91..f994c05a3c 100644 --- a/vdr/did_owner_test.go +++ b/vdr/did_owner_test.go @@ -22,8 +22,8 @@ import ( "context" "errors" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vdr/didservice/creator.go b/vdr/didservice/creator.go index 30e08d3107..801ceb514b 100644 --- a/vdr/didservice/creator.go +++ b/vdr/didservice/creator.go @@ -25,12 +25,12 @@ import ( ssi "github.com/nuts-foundation/go-did" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/lestrrat-go/jwx/jwk" "github.com/nuts-foundation/go-did/did" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" + nutsCrypto "github.com/nuts-foundation/nuts-node/v5/crypto" ) // NutsDIDMethodName is the DID method name used by Nuts diff --git a/vdr/didservice/creator_test.go b/vdr/didservice/creator_test.go index 92d69b85cc..669e0ec98a 100644 --- a/vdr/didservice/creator_test.go +++ b/vdr/didservice/creator_test.go @@ -32,8 +32,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vdr/types" + nutsCrypto "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) const mockKID = "did:nuts:3gU9z3j7j4VCboc3qq3Vc5mVVGDNGjfg32xokeX8c8Zn#J9O6wvqtYOVwjc8JtZ4aodRdbPv_IKAjLkEq9uHlDdE" diff --git a/vdr/didservice/finder.go b/vdr/didservice/finder.go index 680afc8ecf..5738b267d2 100644 --- a/vdr/didservice/finder.go +++ b/vdr/didservice/finder.go @@ -18,12 +18,12 @@ package didservice import ( - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "strings" "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // ByServiceType returns a predicate that matches on service type diff --git a/vdr/didservice/finder_test.go b/vdr/didservice/finder_test.go index c7c0a5fb49..4acc666095 100644 --- a/vdr/didservice/finder_test.go +++ b/vdr/didservice/finder_test.go @@ -19,14 +19,14 @@ package didservice import ( "errors" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "testing" "time" "github.com/stretchr/testify/require" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/vdr/didservice/manipulator.go b/vdr/didservice/manipulator.go index 3041ece324..53e56b6163 100644 --- a/vdr/didservice/manipulator.go +++ b/vdr/didservice/manipulator.go @@ -21,8 +21,8 @@ import ( "context" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vdr/types" + nutsCrypto "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // Manipulator contains helper methods to update a Nuts DID document. diff --git a/vdr/didservice/manipulator_test.go b/vdr/didservice/manipulator_test.go index d9ef1eae7c..abf48eafd0 100644 --- a/vdr/didservice/manipulator_test.go +++ b/vdr/didservice/manipulator_test.go @@ -20,13 +20,13 @@ package didservice import ( "context" "errors" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "testing" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vdr/didservice/resolvers.go b/vdr/didservice/resolvers.go index e062839461..73b32e6b59 100644 --- a/vdr/didservice/resolvers.go +++ b/vdr/didservice/resolvers.go @@ -23,13 +23,13 @@ import ( "crypto" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "time" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // ErrNestedDocumentsTooDeep is returned when a DID Document contains a multiple services with the same type diff --git a/vdr/didservice/resolvers_test.go b/vdr/didservice/resolvers_test.go index ddef812f57..7e5f872381 100644 --- a/vdr/didservice/resolvers_test.go +++ b/vdr/didservice/resolvers_test.go @@ -20,15 +20,15 @@ package didservice import ( "errors" "fmt" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "testing" "time" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vdr/didstore/event.go b/vdr/didstore/event.go index 7e1a8178a5..6ce4b86b29 100644 --- a/vdr/didstore/event.go +++ b/vdr/didstore/event.go @@ -22,7 +22,7 @@ import ( "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ) // event contains the transaction reference and ordering of all DID document updates diff --git a/vdr/didstore/event_test.go b/vdr/didstore/event_test.go index 3a76df154d..805dd859c1 100644 --- a/vdr/didstore/event_test.go +++ b/vdr/didstore/event_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/vdr/didstore/integration_test.go b/vdr/didstore/integration_test.go index 9bf3d60375..b6e71b0e8a 100644 --- a/vdr/didstore/integration_test.go +++ b/vdr/didstore/integration_test.go @@ -25,8 +25,8 @@ import ( "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/vdr/didstore/interface.go b/vdr/didstore/interface.go index 962c1f7565..cacb0299f2 100644 --- a/vdr/didstore/interface.go +++ b/vdr/didstore/interface.go @@ -20,7 +20,7 @@ package didstore import ( "github.com/nuts-foundation/go-did/did" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // Store is the interface that groups all low level VDR DID storage operations. diff --git a/vdr/didstore/metadata.go b/vdr/didstore/metadata.go index 6c44b0e5f7..8298b95028 100644 --- a/vdr/didstore/metadata.go +++ b/vdr/didstore/metadata.go @@ -21,8 +21,8 @@ package didstore import ( "time" - "github.com/nuts-foundation/nuts-node/crypto/hash" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // documentMetadata is like VDR documentMetadata but usable for storage diff --git a/vdr/didstore/metadata_test.go b/vdr/didstore/metadata_test.go index d0a32f7454..bb297f2c7d 100644 --- a/vdr/didstore/metadata_test.go +++ b/vdr/didstore/metadata_test.go @@ -19,7 +19,7 @@ package didstore import ( - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/vdr/didstore/mock.go b/vdr/didstore/mock.go index c2e4253876..3c90759792 100644 --- a/vdr/didstore/mock.go +++ b/vdr/didstore/mock.go @@ -8,7 +8,7 @@ import ( reflect "reflect" did "github.com/nuts-foundation/go-did/did" - types "github.com/nuts-foundation/nuts-node/vdr/types" + types "github.com/nuts-foundation/nuts-node/v5/vdr/types" gomock "go.uber.org/mock/gomock" ) diff --git a/vdr/didstore/reader.go b/vdr/didstore/reader.go index 4ce84d4dc4..06eb4efb60 100644 --- a/vdr/didstore/reader.go +++ b/vdr/didstore/reader.go @@ -22,8 +22,8 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-stoabs" diff --git a/vdr/didstore/reader_test.go b/vdr/didstore/reader_test.go index 42fc00e1eb..cb149c7fc0 100644 --- a/vdr/didstore/reader_test.go +++ b/vdr/didstore/reader_test.go @@ -23,8 +23,8 @@ import ( "encoding/json" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/vdr/didstore/store.go b/vdr/didstore/store.go index c44f55213c..e8b3278bb8 100644 --- a/vdr/didstore/store.go +++ b/vdr/didstore/store.go @@ -26,9 +26,9 @@ import ( "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/storage" - vdr "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/storage" + vdr "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // shelfs have a V2 postfix due to overlapping names with previous implementation diff --git a/vdr/didstore/store_test.go b/vdr/didstore/store_test.go index 1c1f53eed0..ea3913b9f6 100644 --- a/vdr/didstore/store_test.go +++ b/vdr/didstore/store_test.go @@ -28,8 +28,8 @@ import ( "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-stoabs" "github.com/nuts-foundation/go-stoabs/redis7" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/redis/go-redis/v9" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/vdr/didstore/test.go b/vdr/didstore/test.go index 29239dc2a4..a55de0af5a 100644 --- a/vdr/didstore/test.go +++ b/vdr/didstore/test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/test/io" "github.com/stretchr/testify/require" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" diff --git a/vdr/didstore/writer.go b/vdr/didstore/writer.go index ce6673454e..726dd737d5 100644 --- a/vdr/didstore/writer.go +++ b/vdr/didstore/writer.go @@ -25,7 +25,7 @@ import ( "fmt" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ) func writeEventList(tx stoabs.WriteTx, newEventList eventList, id did.DID) error { diff --git a/vdr/didstore/writer_test.go b/vdr/didstore/writer_test.go index 7602f22c2c..80d259225d 100644 --- a/vdr/didstore/writer_test.go +++ b/vdr/didstore/writer_test.go @@ -25,7 +25,7 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vdr/integration_test.go b/vdr/integration_test.go index 0c0653abbf..9abe627120 100644 --- a/vdr/integration_test.go +++ b/vdr/integration_test.go @@ -22,8 +22,8 @@ import ( "context" "encoding/json" "fmt" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/pki" + "github.com/nuts-foundation/nuts-node/v5/audit" + "github.com/nuts-foundation/nuts-node/v5/pki" "net/url" "sync" "testing" @@ -31,18 +31,18 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/events" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/network/dag" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/test/io" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/events" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/network/dag" + "github.com/nuts-foundation/nuts-node/v5/storage" + "github.com/nuts-foundation/nuts-node/v5/test" + "github.com/nuts-foundation/nuts-node/v5/test/io" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/vdr/log/logger.go b/vdr/log/logger.go index 02d098daeb..eaf4e9bcaa 100644 --- a/vdr/log/logger.go +++ b/vdr/log/logger.go @@ -19,7 +19,7 @@ package log import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v5/core" "github.com/sirupsen/logrus" ) diff --git a/vdr/test.go b/vdr/test.go index 4589fcb78c..a99604f669 100644 --- a/vdr/test.go +++ b/vdr/test.go @@ -20,8 +20,8 @@ package vdr import ( "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/util" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/util" ) // Two TestDIDs which can be used during testing: diff --git a/vdr/types/common.go b/vdr/types/common.go index 8661cc8864..2b4731c4f7 100644 --- a/vdr/types/common.go +++ b/vdr/types/common.go @@ -23,7 +23,7 @@ import ( "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ) // ErrKeyNotFound is returned when a particular key or type of key is not found. diff --git a/vdr/types/common_test.go b/vdr/types/common_test.go index a40db4d924..d03d0270e6 100644 --- a/vdr/types/common_test.go +++ b/vdr/types/common_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" "github.com/stretchr/testify/assert" ) diff --git a/vdr/types/interface.go b/vdr/types/interface.go index dd3c33675e..21bc965beb 100644 --- a/vdr/types/interface.go +++ b/vdr/types/interface.go @@ -25,8 +25,8 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - crypto2 "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" + crypto2 "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ) // DocResolver is the interface that groups all the DID Document read methods diff --git a/vdr/types/mock.go b/vdr/types/mock.go index cbdbe1e8ff..2d64649ef7 100644 --- a/vdr/types/mock.go +++ b/vdr/types/mock.go @@ -12,8 +12,8 @@ import ( ssi "github.com/nuts-foundation/go-did" did "github.com/nuts-foundation/go-did/did" - crypto0 "github.com/nuts-foundation/nuts-node/crypto" - hash "github.com/nuts-foundation/nuts-node/crypto/hash" + crypto0 "github.com/nuts-foundation/nuts-node/v5/crypto" + hash "github.com/nuts-foundation/nuts-node/v5/crypto/hash" gomock "go.uber.org/mock/gomock" ) diff --git a/vdr/validators.go b/vdr/validators.go index 5f96817b9a..3d27b13dec 100644 --- a/vdr/validators.go +++ b/vdr/validators.go @@ -21,13 +21,13 @@ package vdr import ( "errors" "fmt" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v5/network/transport" "github.com/lestrrat-go/jwx/jwk" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) // NetworkDocumentValidator creates a DID Document validator that checks for inconsistencies in the DID Document: diff --git a/vdr/validators_test.go b/vdr/validators_test.go index 60b9898719..00a0d05463 100644 --- a/vdr/validators_test.go +++ b/vdr/validators_test.go @@ -23,12 +23,12 @@ import ( "crypto/elliptic" "crypto/rand" "errors" - "github.com/nuts-foundation/nuts-node/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" "testing" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/vdr/vdr.go b/vdr/vdr.go index ec97258958..1dc7d20cc2 100644 --- a/vdr/vdr.go +++ b/vdr/vdr.go @@ -28,18 +28,18 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/events" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/log" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/core" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/events" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/log" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" ) var _ types.VDR = (*VDR)(nil) diff --git a/vdr/vdr_test.go b/vdr/vdr_test.go index b88991948e..34469cd6a0 100644 --- a/vdr/vdr_test.go +++ b/vdr/vdr_test.go @@ -22,17 +22,17 @@ import ( "context" "encoding/json" "errors" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v5/audit" "testing" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/vdr/didservice" - "github.com/nuts-foundation/nuts-node/vdr/didstore" - "github.com/nuts-foundation/nuts-node/vdr/types" + "github.com/nuts-foundation/nuts-node/v5/crypto" + "github.com/nuts-foundation/nuts-node/v5/crypto/hash" + "github.com/nuts-foundation/nuts-node/v5/network" + "github.com/nuts-foundation/nuts-node/v5/vdr/didservice" + "github.com/nuts-foundation/nuts-node/v5/vdr/didstore" + "github.com/nuts-foundation/nuts-node/v5/vdr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock"