From 6b40ecb99889555131846c45fe6b563f96c1985d Mon Sep 17 00:00:00 2001 From: Steven van der Vegt Date: Wed, 9 Sep 2026 10:10:12 +0200 Subject: [PATCH 1/8] build: add /v6 major version suffix to the module path Rewritten with "gomajor path -version v6". Refs #4485 Assisted-by: AI --- api/ssi_types_test.go | 6 +- audit/audit.go | 2 +- audit/http.go | 2 +- audit/http_test.go | 2 +- auth/api/auth/v1/api.go | 18 ++-- auth/api/auth/v1/api_test.go | 28 +++--- auth/api/auth/v1/client/client.go | 4 +- auth/api/auth/v1/client/client_test.go | 4 +- auth/api/auth/v1/client/types.go | 2 +- auth/api/auth/v1/types.go | 2 +- auth/api/iam/access_token.go | 10 +-- auth/api/iam/api.go | 40 ++++----- auth/api/iam/api_test.go | 52 +++++------ auth/api/iam/dpop.go | 12 +-- auth/api/iam/dpop_test.go | 6 +- auth/api/iam/integration_test.go | 12 +-- auth/api/iam/jar.go | 10 +-- auth/api/iam/jar_mock.go | 2 +- auth/api/iam/jar_test.go | 14 +-- auth/api/iam/jwtbearer_integration_test.go | 4 +- auth/api/iam/metadata.go | 8 +- auth/api/iam/metadata_test.go | 8 +- auth/api/iam/openid4vci.go | 14 +-- auth/api/iam/openid4vci_test.go | 10 +-- auth/api/iam/openid4vp.go | 26 +++--- auth/api/iam/openid4vp_test.go | 16 ++-- auth/api/iam/pkce_util.go | 2 +- auth/api/iam/s2s_vptoken.go | 10 +-- auth/api/iam/s2s_vptoken_test.go | 12 +-- auth/api/iam/session.go | 6 +- auth/api/iam/session_test.go | 2 +- auth/api/iam/types.go | 6 +- auth/api/iam/user.go | 14 +-- auth/api/iam/user_test.go | 14 +-- auth/api/iam/validation.go | 6 +- auth/api/means/v1/api.go | 4 +- auth/auth.go | 42 ++++----- auth/auth_test.go | 12 +-- auth/client/iam/client.go | 14 +-- auth/client/iam/client_test.go | 18 ++-- auth/client/iam/interface.go | 4 +- auth/client/iam/mock.go | 4 +- auth/client/iam/openid4vp.go | 24 +++--- auth/client/iam/openid4vp_test.go | 28 +++--- auth/client/iam/pd_resolver.go | 8 +- auth/client/iam/pd_resolver_test.go | 6 +- auth/client/iam/profile_validation.go | 6 +- auth/client/iam/profile_validation_test.go | 6 +- auth/cmd/cmd.go | 2 +- auth/cmd/cmd_test.go | 4 +- auth/config.go | 6 +- auth/config_test.go | 2 +- auth/interface.go | 8 +- auth/log/logger.go | 2 +- auth/mock.go | 8 +- auth/oauth/error.go | 4 +- auth/oauth/error_test.go | 2 +- auth/oauth/metadata.go | 2 +- auth/oauth/metadata_test.go | 2 +- auth/oauth/openid.go | 2 +- auth/oauth/types_test.go | 2 +- auth/openid4vci/client.go | 4 +- auth/openid4vci/client_test.go | 2 +- auth/openid4vci/types.go | 2 +- auth/services/dummy/dummy.go | 4 +- auth/services/dummy/dummy_test.go | 4 +- auth/services/irma/factory.go | 4 +- auth/services/irma/irmacontract.go | 6 +- auth/services/irma/irmacontract_test.go | 6 +- auth/services/irma/signer.go | 8 +- auth/services/irma/signer_test.go | 8 +- auth/services/irma/validator.go | 6 +- auth/services/irma/validator_test.go | 8 +- auth/services/mock.go | 4 +- auth/services/notary/notary.go | 22 ++--- auth/services/notary/notary_test.go | 16 ++-- auth/services/oauth/authz_server.go | 26 +++--- auth/services/oauth/authz_server_test.go | 24 +++--- auth/services/oauth/interface.go | 4 +- auth/services/oauth/mock.go | 4 +- auth/services/oauth/relying_party.go | 22 ++--- auth/services/oauth/relying_party_test.go | 20 ++--- auth/services/selfsigned/signer.go | 20 ++--- auth/services/selfsigned/signer_test.go | 14 +-- auth/services/selfsigned/store.go | 2 +- auth/services/selfsigned/store_test.go | 2 +- .../services/selfsigned/test/generate_test.go | 14 +-- auth/services/selfsigned/types/types.go | 2 +- auth/services/selfsigned/validator.go | 12 +-- auth/services/selfsigned/validator_test.go | 24 +++--- auth/services/selfsigned/web/handler.go | 8 +- auth/services/selfsigned/web/handler_test.go | 6 +- auth/services/services.go | 4 +- auth/services/test.go | 2 +- auth/test.go | 10 +-- cmd/root.go | 86 +++++++++---------- cmd/root_test.go | 4 +- core/client_config_test.go | 2 +- core/status/cmd.go | 2 +- core/status/cmd_test.go | 4 +- core/status/engine.go | 2 +- core/status/engine_test.go | 6 +- core/tls_test.go | 2 +- crypto/api/v1/api.go | 8 +- crypto/api/v1/api_test.go | 8 +- crypto/api/v1/generated_test.go | 2 +- crypto/cmd/cmd.go | 16 ++-- crypto/cmd/cmd_test.go | 6 +- crypto/crypto.go | 20 ++--- crypto/crypto_test.go | 14 +-- crypto/dpop.go | 2 +- crypto/dpop/dpop.go | 4 +- crypto/dpop_test.go | 6 +- crypto/ecies_test.go | 2 +- crypto/interface.go | 4 +- crypto/jwx.go | 8 +- crypto/jwx_test.go | 10 +-- crypto/log/logger.go | 2 +- crypto/memory.go | 2 +- crypto/memory_test.go | 2 +- crypto/mock.go | 4 +- crypto/storage/azure/keyvault.go | 6 +- crypto/storage/azure/keyvault_test.go | 2 +- crypto/storage/external/client.go | 8 +- crypto/storage/external/client_test.go | 6 +- crypto/storage/fs/fs.go | 8 +- crypto/storage/fs/fs_test.go | 6 +- crypto/storage/spi/interface.go | 2 +- crypto/storage/spi/mock.go | 2 +- crypto/storage/spi/wrapper.go | 2 +- crypto/storage/vault/vault.go | 10 +-- crypto/storage/vault/vault_test.go | 4 +- crypto/test.go | 8 +- crypto/util/pem_test.go | 2 +- didman/api/v1/api.go | 10 +-- didman/api/v1/api_test.go | 10 +-- didman/api/v1/client.go | 2 +- didman/api/v1/client_test.go | 4 +- didman/api/v1/types.go | 2 +- didman/cmd/cmd.go | 4 +- didman/cmd/cmd_test.go | 6 +- didman/didman.go | 14 +-- didman/didman_test.go | 18 ++-- didman/log/logger.go | 2 +- discovery/api/server/api.go | 6 +- discovery/api/server/api_test.go | 2 +- discovery/api/server/client/http.go | 6 +- discovery/api/server/client/http_test.go | 2 +- discovery/api/v1/api.go | 12 +-- discovery/api/v1/api_test.go | 8 +- discovery/api/v1/types.go | 2 +- discovery/client.go | 22 ++--- discovery/client_test.go | 22 ++--- discovery/cmd/cmd.go | 2 +- discovery/definition.go | 4 +- discovery/log/logger.go | 2 +- discovery/module.go | 18 ++-- discovery/module_test.go | 22 ++--- discovery/store.go | 6 +- discovery/store_test.go | 4 +- discovery/test.go | 8 +- docs/generate_docs.go | 4 +- e2e-tests/browser/client/iam/types.go | 6 +- .../openid4vp_employeecredential/main_test.go | 8 +- .../openid4vp_employeecredential/openid4vp.go | 2 +- .../rfc019_selfsigned/apps/selfsigned.go | 6 +- .../browser/rfc019_selfsigned/main_test.go | 8 +- e2e-tests/browser/util.go | 4 +- e2e-tests/migration/main_test.go | 6 +- echo/echo_integration_test.go | 2 +- events/cmd/cmd.go | 2 +- events/conn.go | 2 +- events/event.go | 2 +- events/integration_test.go | 6 +- events/log/logger.go | 2 +- events/test.go | 6 +- events/types.go | 2 +- events/types_test.go | 2 +- go.mod | 2 +- golden_hammer/cmd/cmd.go | 2 +- golden_hammer/log/logger.go | 2 +- golden_hammer/module.go | 20 ++--- golden_hammer/module_test.go | 18 ++-- http/client/caching.go | 2 +- http/client/caching_test.go | 2 +- http/client/client.go | 4 +- http/client/client_test.go | 2 +- http/client/ssrf_test.go | 2 +- http/cmd/cmd.go | 2 +- http/echo.go | 2 +- http/engine.go | 14 +-- http/engine_test.go | 8 +- http/log/logger.go | 2 +- http/requestlogger.go | 2 +- http/requestlogger_test.go | 4 +- http/tokenV2/authorized_keys.go | 2 +- http/tokenV2/middleware.go | 6 +- http/tokenV2/middleware_test.go | 4 +- http/user/session.go | 6 +- http/user/session_test.go | 2 +- jsonld/jsonld.go | 4 +- jsonld/jsonld_test.go | 2 +- jsonld/ldutils.go | 4 +- jsonld/log/logger.go | 2 +- jsonld/test.go | 2 +- jsonld/testsuite/compat_test.go | 12 +-- main.go | 2 +- main_test.go | 22 ++--- network/api/v1/api.go | 12 +-- network/api/v1/api_test.go | 10 +-- network/api/v1/client.go | 8 +- network/api/v1/client_test.go | 8 +- network/api/v1/types.go | 2 +- network/cmd/cmd.go | 12 +-- network/cmd/cmd_test.go | 10 +-- network/config.go | 2 +- network/dag/consistency.go | 4 +- network/dag/consistency_test.go | 10 +-- network/dag/dag.go | 6 +- network/dag/dag_test.go | 4 +- network/dag/interface.go | 6 +- network/dag/keys.go | 4 +- network/dag/keys_test.go | 4 +- network/dag/mock.go | 6 +- network/dag/notifier.go | 8 +- network/dag/notifier_mock.go | 2 +- network/dag/notifier_test.go | 10 +-- network/dag/pal.go | 8 +- network/dag/pal_test.go | 6 +- network/dag/parser.go | 2 +- network/dag/parser_test.go | 2 +- network/dag/payloadstore.go | 4 +- network/dag/payloadstore_test.go | 4 +- network/dag/signing.go | 2 +- network/dag/signing_test.go | 6 +- network/dag/state.go | 8 +- network/dag/state_test.go | 10 +-- network/dag/test.go | 8 +- network/dag/transaction.go | 2 +- network/dag/transaction_test.go | 2 +- network/dag/tree/benchmark_test.go | 2 +- network/dag/tree/iblt.go | 2 +- network/dag/tree/iblt_test.go | 2 +- network/dag/tree/tree.go | 2 +- network/dag/tree/tree_test.go | 2 +- network/dag/tree/xor.go | 2 +- network/dag/tree/xor_test.go | 2 +- network/dag/treestore.go | 2 +- network/dag/treestore_test.go | 4 +- network/dag/verifier.go | 2 +- network/dag/verifier_test.go | 8 +- network/interface.go | 6 +- network/log/logger.go | 2 +- network/mock.go | 6 +- network/network.go | 26 +++--- network/network_integration_test.go | 34 ++++---- network/network_test.go | 28 +++--- network/subscriber.go | 4 +- network/test.go | 14 +-- network/transport/connection_manager.go | 2 +- network/transport/connection_manager_mock.go | 2 +- network/transport/grpc/addressbook.go | 2 +- network/transport/grpc/addressbook_test.go | 4 +- network/transport/grpc/authenticator.go | 8 +- network/transport/grpc/authenticator_mock.go | 2 +- network/transport/grpc/authenticator_test.go | 4 +- network/transport/grpc/backoff.go | 2 +- network/transport/grpc/backoff_test.go | 2 +- network/transport/grpc/config.go | 6 +- network/transport/grpc/config_test.go | 8 +- network/transport/grpc/connection.go | 6 +- network/transport/grpc/connection_list.go | 4 +- .../transport/grpc/connection_list_test.go | 2 +- network/transport/grpc/connection_manager.go | 6 +- .../transport/grpc/connection_manager_test.go | 14 +-- network/transport/grpc/connection_mock.go | 2 +- network/transport/grpc/connection_test.go | 4 +- network/transport/grpc/interface.go | 2 +- network/transport/grpc/interface_mock.go | 4 +- network/transport/grpc/predicate.go | 2 +- network/transport/grpc/stats.go | 2 +- network/transport/grpc/stats_test.go | 2 +- network/transport/grpc/test.go | 2 +- .../transport/grpc/testprotocol_impl.pb.go | 4 +- network/transport/grpc/tls_offloading.go | 6 +- network/transport/grpc/tls_offloading_test.go | 2 +- network/transport/grpc/util.go | 2 +- network/transport/protocol.go | 2 +- network/transport/protocol_mock.go | 2 +- network/transport/types.go | 2 +- network/transport/types_test.go | 2 +- network/transport/v2/conversation.go | 6 +- network/transport/v2/conversation_test.go | 6 +- network/transport/v2/gossip/manager.go | 8 +- network/transport/v2/gossip/manager_test.go | 4 +- network/transport/v2/gossip/mock.go | 4 +- network/transport/v2/gossip/queue.go | 2 +- network/transport/v2/gossip/queue_test.go | 4 +- network/transport/v2/gossip/set.go | 2 +- network/transport/v2/gossip/set_test.go | 2 +- network/transport/v2/handlers.go | 12 +-- network/transport/v2/handlers_test.go | 10 +-- network/transport/v2/peer_diagnostics.go | 2 +- network/transport/v2/peer_diagnostics_test.go | 4 +- network/transport/v2/protocol.go | 18 ++-- .../transport/v2/protocol_integration_test.go | 22 ++--- network/transport/v2/protocol_test.go | 18 ++-- network/transport/v2/senders.go | 12 +-- network/transport/v2/senders_mock.go | 8 +- network/transport/v2/senders_test.go | 10 +-- .../transport/v2/transactionlist_handler.go | 8 +- .../v2/transactionlist_handler_test.go | 10 +-- network/tx.go | 4 +- pki/interface.go | 2 +- pki/logger.go | 2 +- pki/mock.go | 2 +- pki/pki.go | 2 +- pki/pki_test.go | 2 +- pki/validator.go | 2 +- pki/validator_test.go | 2 +- policy/authzen/client.go | 2 +- policy/interface.go | 4 +- policy/local.go | 10 +-- policy/local_test.go | 4 +- policy/mock.go | 2 +- policy/scope_granter.go | 4 +- policy/scope_granter_test.go | 4 +- storage/bbolt.go | 4 +- storage/bbolt_test.go | 4 +- storage/cmd/cmd.go | 2 +- storage/engine.go | 8 +- storage/engine_azuresql_test.go | 2 +- storage/engine_test.go | 4 +- storage/interface.go | 2 +- storage/leia.go | 4 +- storage/leia_test.go | 4 +- storage/log/logger.go | 2 +- storage/mock.go | 2 +- storage/orm/did_document.go | 2 +- storage/orm/test.go | 2 +- storage/rds_iam.go | 2 +- storage/redis.go | 4 +- storage/test.go | 4 +- test/http/server.go | 2 +- test/node/server.go | 10 +-- test/pki/test.go | 2 +- tracing/cmd/cmd.go | 2 +- tracing/engine.go | 2 +- tracing/engine_test.go | 2 +- vcr/ambassador.go | 18 ++-- vcr/ambassador_test.go | 24 +++--- vcr/api/openid4vci/v0/api.go | 14 +-- vcr/api/openid4vci/v0/api_test.go | 2 +- vcr/api/openid4vci/v0/holder.go | 6 +- vcr/api/openid4vci/v0/holder_test.go | 10 +-- vcr/api/openid4vci/v0/issuer.go | 6 +- vcr/api/openid4vci/v0/issuer_test.go | 12 +-- vcr/api/openid4vci/v0/types.go | 2 +- vcr/api/vcr/v2/api.go | 24 +++--- vcr/api/vcr/v2/api_test.go | 24 +++--- vcr/api/vcr/v2/client.go | 2 +- vcr/api/vcr/v2/client_test.go | 4 +- vcr/api/vcr/v2/registry.go | 8 +- vcr/api/vcr/v2/registry_test.go | 6 +- vcr/api/vcr/v2/types.go | 2 +- vcr/cmd/cmd.go | 8 +- vcr/cmd/cmd_test.go | 6 +- vcr/config.go | 2 +- vcr/context_test.go | 8 +- vcr/credential/resolver.go | 6 +- vcr/credential/resolver_test.go | 4 +- vcr/credential/revocation_test.go | 2 +- vcr/credential/store/sql_test.go | 2 +- vcr/credential/util_test.go | 4 +- vcr/credential/validator.go | 10 +-- vcr/credential/validator_test.go | 10 +-- vcr/holder/interface.go | 6 +- vcr/holder/memory_wallet.go | 8 +- vcr/holder/mock.go | 4 +- vcr/holder/openid.go | 16 ++-- vcr/holder/openid_mock.go | 2 +- vcr/holder/openid_test.go | 14 +-- vcr/holder/presenter.go | 14 +-- vcr/holder/presenter_test.go | 26 +++--- vcr/holder/sql_wallet.go | 26 +++--- vcr/holder/sql_wallet_test.go | 20 ++--- vcr/interface.go | 8 +- vcr/issuer/interface.go | 4 +- vcr/issuer/issuer.go | 26 +++--- vcr/issuer/issuer_test.go | 32 +++---- vcr/issuer/leia_store.go | 10 +-- vcr/issuer/leia_store_test.go | 8 +- vcr/issuer/mock.go | 4 +- vcr/issuer/network_publisher.go | 16 ++-- vcr/issuer/network_publisher_test.go | 14 +-- vcr/issuer/openid.go | 16 ++-- vcr/issuer/openid_mock.go | 2 +- vcr/issuer/openid_store.go | 2 +- vcr/issuer/openid_store_test.go | 2 +- vcr/issuer/openid_test.go | 12 +-- vcr/issuer/sql_store.go | 10 +-- vcr/issuer/sql_store_test.go | 10 +-- vcr/log/log.go | 2 +- vcr/mock.go | 6 +- vcr/openid4vci/identifiers.go | 8 +- vcr/openid4vci/identifiers_test.go | 4 +- vcr/openid4vci/issuer_client.go | 6 +- vcr/openid4vci/issuer_client_mock.go | 2 +- vcr/openid4vci/test.go | 4 +- vcr/openid4vci/wallet_client.go | 2 +- vcr/pe/presentation_definition.go | 2 +- vcr/pe/presentation_definition_test.go | 6 +- vcr/pe/presentation_submission.go | 4 +- vcr/pe/presentation_submission_test.go | 4 +- vcr/pe/selector_test.go | 2 +- vcr/pe/submission_requirement_test.go | 2 +- vcr/pe/util_test.go | 2 +- vcr/revocation/statuslist2021_issuer.go | 10 +-- vcr/revocation/statuslist2021_issuer_test.go | 8 +- vcr/revocation/statuslist2021_verifier.go | 6 +- .../statuslist2021_verifier_test.go | 4 +- vcr/revocation/types.go | 8 +- vcr/revocation/types_test.go | 4 +- vcr/search.go | 4 +- vcr/search_test.go | 6 +- vcr/signature/json_web_signature.go | 6 +- vcr/signature/json_web_signature_test.go | 6 +- vcr/signature/proof/jsonld.go | 6 +- vcr/signature/proof/jsonld_test.go | 8 +- vcr/signature/proof/proof.go | 2 +- vcr/store.go | 8 +- vcr/store_test.go | 6 +- vcr/test.go | 30 +++---- vcr/test/credentials.go | 6 +- vcr/test/formats_integration_test.go | 8 +- vcr/test/openid4vci_integration_test.go | 22 ++--- vcr/test/test.go | 8 +- vcr/trust/trust_test.go | 2 +- vcr/vcr.go | 40 ++++----- vcr/vcr_test.go | 28 +++--- vcr/verifier/interface.go | 4 +- vcr/verifier/leia_store.go | 8 +- vcr/verifier/leia_store_test.go | 4 +- vcr/verifier/mock.go | 4 +- vcr/verifier/signature_verifier.go | 14 +-- vcr/verifier/signature_verifier_test.go | 16 ++-- vcr/verifier/verifier.go | 20 ++--- vcr/verifier/verifier_test.go | 30 +++---- vdr/api/v1/api.go | 14 +-- vdr/api/v1/api_test.go | 18 ++-- vdr/api/v1/client.go | 2 +- vdr/api/v1/client_test.go | 8 +- vdr/api/v1/types.go | 4 +- vdr/api/v2/api.go | 18 ++-- vdr/api/v2/api_test.go | 12 +-- vdr/api/v2/client.go | 2 +- vdr/api/v2/client_test.go | 6 +- vdr/api/v2/types.go | 2 +- vdr/cmd/cmd.go | 12 +-- vdr/cmd/cmd_test.go | 10 +-- vdr/did_owner.go | 6 +- vdr/did_owner_test.go | 8 +- vdr/didjwk/resolver.go | 2 +- vdr/didkey/resolver.go | 2 +- vdr/didnuts/ambassador.go | 16 ++-- vdr/didnuts/ambassador_test.go | 20 ++--- vdr/didnuts/didstore/event.go | 2 +- vdr/didnuts/didstore/event_test.go | 2 +- vdr/didnuts/didstore/finder.go | 2 +- vdr/didnuts/didstore/finder_test.go | 2 +- vdr/didnuts/didstore/integration_test.go | 4 +- vdr/didnuts/didstore/interface.go | 4 +- vdr/didnuts/didstore/merge.go | 2 +- vdr/didnuts/didstore/metadata.go | 4 +- vdr/didnuts/didstore/metadata_test.go | 2 +- vdr/didnuts/didstore/mock.go | 4 +- vdr/didnuts/didstore/reader.go | 4 +- vdr/didnuts/didstore/reader_test.go | 4 +- vdr/didnuts/didstore/store.go | 12 +-- vdr/didnuts/didstore/store_test.go | 6 +- vdr/didnuts/didstore/test.go | 6 +- vdr/didnuts/didstore/writer.go | 2 +- vdr/didnuts/didstore/writer_test.go | 2 +- vdr/didnuts/manager.go | 24 +++--- vdr/didnuts/manager_test.go | 18 ++-- vdr/didnuts/resolver.go | 4 +- vdr/didnuts/resolver_test.go | 4 +- vdr/didnuts/validators.go | 4 +- vdr/didnuts/validators_test.go | 2 +- vdr/didsubject/did.go | 2 +- vdr/didsubject/did_document.go | 2 +- vdr/didsubject/did_document_test.go | 2 +- vdr/didsubject/interface.go | 2 +- vdr/didsubject/manager.go | 12 +-- vdr/didsubject/manager_test.go | 10 +-- vdr/didsubject/mock.go | 2 +- vdr/didsubject/resolver.go | 2 +- vdr/didsubject/resolver_test.go | 4 +- vdr/didsubject/test.go | 2 +- vdr/didweb/manager.go | 6 +- vdr/didweb/manager_test.go | 6 +- vdr/didweb/test.go | 2 +- vdr/didweb/web.go | 8 +- vdr/didweb/web_test.go | 2 +- vdr/didx509/resolver.go | 4 +- vdr/didx509/resolver_test.go | 4 +- vdr/didx509/x509_utils_test.go | 2 +- vdr/interface.go | 4 +- vdr/legacy_integration_test.go | 30 +++---- vdr/log/logger.go | 2 +- vdr/mock.go | 4 +- vdr/resolver/did.go | 2 +- vdr/resolver/did_test.go | 2 +- vdr/resolver/key.go | 2 +- vdr/resolver/key_mock.go | 2 +- vdr/resolver/service_test.go | 2 +- vdr/test.go | 4 +- vdr/vdr.go | 32 +++---- vdr/vdr_test.go | 24 +++--- 519 files changed, 1911 insertions(+), 1911 deletions(-) diff --git a/api/ssi_types_test.go b/api/ssi_types_test.go index c9db8bb4f1..e7acf0712b 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" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + vcr "github.com/nuts-foundation/nuts-node/v6/vcr/api/vcr/v2" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) const ( diff --git a/audit/audit.go b/audit/audit.go index fdfc8b5b41..c795d3798d 100644 --- a/audit/audit.go +++ b/audit/audit.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/nuts-foundation/nuts-node/tracing" + "github.com/nuts-foundation/nuts-node/v6/tracing" "github.com/sirupsen/logrus" ) diff --git a/audit/http.go b/audit/http.go index 43edf4e28e..deefce52b3 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/v6/core" "strings" ) diff --git a/audit/http_test.go b/audit/http_test.go index 53bdf761c8..cf8bb5ed45 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/v6/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 0d79c9d4a5..751f8e77e5 100644 --- a/auth/api/auth/v1/api.go +++ b/auth/api/auth/v1/api.go @@ -22,8 +22,8 @@ import ( "context" "encoding/json" "fmt" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" "net/http" "net/url" "regexp" @@ -32,17 +32,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/v6/auth/api/auth/v1/client" + "github.com/nuts-foundation/nuts-node/v6/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/v6/auth" + "github.com/nuts-foundation/nuts-node/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/core" ) var _ StrictServerInterface = (*Wrapper)(nil) diff --git a/auth/api/auth/v1/api_test.go b/auth/api/auth/v1/api_test.go index a4970f89ad..e80fcf0250 100644 --- a/auth/api/auth/v1/api_test.go +++ b/auth/api/auth/v1/api_test.go @@ -24,20 +24,20 @@ 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/client/iam" - "github.com/nuts-foundation/nuts-node/auth/contract" - oauth2 "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/auth/openid4vci" - "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/core/to" - "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/v6/audit" + pkg2 "github.com/nuts-foundation/nuts-node/v6/auth" + "github.com/nuts-foundation/nuts-node/v6/auth/client/iam" + "github.com/nuts-foundation/nuts-node/v6/auth/contract" + oauth2 "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/auth/services/dummy" + "github.com/nuts-foundation/nuts-node/v6/auth/services/oauth" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/core/to" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/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 2faa4e874e..b08c28876a 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/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/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..d3fc0b5256 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/v6/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/v6/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 3fc498f28f..ae2d7a930a 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/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" ) // 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 55d2024e2b..4e44b4aa70 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/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" ) // VerifiableCredential is an alias to use from within the API diff --git a/auth/api/iam/access_token.go b/auth/api/iam/access_token.go index 9fb0720949..06c2671eae 100644 --- a/auth/api/iam/access_token.go +++ b/auth/api/iam/access_token.go @@ -20,13 +20,13 @@ package iam import ( "fmt" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/core/to" - "github.com/nuts-foundation/nuts-node/crypto" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/core/to" + "github.com/nuts-foundation/nuts-node/v6/crypto" "time" - "github.com/nuts-foundation/nuts-node/crypto/dpop" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/crypto/dpop" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" ) type AccessToken struct { diff --git a/auth/api/iam/api.go b/auth/api/iam/api.go index 3ce7eb578e..97e3d372d1 100644 --- a/auth/api/iam/api.go +++ b/auth/api/iam/api.go @@ -36,31 +36,31 @@ import ( "strings" "time" - "github.com/nuts-foundation/nuts-node/core/to" + "github.com/nuts-foundation/nuts-node/v6/core/to" "github.com/labstack/echo/v4" "github.com/lestrrat-go/jwx/v3/jwk" "github.com/lestrrat-go/jwx/v3/jwt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/auth" - "github.com/nuts-foundation/nuts-node/auth/api/iam/assets" - iamclient "github.com/nuts-foundation/nuts-node/auth/client/iam" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/auth/openid4vci" - "github.com/nuts-foundation/nuts-node/core" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - nutsHttp "github.com/nuts-foundation/nuts-node/http" - "github.com/nuts-foundation/nuts-node/http/cache" - "github.com/nuts-foundation/nuts-node/http/user" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/policy" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/pe" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/auth" + "github.com/nuts-foundation/nuts-node/v6/auth/api/iam/assets" + iamclient "github.com/nuts-foundation/nuts-node/v6/auth/client/iam" + "github.com/nuts-foundation/nuts-node/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/core" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + nutsHttp "github.com/nuts-foundation/nuts-node/v6/http" + "github.com/nuts-foundation/nuts-node/v6/http/cache" + "github.com/nuts-foundation/nuts-node/v6/http/user" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/policy" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) var _ core.Routable = &Wrapper{} diff --git a/auth/api/iam/api_test.go b/auth/api/iam/api_test.go index 41c39b3782..d6e4a638a5 100644 --- a/auth/api/iam/api_test.go +++ b/auth/api/iam/api_test.go @@ -39,32 +39,32 @@ 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/auth" - "github.com/nuts-foundation/nuts-node/auth/client/iam" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/auth/openid4vci" - oauthServices "github.com/nuts-foundation/nuts-node/auth/services/oauth" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/core/to" - cryptoNuts "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - test2 "github.com/nuts-foundation/nuts-node/crypto/test" - "github.com/nuts-foundation/nuts-node/http/user" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/policy" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test" - "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/pe" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vcr/verifier" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/auth" + "github.com/nuts-foundation/nuts-node/v6/auth/client/iam" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/openid4vci" + oauthServices "github.com/nuts-foundation/nuts-node/v6/auth/services/oauth" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/core/to" + cryptoNuts "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + test2 "github.com/nuts-foundation/nuts-node/v6/crypto/test" + "github.com/nuts-foundation/nuts-node/v6/http/user" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/policy" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/api/iam/dpop.go b/auth/api/iam/dpop.go index b690a7c45a..9aa6a9c19d 100644 --- a/auth/api/iam/dpop.go +++ b/auth/api/iam/dpop.go @@ -23,12 +23,12 @@ import ( "encoding/base64" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/dpop" - nutsHash "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/dpop" + nutsHash "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/storage" "net/http" "net/url" ) diff --git a/auth/api/iam/dpop_test.go b/auth/api/iam/dpop_test.go index 1c9f54c160..7881dcac0e 100644 --- a/auth/api/iam/dpop_test.go +++ b/auth/api/iam/dpop_test.go @@ -25,15 +25,15 @@ import ( "crypto/elliptic" "crypto/rand" "encoding/base64" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" "net/http" "testing" "github.com/lestrrat-go/jwx/v3/jwa" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/crypto/dpop" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/crypto/dpop" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/api/iam/integration_test.go b/auth/api/iam/integration_test.go index 4d7282b4c5..68c06ee53e 100644 --- a/auth/api/iam/integration_test.go +++ b/auth/api/iam/integration_test.go @@ -25,12 +25,12 @@ import ( "net/http/httptest" "testing" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/policy" - "github.com/nuts-foundation/nuts-node/policy/authzen" - "github.com/nuts-foundation/nuts-node/vcr/pe" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/policy" + "github.com/nuts-foundation/nuts-node/v6/policy/authzen" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/api/iam/jar.go b/auth/api/iam/jar.go index 50970afff6..7d9174f224 100644 --- a/auth/api/iam/jar.go +++ b/auth/api/iam/jar.go @@ -26,11 +26,11 @@ import ( "github.com/lestrrat-go/jwx/v3/jwk" "github.com/lestrrat-go/jwx/v3/jwt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/auth" - "github.com/nuts-foundation/nuts-node/auth/oauth" - cryptoNuts "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/jwx" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + cryptoNuts "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/jwx" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "net/url" "time" ) diff --git a/auth/api/iam/jar_mock.go b/auth/api/iam/jar_mock.go index a048b78b4e..2ef7ac6145 100644 --- a/auth/api/iam/jar_mock.go +++ b/auth/api/iam/jar_mock.go @@ -15,7 +15,7 @@ import ( reflect "reflect" did "github.com/nuts-foundation/go-did/did" - oauth "github.com/nuts-foundation/nuts-node/auth/oauth" + oauth "github.com/nuts-foundation/nuts-node/v6/auth/oauth" gomock "go.uber.org/mock/gomock" ) diff --git a/auth/api/iam/jar_test.go b/auth/api/iam/jar_test.go index ef039ec8ac..ce5f2d1931 100644 --- a/auth/api/iam/jar_test.go +++ b/auth/api/iam/jar_test.go @@ -24,8 +24,8 @@ import ( "errors" "fmt" "github.com/lestrrat-go/jwx/v3/jwk" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/test" "testing" "time" @@ -33,11 +33,11 @@ import ( "github.com/lestrrat-go/jwx/v3/jws" "github.com/lestrrat-go/jwx/v3/jwt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/auth" - "github.com/nuts-foundation/nuts-node/auth/client/iam" - "github.com/nuts-foundation/nuts-node/auth/oauth" - cryptoNuts "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth" + "github.com/nuts-foundation/nuts-node/v6/auth/client/iam" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + cryptoNuts "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/api/iam/jwtbearer_integration_test.go b/auth/api/iam/jwtbearer_integration_test.go index 51b4774da2..3c70413a1f 100644 --- a/auth/api/iam/jwtbearer_integration_test.go +++ b/auth/api/iam/jwtbearer_integration_test.go @@ -33,8 +33,8 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/test/node" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/test/node" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/auth/api/iam/metadata.go b/auth/api/iam/metadata.go index 578119813b..0aa69662a8 100644 --- a/auth/api/iam/metadata.go +++ b/auth/api/iam/metadata.go @@ -25,10 +25,10 @@ import ( "time" "github.com/lestrrat-go/jwx/v3/jwa" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/core/to" - "github.com/nuts-foundation/nuts-node/crypto/jwx" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/core/to" + "github.com/nuts-foundation/nuts-node/v6/crypto/jwx" ) func authorizationServerMetadata(issuerURL *url.URL, supportedDIDMethods []string) oauth.AuthorizationServerMetadata { diff --git a/auth/api/iam/metadata_test.go b/auth/api/iam/metadata_test.go index 8f325b4576..2fc22e3802 100644 --- a/auth/api/iam/metadata_test.go +++ b/auth/api/iam/metadata_test.go @@ -22,10 +22,10 @@ import ( "net/url" "testing" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/jwx" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/jwx" + "github.com/nuts-foundation/nuts-node/v6/test" "github.com/stretchr/testify/assert" ) diff --git a/auth/api/iam/openid4vci.go b/auth/api/iam/openid4vci.go index 75bf7e5f9a..d2e4fef5b1 100644 --- a/auth/api/iam/openid4vci.go +++ b/auth/api/iam/openid4vci.go @@ -30,13 +30,13 @@ import ( "github.com/lestrrat-go/jwx/v3/jwt" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/auth/openid4vci" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - nutsHttp "github.com/nuts-foundation/nuts-node/http" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + nutsHttp "github.com/nuts-foundation/nuts-node/v6/http" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) var timeFunc = time.Now diff --git a/auth/api/iam/openid4vci_test.go b/auth/api/iam/openid4vci_test.go index b0df988512..23c2e3e208 100644 --- a/auth/api/iam/openid4vci_test.go +++ b/auth/api/iam/openid4vci_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/core/to" + "github.com/nuts-foundation/nuts-node/v6/core/to" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/auth/openid4vci" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/api/iam/openid4vp.go b/auth/api/iam/openid4vp.go index 9747c58a04..ae0c1835da 100644 --- a/auth/api/iam/openid4vp.go +++ b/auth/api/iam/openid4vp.go @@ -24,9 +24,9 @@ import ( "errors" "fmt" - "github.com/nuts-foundation/nuts-node/http/user" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/http/user" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" "net/http" "net/url" @@ -38,16 +38,16 @@ import ( "github.com/lestrrat-go/jwx/v3/jwt" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/crypto" - httpNuts "github.com/nuts-foundation/nuts-node/http" - "github.com/nuts-foundation/nuts-node/network/log" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/holder" - "github.com/nuts-foundation/nuts-node/vcr/pe" - "github.com/nuts-foundation/nuts-node/vdr/didjwk" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/crypto" + httpNuts "github.com/nuts-foundation/nuts-node/v6/http" + "github.com/nuts-foundation/nuts-node/v6/network/log" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vdr/didjwk" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) var oauthNonceKey = []string{"oauth", "nonce"} diff --git a/auth/api/iam/openid4vp_test.go b/auth/api/iam/openid4vp_test.go index cfaed7fc1c..e9116aeadf 100644 --- a/auth/api/iam/openid4vp_test.go +++ b/auth/api/iam/openid4vp_test.go @@ -28,18 +28,18 @@ import ( "strings" "testing" - "github.com/nuts-foundation/nuts-node/http/user" - "github.com/nuts-foundation/nuts-node/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/http/user" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" "github.com/lestrrat-go/jwx/v3/jwt" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/policy" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/vcr/pe" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/policy" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/api/iam/pkce_util.go b/auth/api/iam/pkce_util.go index 1f6d70a8b8..3399fa9bba 100644 --- a/auth/api/iam/pkce_util.go +++ b/auth/api/iam/pkce_util.go @@ -21,7 +21,7 @@ package iam import ( "crypto/sha256" "encoding/base64" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" ) // PKCEParams contains the PKCE parameters so they can be stored in both the client and server side session. diff --git a/auth/api/iam/s2s_vptoken.go b/auth/api/iam/s2s_vptoken.go index c60a879926..b12765f184 100644 --- a/auth/api/iam/s2s_vptoken.go +++ b/auth/api/iam/s2s_vptoken.go @@ -27,11 +27,11 @@ import ( "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/policy" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/policy" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" ) // s2sMaxPresentationValidity defines the maximum validity of a presentation. diff --git a/auth/api/iam/s2s_vptoken_test.go b/auth/api/iam/s2s_vptoken_test.go index f76e1e5c1a..10e1b2435a 100644 --- a/auth/api/iam/s2s_vptoken_test.go +++ b/auth/api/iam/s2s_vptoken_test.go @@ -25,8 +25,8 @@ import ( "crypto/rand" "encoding/json" "errors" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/policy" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/policy" "go.uber.org/mock/gomock" "net/http" "testing" @@ -36,10 +36,10 @@ 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/pe" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/auth/api/iam/session.go b/auth/api/iam/session.go index c7ad01d3ae..1be250358c 100644 --- a/auth/api/iam/session.go +++ b/auth/api/iam/session.go @@ -23,12 +23,12 @@ import ( "fmt" "net/url" - "github.com/nuts-foundation/nuts-node/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/http" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/http" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" ) // OAuthSession is the session object that is used to store information about the OAuth request. diff --git a/auth/api/iam/session_test.go b/auth/api/iam/session_test.go index 0490ccebf3..4ef9281196 100644 --- a/auth/api/iam/session_test.go +++ b/auth/api/iam/session_test.go @@ -20,7 +20,7 @@ package iam import ( "encoding/json" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/auth/api/iam/types.go b/auth/api/iam/types.go index 76ac6e2c9f..a9ac1f9e2b 100644 --- a/auth/api/iam/types.go +++ b/auth/api/iam/types.go @@ -21,9 +21,9 @@ package iam import ( "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/vcr/pe" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) // DIDDocument is an alias diff --git a/auth/api/iam/user.go b/auth/api/iam/user.go index 04f8f0cc61..bb21a8e34e 100644 --- a/auth/api/iam/user.go +++ b/auth/api/iam/user.go @@ -28,13 +28,13 @@ import ( "github.com/labstack/echo/v4" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/http/user" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/http/user" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" ) const ( diff --git a/auth/api/iam/user_test.go b/auth/api/iam/user_test.go index 6c9307005c..9a0e1f855a 100644 --- a/auth/api/iam/user_test.go +++ b/auth/api/iam/user_test.go @@ -20,9 +20,9 @@ package iam import ( "context" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/http/user" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/http/user" "net/http" "strings" "testing" @@ -33,10 +33,10 @@ 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/oauth" - "github.com/nuts-foundation/nuts-node/mock" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/mock" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/api/iam/validation.go b/auth/api/iam/validation.go index 901abe3d35..d562336573 100644 --- a/auth/api/iam/validation.go +++ b/auth/api/iam/validation.go @@ -24,9 +24,9 @@ import ( "fmt" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/policy" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/policy" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" ) // validatePresentationSigner checks if the presenter of the VP is the same as the subject of the VCs being presented. diff --git a/auth/api/means/v1/api.go b/auth/api/means/v1/api.go index 7daa71f433..941d124f22 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/v6/auth" + "github.com/nuts-foundation/nuts-node/v6/core" ) // Wrapper bridges Echo routes to the server backend. diff --git a/auth/auth.go b/auth/auth.go index 742dbef9f9..9df4bccdd1 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -21,32 +21,32 @@ package auth import ( "crypto/tls" "errors" - "github.com/nuts-foundation/nuts-node/auth/client/iam" - "github.com/nuts-foundation/nuts-node/auth/openid4vci" - "github.com/nuts-foundation/nuts-node/policy" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/didjwk" - "github.com/nuts-foundation/nuts-node/vdr/didkey" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/didweb" - "github.com/nuts-foundation/nuts-node/vdr/didx509" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth/client/iam" + "github.com/nuts-foundation/nuts-node/v6/auth/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/policy" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/didjwk" + "github.com/nuts-foundation/nuts-node/v6/vdr/didkey" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/didweb" + "github.com/nuts-foundation/nuts-node/v6/vdr/didx509" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "net/url" "path" "slices" "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" - httpclient "github.com/nuts-foundation/nuts-node/http/client" - "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/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/auth/services/notary" + "github.com/nuts-foundation/nuts-node/v6/auth/services/oauth" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/didman" + httpclient "github.com/nuts-foundation/nuts-node/v6/http/client" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/vcr" ) const contractValidity = 60 * time.Minute diff --git a/auth/auth_test.go b/auth/auth_test.go index 8ae69fbd89..3ee67f59f6 100644 --- a/auth/auth_test.go +++ b/auth/auth_test.go @@ -19,12 +19,12 @@ package auth import ( - "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/pki" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vdr" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vdr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/client/iam/client.go b/auth/client/iam/client.go index a510b37ae6..1b9457a7b2 100644 --- a/auth/client/iam/client.go +++ b/auth/client/iam/client.go @@ -31,15 +31,15 @@ import ( "github.com/lestrrat-go/jwx/v3/jws" "github.com/lestrrat-go/jwx/v3/jwt" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/jwx" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/jwx" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" ) // ErrInvalidClientCall is returned when the node makes a http call as client based on wrong information passed by the client. diff --git a/auth/client/iam/client_test.go b/auth/client/iam/client_test.go index 2b4b758a47..a0ae882765 100644 --- a/auth/client/iam/client_test.go +++ b/auth/client/iam/client_test.go @@ -27,10 +27,10 @@ import ( "github.com/lestrrat-go/jwx/v3/jwk" "github.com/lestrrat-go/jwx/v3/jws" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/audit" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - test2 "github.com/nuts-foundation/nuts-node/crypto/test" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + test2 "github.com/nuts-foundation/nuts-node/v6/crypto/test" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/sirupsen/logrus" logrustest "github.com/sirupsen/logrus/hooks/test" "net/http" @@ -42,11 +42,11 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/test" - http2 "github.com/nuts-foundation/nuts-node/test/http" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/test" + http2 "github.com/nuts-foundation/nuts-node/v6/test/http" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/auth/client/iam/interface.go b/auth/client/iam/interface.go index 1517b83bfa..76e352b94a 100644 --- a/auth/client/iam/interface.go +++ b/auth/client/iam/interface.go @@ -22,8 +22,8 @@ import ( "context" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" ) // Client defines OpenID4VP client methods using the IAM OpenAPI Spec. diff --git a/auth/client/iam/mock.go b/auth/client/iam/mock.go index dac35b1be8..8ea842ce7d 100644 --- a/auth/client/iam/mock.go +++ b/auth/client/iam/mock.go @@ -14,8 +14,8 @@ import ( reflect "reflect" vc "github.com/nuts-foundation/go-did/vc" - oauth "github.com/nuts-foundation/nuts-node/auth/oauth" - pe "github.com/nuts-foundation/nuts-node/vcr/pe" + oauth "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + pe "github.com/nuts-foundation/nuts-node/v6/vcr/pe" gomock "go.uber.org/mock/gomock" ) diff --git a/auth/client/iam/openid4vp.go b/auth/client/iam/openid4vp.go index 55ae7625d0..9b8dc63ab5 100644 --- a/auth/client/iam/openid4vp.go +++ b/auth/client/iam/openid4vp.go @@ -30,22 +30,22 @@ import ( "slices" "time" - "github.com/nuts-foundation/nuts-node/http/client" - "github.com/nuts-foundation/nuts-node/policy" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/http/client" + "github.com/nuts-foundation/nuts-node/v6/policy" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" "github.com/piprate/json-gold/ld" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/auth/oauth" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/dpop" - nutsHttp "github.com/nuts-foundation/nuts-node/http" - "github.com/nuts-foundation/nuts-node/vcr/holder" - "github.com/nuts-foundation/nuts-node/vcr/pe" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/dpop" + nutsHttp "github.com/nuts-foundation/nuts-node/v6/http" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) // ErrPreconditionFailed is returned when a precondition is not met. diff --git a/auth/client/iam/openid4vp_test.go b/auth/client/iam/openid4vp_test.go index 52673e681e..1a2e330b1f 100644 --- a/auth/client/iam/openid4vp_test.go +++ b/auth/client/iam/openid4vp_test.go @@ -24,10 +24,10 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/http/client" - test2 "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/http/client" + test2 "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" "net/http" "net/http/httptest" "net/url" @@ -37,16 +37,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/auth/oauth" - "github.com/nuts-foundation/nuts-node/auth/openid4vci" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/policy" - http2 "github.com/nuts-foundation/nuts-node/test/http" - "github.com/nuts-foundation/nuts-node/vcr/holder" - "github.com/nuts-foundation/nuts-node/vcr/pe" - "github.com/nuts-foundation/nuts-node/vdr/didweb" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/policy" + http2 "github.com/nuts-foundation/nuts-node/v6/test/http" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vdr/didweb" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/client/iam/pd_resolver.go b/auth/client/iam/pd_resolver.go index a5973ac29c..a033ea5579 100644 --- a/auth/client/iam/pd_resolver.go +++ b/auth/client/iam/pd_resolver.go @@ -23,10 +23,10 @@ import ( "fmt" "net/url" - "github.com/nuts-foundation/nuts-node/auth/oauth" - nutsHttp "github.com/nuts-foundation/nuts-node/http" - "github.com/nuts-foundation/nuts-node/policy" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + nutsHttp "github.com/nuts-foundation/nuts-node/v6/http" + "github.com/nuts-foundation/nuts-node/v6/policy" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" ) // ResolvedPresentationDefinition contains a resolved PD and the scope to use in the token request. diff --git a/auth/client/iam/pd_resolver_test.go b/auth/client/iam/pd_resolver_test.go index c714bcc843..333cb4721b 100644 --- a/auth/client/iam/pd_resolver_test.go +++ b/auth/client/iam/pd_resolver_test.go @@ -23,9 +23,9 @@ import ( "errors" "testing" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/policy" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/policy" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/client/iam/profile_validation.go b/auth/client/iam/profile_validation.go index 36ea87c4eb..370a8d69d9 100644 --- a/auth/client/iam/profile_validation.go +++ b/auth/client/iam/profile_validation.go @@ -22,9 +22,9 @@ import ( "context" "fmt" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/policy" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/policy" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" ) // loadAndValidateProfile fetches the credential profile for the requested scope, applies the scope policy, diff --git a/auth/client/iam/profile_validation_test.go b/auth/client/iam/profile_validation_test.go index ed53214138..53deb3b757 100644 --- a/auth/client/iam/profile_validation_test.go +++ b/auth/client/iam/profile_validation_test.go @@ -23,9 +23,9 @@ import ( "errors" "testing" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/policy" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/policy" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/auth/cmd/cmd.go b/auth/cmd/cmd.go index e0787c6f8c..7b70fc0757 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/v6/auth" "github.com/spf13/pflag" ) diff --git a/auth/cmd/cmd_test.go b/auth/cmd/cmd_test.go index 88514b3745..d2699f5daa 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/v6/auth" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/stretchr/testify/require" "sort" "testing" diff --git a/auth/config.go b/auth/config.go index 78cf9ea95f..610f578518 100644 --- a/auth/config.go +++ b/auth/config.go @@ -19,9 +19,9 @@ 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/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/auth/services/dummy" + "github.com/nuts-foundation/nuts-node/v6/auth/services/selfsigned" ) // Config holds all the configuration params diff --git a/auth/config_test.go b/auth/config_test.go index 39edba2206..8582fc891f 100644 --- a/auth/config_test.go +++ b/auth/config_test.go @@ -19,7 +19,7 @@ package auth import ( - "github.com/nuts-foundation/nuts-node/core/to" + "github.com/nuts-foundation/nuts-node/v6/core/to" "github.com/stretchr/testify/assert" "testing" ) diff --git a/auth/interface.go b/auth/interface.go index 894911652a..b97468b44e 100644 --- a/auth/interface.go +++ b/auth/interface.go @@ -19,10 +19,10 @@ package auth import ( - "github.com/nuts-foundation/nuts-node/auth/client/iam" - "github.com/nuts-foundation/nuts-node/auth/openid4vci" - "github.com/nuts-foundation/nuts-node/auth/services" - "github.com/nuts-foundation/nuts-node/auth/services/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/client/iam" + "github.com/nuts-foundation/nuts-node/v6/auth/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/auth/services/oauth" "net/url" ) diff --git a/auth/log/logger.go b/auth/log/logger.go index e71f5c2df9..28e3ad091e 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/v6/core" "github.com/sirupsen/logrus" ) diff --git a/auth/mock.go b/auth/mock.go index a04365018a..3032ca6e7f 100644 --- a/auth/mock.go +++ b/auth/mock.go @@ -13,10 +13,10 @@ import ( url "net/url" reflect "reflect" - iam "github.com/nuts-foundation/nuts-node/auth/client/iam" - openid4vci "github.com/nuts-foundation/nuts-node/auth/openid4vci" - services "github.com/nuts-foundation/nuts-node/auth/services" - oauth "github.com/nuts-foundation/nuts-node/auth/services/oauth" + iam "github.com/nuts-foundation/nuts-node/v6/auth/client/iam" + openid4vci "github.com/nuts-foundation/nuts-node/v6/auth/openid4vci" + services "github.com/nuts-foundation/nuts-node/v6/auth/services" + oauth "github.com/nuts-foundation/nuts-node/v6/auth/services/oauth" gomock "go.uber.org/mock/gomock" ) diff --git a/auth/oauth/error.go b/auth/oauth/error.go index fcb92da65e..eb06bd7a8c 100644 --- a/auth/oauth/error.go +++ b/auth/oauth/error.go @@ -28,8 +28,8 @@ import ( "strings" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/core" ) // ErrorCode specifies error codes as defined by the OAuth2 specifications. diff --git a/auth/oauth/error_test.go b/auth/oauth/error_test.go index fd871b4fc4..76d27c3d67 100644 --- a/auth/oauth/error_test.go +++ b/auth/oauth/error_test.go @@ -21,7 +21,7 @@ package oauth import ( "errors" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v6/test" "github.com/stretchr/testify/assert" "html/template" "io" diff --git a/auth/oauth/metadata.go b/auth/oauth/metadata.go index b6d17dd18c..1e3e9e7a92 100644 --- a/auth/oauth/metadata.go +++ b/auth/oauth/metadata.go @@ -27,7 +27,7 @@ import ( "net/url" "strings" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" ) // ErrAllCandidates4xx indicates every well-known candidate for a FetchMetadata call responded diff --git a/auth/oauth/metadata_test.go b/auth/oauth/metadata_test.go index 8aa7ada77a..be7ac008fe 100644 --- a/auth/oauth/metadata_test.go +++ b/auth/oauth/metadata_test.go @@ -25,7 +25,7 @@ import ( "net/http/httptest" "testing" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/auth/oauth/openid.go b/auth/oauth/openid.go index 32555dad6e..7aa056adf4 100644 --- a/auth/oauth/openid.go +++ b/auth/oauth/openid.go @@ -19,7 +19,7 @@ package oauth import ( - "github.com/nuts-foundation/nuts-node/crypto/jwx" + "github.com/nuts-foundation/nuts-node/v6/crypto/jwx" ) // proofTypeValuesSupported contains a list of supported cipher suites for ldp_vc & ldp_vp presentation formats diff --git a/auth/oauth/types_test.go b/auth/oauth/types_test.go index df5fc8c8e6..b80e328c6a 100644 --- a/auth/oauth/types_test.go +++ b/auth/oauth/types_test.go @@ -22,7 +22,7 @@ import ( "encoding/json" "testing" - "github.com/nuts-foundation/nuts-node/core/to" + "github.com/nuts-foundation/nuts-node/v6/core/to" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/auth/openid4vci/client.go b/auth/openid4vci/client.go index 4760e848d9..e48278ae88 100644 --- a/auth/openid4vci/client.go +++ b/auth/openid4vci/client.go @@ -27,8 +27,8 @@ import ( "net/http" "net/url" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/core" ) // RequestCredentialOpts carries all parameters for a Credential Request. diff --git a/auth/openid4vci/client_test.go b/auth/openid4vci/client_test.go index 79eca10b7c..35eef3db73 100644 --- a/auth/openid4vci/client_test.go +++ b/auth/openid4vci/client_test.go @@ -26,7 +26,7 @@ import ( "net/http/httptest" "testing" - "github.com/nuts-foundation/nuts-node/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/auth/openid4vci/types.go b/auth/openid4vci/types.go index c523a63080..265e3eeab0 100644 --- a/auth/openid4vci/types.go +++ b/auth/openid4vci/types.go @@ -33,7 +33,7 @@ package openid4vci import ( "encoding/json" - "github.com/nuts-foundation/nuts-node/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" ) // JWTTypeOpenID4VCIProof is the JWT typ claim value used in OpenID4VCI key diff --git a/auth/services/dummy/dummy.go b/auth/services/dummy/dummy.go index ecfd0585eb..653e2d28ea 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/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/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..f50ed39bf5 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/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/services" "github.com/stretchr/testify/assert" ) diff --git a/auth/services/irma/factory.go b/auth/services/irma/factory.go index 423ddfcafd..9c83c1d9e4 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/v6/auth/contract" "os" "path/filepath" - "github.com/nuts-foundation/nuts-node/auth/log" + "github.com/nuts-foundation/nuts-node/v6/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..e11a0480c2 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/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/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..bc6dbc464e 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/v6/auth/services" - "github.com/nuts-foundation/nuts-node/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/test" + "github.com/nuts-foundation/nuts-node/v6/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 e206776e50..df6b958d16 100644 --- a/auth/services/irma/signer.go +++ b/auth/services/irma/signer.go @@ -25,7 +25,7 @@ import ( "fmt" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/sirupsen/logrus" "net/http" "os" @@ -36,9 +36,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/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/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 9da49c9d79..e110014e4b 100644 --- a/auth/services/irma/signer_test.go +++ b/auth/services/irma/signer_test.go @@ -27,11 +27,11 @@ import ( "github.com/privacybydesign/irmago/server/irmaserver" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vdr" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vdr" - "github.com/nuts-foundation/nuts-node/auth/contract" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/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 a3aaf8440b..40f22d6cf0 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/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/auth/services" "strings" "time" "github.com/lestrrat-go/jwx/v3/jwt" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/contract" irma "github.com/privacybydesign/irmago" ) diff --git a/auth/services/irma/validator_test.go b/auth/services/irma/validator_test.go index b1449a038b..352e16a569 100644 --- a/auth/services/irma/validator_test.go +++ b/auth/services/irma/validator_test.go @@ -26,10 +26,10 @@ import ( "github.com/stretchr/testify/require" "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/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/auth/test" + "github.com/nuts-foundation/nuts-node/v6/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 94133bf6a7..7940168f8c 100644 --- a/auth/services/mock.go +++ b/auth/services/mock.go @@ -16,8 +16,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/v6/auth/contract" + core "github.com/nuts-foundation/nuts-node/v6/core" gomock "go.uber.org/mock/gomock" ) diff --git a/auth/services/notary/notary.go b/auth/services/notary/notary.go index 6d89d412a7..90bf21daf1 100644 --- a/auth/services/notary/notary.go +++ b/auth/services/notary/notary.go @@ -22,9 +22,9 @@ import ( "context" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "reflect" "strings" "time" @@ -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/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/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/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/auth/services/dummy" + "github.com/nuts-foundation/nuts-node/v6/auth/services/irma" + "github.com/nuts-foundation/nuts-node/v6/auth/services/selfsigned" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/vcr" ) // 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 7488221234..fd3ce80bc7 100644 --- a/auth/services/notary/notary_test.go +++ b/auth/services/notary/notary_test.go @@ -22,19 +22,19 @@ import ( "context" "encoding/json" "errors" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "testing" "time" 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/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + irmaService "github.com/nuts-foundation/nuts-node/v6/auth/services/irma" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vdr" 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 76f5971451..39cb333095 100644 --- a/auth/services/oauth/authz_server.go +++ b/auth/services/oauth/authz_server.go @@ -29,19 +29,19 @@ import ( "github.com/lestrrat-go/jwx/v3/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/oauth" - "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/crypto/jwx" - "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/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/core" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/jwx" + "github.com/nuts-foundation/nuts-node/v6/didman" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) 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 c9c8ab71ff..2b16229e4e 100644 --- a/auth/services/oauth/authz_server_test.go +++ b/auth/services/oauth/authz_server_test.go @@ -26,8 +26,8 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "testing" "time" @@ -37,16 +37,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/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/test" - 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/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/didman" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" + vcrTypes "github.com/nuts-foundation/nuts-node/v6/vcr/types" + verifier2 "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/vdr" "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 9878194341..bb373814c9 100644 --- a/auth/services/oauth/interface.go +++ b/auth/services/oauth/interface.go @@ -22,8 +22,8 @@ import ( "context" "net/url" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/auth/services" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/services" ) // RelyingParty implements the OAuth2 relying party role. (V1 API) diff --git a/auth/services/oauth/mock.go b/auth/services/oauth/mock.go index f49e2d9a1e..e4c2f15eaf 100644 --- a/auth/services/oauth/mock.go +++ b/auth/services/oauth/mock.go @@ -14,8 +14,8 @@ import ( url "net/url" reflect "reflect" - oauth "github.com/nuts-foundation/nuts-node/auth/oauth" - services "github.com/nuts-foundation/nuts-node/auth/services" + oauth "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + services "github.com/nuts-foundation/nuts-node/v6/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 8b2393167e..09eab2ae47 100644 --- a/auth/services/oauth/relying_party.go +++ b/auth/services/oauth/relying_party.go @@ -22,22 +22,22 @@ import ( "context" "crypto/tls" "fmt" - "github.com/nuts-foundation/nuts-node/pki" + "github.com/nuts-foundation/nuts-node/v6/pki" "net/url" "time" "github.com/lestrrat-go/jwx/v3/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/oauth" - "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" - strictHttp "github.com/nuts-foundation/nuts-node/http/client" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/holder" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth/api/auth/v1/client" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/core" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/didman" + strictHttp "github.com/nuts-foundation/nuts-node/v6/http/client" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) var _ RelyingParty = (*relyingParty)(nil) diff --git a/auth/services/oauth/relying_party_test.go b/auth/services/oauth/relying_party_test.go index 421dd54894..c7672773eb 100644 --- a/auth/services/oauth/relying_party_test.go +++ b/auth/services/oauth/relying_party_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/auth/services" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/didman" - "github.com/nuts-foundation/nuts-node/test" - http2 "github.com/nuts-foundation/nuts-node/test/http" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/holder" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/didman" + "github.com/nuts-foundation/nuts-node/v6/test" + http2 "github.com/nuts-foundation/nuts-node/v6/test/http" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "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 07fcdb0ffa..3778b37037 100644 --- a/auth/services/selfsigned/signer.go +++ b/auth/services/selfsigned/signer.go @@ -27,16 +27,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/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/issuer" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v6/auth/services/selfsigned/web" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" "net/url" "time" ) diff --git a/auth/services/selfsigned/signer_test.go b/auth/services/selfsigned/signer_test.go index 36de0931e2..eb52c93b5c 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/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v6/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..4fd54075ee 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/v6/auth/services/selfsigned/types" "sync" "time" ) diff --git a/auth/services/selfsigned/store_test.go b/auth/services/selfsigned/store_test.go index 3e322ff439..8a49afb80c 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/v6/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 e0bc5e9fe9..19ebf15a11 100644 --- a/auth/services/selfsigned/test/generate_test.go +++ b/auth/services/selfsigned/test/generate_test.go @@ -21,13 +21,13 @@ 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/storage/orm" - "github.com/nuts-foundation/nuts-node/vcr/signature" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/util" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature" + "github.com/nuts-foundation/nuts-node/v6/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 07c7cc5075..7408e13d9e 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/v6/vcr/credential" "strings" "time" ) diff --git a/auth/services/selfsigned/validator.go b/auth/services/selfsigned/validator.go index 0ec3166863..53d3f1b6af 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/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" "time" ) diff --git a/auth/services/selfsigned/validator_test.go b/auth/services/selfsigned/validator_test.go index 2a49957065..3cf98a7c92 100644 --- a/auth/services/selfsigned/validator_test.go +++ b/auth/services/selfsigned/validator_test.go @@ -26,23 +26,23 @@ import ( "testing" "time" - "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/storage/orm" - "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/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/auth/services" + "github.com/nuts-foundation/nuts-node/v6/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/util" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" "go.uber.org/mock/gomock" 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/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/vcr" "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..a7b311654f 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/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v6/core" ) //go:embed templates/* diff --git a/auth/services/selfsigned/web/handler_test.go b/auth/services/selfsigned/web/handler_test.go index 22e020d99c..c8ef74df22 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/v6/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/auth/services/selfsigned/types" + "github.com/nuts-foundation/nuts-node/v6/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..0ac59d00ea 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/v6/core" "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/auth/contract" + "github.com/nuts-foundation/nuts-node/v6/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..1166982f4f 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/v6/auth/contract" type TestVPVerificationResult struct { Val contract.State diff --git a/auth/test.go b/auth/test.go index cd1940af32..179e7c7cc1 100644 --- a/auth/test.go +++ b/auth/test.go @@ -19,13 +19,13 @@ package auth import ( - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" "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/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/vcr" "go.uber.org/mock/gomock" ) diff --git a/cmd/root.go b/cmd/root.go index 4cce7e287a..61a0dd667b 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -30,49 +30,49 @@ import ( "os" "runtime/pprof" - "github.com/nuts-foundation/nuts-node/auth" - authAPIv1 "github.com/nuts-foundation/nuts-node/auth/api/auth/v1" - authIAMAPI "github.com/nuts-foundation/nuts-node/auth/api/iam" - 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/discovery" - discoveryServerAPI "github.com/nuts-foundation/nuts-node/discovery/api/server" - discoveryAPI "github.com/nuts-foundation/nuts-node/discovery/api/v1" - discoveryCmd "github.com/nuts-foundation/nuts-node/discovery/cmd" - "github.com/nuts-foundation/nuts-node/events" - eventsCmd "github.com/nuts-foundation/nuts-node/events/cmd" - "github.com/nuts-foundation/nuts-node/golden_hammer" - goldenHammerCmd "github.com/nuts-foundation/nuts-node/golden_hammer/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/policy" - "github.com/nuts-foundation/nuts-node/storage" - storageCmd "github.com/nuts-foundation/nuts-node/storage/cmd" - "github.com/nuts-foundation/nuts-node/tracing" - tracingCmd "github.com/nuts-foundation/nuts-node/tracing/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" - vdrAPIv2 "github.com/nuts-foundation/nuts-node/vdr/api/v2" - vdrCmd "github.com/nuts-foundation/nuts-node/vdr/cmd" - "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth" + authAPIv1 "github.com/nuts-foundation/nuts-node/v6/auth/api/auth/v1" + authIAMAPI "github.com/nuts-foundation/nuts-node/v6/auth/api/iam" + authMeansAPI "github.com/nuts-foundation/nuts-node/v6/auth/api/means/v1" + authCmd "github.com/nuts-foundation/nuts-node/v6/auth/cmd" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/core/status" + "github.com/nuts-foundation/nuts-node/v6/crypto" + cryptoAPI "github.com/nuts-foundation/nuts-node/v6/crypto/api/v1" + cryptoCmd "github.com/nuts-foundation/nuts-node/v6/crypto/cmd" + "github.com/nuts-foundation/nuts-node/v6/didman" + didmanAPI "github.com/nuts-foundation/nuts-node/v6/didman/api/v1" + didmanCmd "github.com/nuts-foundation/nuts-node/v6/didman/cmd" + "github.com/nuts-foundation/nuts-node/v6/discovery" + discoveryServerAPI "github.com/nuts-foundation/nuts-node/v6/discovery/api/server" + discoveryAPI "github.com/nuts-foundation/nuts-node/v6/discovery/api/v1" + discoveryCmd "github.com/nuts-foundation/nuts-node/v6/discovery/cmd" + "github.com/nuts-foundation/nuts-node/v6/events" + eventsCmd "github.com/nuts-foundation/nuts-node/v6/events/cmd" + "github.com/nuts-foundation/nuts-node/v6/golden_hammer" + goldenHammerCmd "github.com/nuts-foundation/nuts-node/v6/golden_hammer/cmd" + httpEngine "github.com/nuts-foundation/nuts-node/v6/http" + httpCmd "github.com/nuts-foundation/nuts-node/v6/http/cmd" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/network" + networkAPI "github.com/nuts-foundation/nuts-node/v6/network/api/v1" + networkCmd "github.com/nuts-foundation/nuts-node/v6/network/cmd" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/policy" + "github.com/nuts-foundation/nuts-node/v6/storage" + storageCmd "github.com/nuts-foundation/nuts-node/v6/storage/cmd" + "github.com/nuts-foundation/nuts-node/v6/tracing" + tracingCmd "github.com/nuts-foundation/nuts-node/v6/tracing/cmd" + "github.com/nuts-foundation/nuts-node/v6/vcr" + openid4vciAPI "github.com/nuts-foundation/nuts-node/v6/vcr/api/openid4vci/v0" + vcrAPI "github.com/nuts-foundation/nuts-node/v6/vcr/api/vcr/v2" + vcrCmd "github.com/nuts-foundation/nuts-node/v6/vcr/cmd" + "github.com/nuts-foundation/nuts-node/v6/vdr" + vdrAPI "github.com/nuts-foundation/nuts-node/v6/vdr/api/v1" + vdrAPIv2 "github.com/nuts-foundation/nuts-node/v6/vdr/api/v2" + vdrCmd "github.com/nuts-foundation/nuts-node/v6/vdr/cmd" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) var stdOutWriter io.Writer = os.Stdout diff --git a/cmd/root_test.go b/cmd/root_test.go index d676328d8e..2cee0b2a13 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/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 184c150142..7c1472f701 100644 --- a/core/client_config_test.go +++ b/core/client_config_test.go @@ -21,7 +21,7 @@ package core import ( "github.com/knadh/koanf/v2" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v6/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..ec89aadb3b 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/v6/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..08f037a69e 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/v6/core" + http2 "github.com/nuts-foundation/nuts-node/v6/test/http" "github.com/stretchr/testify/assert" ) diff --git a/core/status/engine.go b/core/status/engine.go index 10603de139..2a8b93b26d 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/v6/core" "github.com/labstack/echo/v4" ) diff --git a/core/status/engine_test.go b/core/status/engine_test.go index 3fa6f6a6db..24f471e60f 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/mock" + "github.com/nuts-foundation/nuts-node/v6/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 da7bd5eb12..b50ef20081 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/v6/test/pki" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "os" diff --git a/crypto/api/v1/api.go b/crypto/api/v1/api.go index 49dcc18884..c900baf522 100644 --- a/crypto/api/v1/api.go +++ b/crypto/api/v1/api.go @@ -23,7 +23,7 @@ import ( crypt "crypto" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "net/http" "time" @@ -31,9 +31,9 @@ import ( "github.com/lestrrat-go/jwx/v3/jws" "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/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" ) var _ StrictServerInterface = (*Wrapper)(nil) diff --git a/crypto/api/v1/api_test.go b/crypto/api/v1/api_test.go index a2b421009e..2732ff0936 100644 --- a/crypto/api/v1/api_test.go +++ b/crypto/api/v1/api_test.go @@ -21,16 +21,16 @@ package v1 import ( "encoding/json" "errors" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "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/v6/crypto" ) func Test_ErrorStatusCodes(t *testing.T) { diff --git a/crypto/api/v1/generated_test.go b/crypto/api/v1/generated_test.go index 8910af5f47..f40efe8fdf 100644 --- a/crypto/api/v1/generated_test.go +++ b/crypto/api/v1/generated_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/crypto/cmd/cmd.go b/crypto/cmd/cmd.go index ffbc041902..05da572db2 100644 --- a/crypto/cmd/cmd.go +++ b/crypto/cmd/cmd.go @@ -23,14 +23,14 @@ import ( "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/azure" - "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/storage" + "github.com/nuts-foundation/nuts-node/v6/core" + cryptoEngine "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/azure" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/external" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/fs" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/vault" + "github.com/nuts-foundation/nuts-node/v6/storage" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/crypto/cmd/cmd_test.go b/crypto/cmd/cmd_test.go index 34f9a2bc9a..45a50a55c4 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/fs" + testIo "github.com/nuts-foundation/nuts-node/v6/test/io" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "io" diff --git a/crypto/crypto.go b/crypto/crypto.go index a592c46066..cd9d4b4181 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -24,20 +24,20 @@ import ( "errors" "fmt" "github.com/google/uuid" - "github.com/nuts-foundation/nuts-node/crypto/storage/azure" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/azure" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" "gorm.io/gorm" "path" "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/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/log" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/external" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/fs" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/vault" ) const ( diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 76d8ed795d..f4b113d3b1 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -20,11 +20,11 @@ package crypto import ( "context" - "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/storage" - "github.com/nuts-foundation/nuts-node/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/fs" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" "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/v6/test/io" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/stretchr/testify/assert" ) diff --git a/crypto/dpop.go b/crypto/dpop.go index c8d596268b..d90e0e475d 100644 --- a/crypto/dpop.go +++ b/crypto/dpop.go @@ -20,7 +20,7 @@ package crypto import ( "context" - "github.com/nuts-foundation/nuts-node/crypto/dpop" + "github.com/nuts-foundation/nuts-node/v6/crypto/dpop" ) func (client *Crypto) SignDPoP(ctx context.Context, token dpop.DPoP, kid string) (string, error) { diff --git a/crypto/dpop/dpop.go b/crypto/dpop/dpop.go index fb4e422419..ad6e9b2780 100644 --- a/crypto/dpop/dpop.go +++ b/crypto/dpop/dpop.go @@ -37,8 +37,8 @@ import ( "github.com/lestrrat-go/jwx/v3/jwk" "github.com/lestrrat-go/jwx/v3/jws" "github.com/lestrrat-go/jwx/v3/jwt" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/crypto/jwx" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/crypto/jwx" ) const ( diff --git a/crypto/dpop_test.go b/crypto/dpop_test.go index cc866f3c10..373e266308 100644 --- a/crypto/dpop_test.go +++ b/crypto/dpop_test.go @@ -25,9 +25,9 @@ import ( "github.com/lestrrat-go/jwx/v3/jwa" "github.com/lestrrat-go/jwx/v3/jwk" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/crypto/dpop" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/crypto/dpop" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/crypto/ecies_test.go b/crypto/ecies_test.go index f99428ed31..e934267fc2 100644 --- a/crypto/ecies_test.go +++ b/crypto/ecies_test.go @@ -25,7 +25,7 @@ import ( "crypto/sha256" "encoding/binary" "fmt" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" "testing" ecies "github.com/nuts-foundation/crypto-ecies" diff --git a/crypto/interface.go b/crypto/interface.go index 49572f769e..e925ebb677 100644 --- a/crypto/interface.go +++ b/crypto/interface.go @@ -22,8 +22,8 @@ import ( "context" "crypto" "errors" - "github.com/nuts-foundation/nuts-node/crypto/dpop" - "github.com/nuts-foundation/nuts-node/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/crypto/dpop" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" ) // ErrPrivateKeyNotFound is returned when the private key doesn't exist diff --git a/crypto/jwx.go b/crypto/jwx.go index ea639d2485..7518ee06c2 100644 --- a/crypto/jwx.go +++ b/crypto/jwx.go @@ -36,10 +36,10 @@ import ( "github.com/lestrrat-go/jwx/v3/jws" "github.com/lestrrat-go/jwx/v3/jwt" "github.com/mr-tron/base58" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/crypto/jwx" - "github.com/nuts-foundation/nuts-node/crypto/log" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/crypto/jwx" + "github.com/nuts-foundation/nuts-node/v6/crypto/log" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" ) // GenerateJWK a new in-memory key pair and returns it as JWK. diff --git a/crypto/jwx_test.go b/crypto/jwx_test.go index a5216f8280..a12ed3af7d 100644 --- a/crypto/jwx_test.go +++ b/crypto/jwx_test.go @@ -29,9 +29,9 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/crypto/jwx" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/crypto/jwx" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" "go.uber.org/mock/gomock" "io" "testing" @@ -43,8 +43,8 @@ import ( "github.com/lestrrat-go/jwx/v3/jws" "github.com/lestrrat-go/jwx/v3/jwt" "github.com/mr-tron/base58" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/crypto/test" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/crypto/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/crypto/log/logger.go b/crypto/log/logger.go index 8584366b6f..d5ae24de83 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/v6/core" "github.com/sirupsen/logrus" ) diff --git a/crypto/memory.go b/crypto/memory.go index c3d5bd8086..0772548bda 100644 --- a/crypto/memory.go +++ b/crypto/memory.go @@ -25,7 +25,7 @@ import ( "maps" "github.com/lestrrat-go/jwx/v3/jwk" - "github.com/nuts-foundation/nuts-node/crypto/dpop" + "github.com/nuts-foundation/nuts-node/v6/crypto/dpop" ) var _ JWTSigner = &MemoryJWTSigner{} diff --git a/crypto/memory_test.go b/crypto/memory_test.go index 5171d06574..2a2e534254 100644 --- a/crypto/memory_test.go +++ b/crypto/memory_test.go @@ -22,7 +22,7 @@ import ( "crypto/ecdsa" "crypto/elliptic" "crypto/rand" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v6/audit" "testing" "github.com/lestrrat-go/jwx/v3/jwk" diff --git a/crypto/mock.go b/crypto/mock.go index e2192cba07..44046d64aa 100644 --- a/crypto/mock.go +++ b/crypto/mock.go @@ -14,8 +14,8 @@ import ( crypto "crypto" reflect "reflect" - dpop "github.com/nuts-foundation/nuts-node/crypto/dpop" - orm "github.com/nuts-foundation/nuts-node/storage/orm" + dpop "github.com/nuts-foundation/nuts-node/v6/crypto/dpop" + orm "github.com/nuts-foundation/nuts-node/v6/storage/orm" gomock "go.uber.org/mock/gomock" ) diff --git a/crypto/storage/azure/keyvault.go b/crypto/storage/azure/keyvault.go index 1a49517e1d..0ce74e218b 100644 --- a/crypto/storage/azure/keyvault.go +++ b/crypto/storage/azure/keyvault.go @@ -34,9 +34,9 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azidentity" "github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys" "github.com/lestrrat-go/jwx/v3/jwk" - "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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/log" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" "golang.org/x/crypto/cryptobyte" "golang.org/x/crypto/cryptobyte/asn1" ) diff --git a/crypto/storage/azure/keyvault_test.go b/crypto/storage/azure/keyvault_test.go index e2b7d5b73a..2dd583cb8b 100644 --- a/crypto/storage/azure/keyvault_test.go +++ b/crypto/storage/azure/keyvault_test.go @@ -39,7 +39,7 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys" "github.com/google/uuid" "github.com/lestrrat-go/jwx/v3/jwk" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/crypto/storage/external/client.go b/crypto/storage/external/client.go index 94db104788..27d23d4a2f 100644 --- a/crypto/storage/external/client.go +++ b/crypto/storage/external/client.go @@ -27,10 +27,10 @@ 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/tracing" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/crypto/util" + "github.com/nuts-foundation/nuts-node/v6/tracing" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" ) diff --git a/crypto/storage/external/client_test.go b/crypto/storage/external/client_test.go index 0e0a255151..4b3237b87e 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/crypto/util" ) func serverWithKey(t *testing.T, key *ecdsa.PrivateKey) *httptest.Server { diff --git a/crypto/storage/fs/fs.go b/crypto/storage/fs/fs.go index 51b12c0b1c..f73662bffb 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/v6/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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/crypto/util" ) type entryType string diff --git a/crypto/storage/fs/fs_test.go b/crypto/storage/fs/fs_test.go index 48139c6602..a9764c42d5 100644 --- a/crypto/storage/fs/fs_test.go +++ b/crypto/storage/fs/fs_test.go @@ -20,7 +20,7 @@ package fs import ( "fmt" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" "io/fs" "os" "path" @@ -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/v6/crypto/test" + "github.com/nuts-foundation/nuts-node/v6/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 de532e7c93..a54230e85d 100644 --- a/crypto/storage/spi/interface.go +++ b/crypto/storage/spi/interface.go @@ -30,7 +30,7 @@ import ( "regexp" "github.com/lestrrat-go/jwx/v3/jwk" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/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 13fdec0739..15d4214c15 100644 --- a/crypto/storage/spi/mock.go +++ b/crypto/storage/spi/mock.go @@ -14,7 +14,7 @@ import ( crypto "crypto" reflect "reflect" - core "github.com/nuts-foundation/nuts-node/core" + core "github.com/nuts-foundation/nuts-node/v6/core" gomock "go.uber.org/mock/gomock" ) diff --git a/crypto/storage/spi/wrapper.go b/crypto/storage/spi/wrapper.go index 3aa72f036a..71a695e76e 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/v6/core" "regexp" ) diff --git a/crypto/storage/vault/vault.go b/crypto/storage/vault/vault.go index 8bb716c8cc..e78b057d66 100644 --- a/crypto/storage/vault/vault.go +++ b/crypto/storage/vault/vault.go @@ -28,11 +28,11 @@ import ( "time" 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/tracing" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/log" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/crypto/util" + "github.com/nuts-foundation/nuts-node/v6/tracing" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" ) diff --git a/crypto/storage/vault/vault_test.go b/crypto/storage/vault/vault_test.go index 57b9095d03..b991552eaa 100644 --- a/crypto/storage/vault/vault_test.go +++ b/crypto/storage/vault/vault_test.go @@ -25,8 +25,8 @@ import ( "crypto/rand" "errors" vault "github.com/hashicorp/vault/api" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/util" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "net/http" diff --git a/crypto/test.go b/crypto/test.go index eeaff687c5..d910fe0024 100644 --- a/crypto/test.go +++ b/crypto/test.go @@ -21,10 +21,10 @@ package crypto import ( "context" "crypto" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" "github.com/stretchr/testify/require" "gorm.io/gorm" "testing" diff --git a/crypto/util/pem_test.go b/crypto/util/pem_test.go index 332720a3fe..a2a1932412 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/v6/crypto/test" "github.com/stretchr/testify/assert" ) diff --git a/didman/api/v1/api.go b/didman/api/v1/api.go index 1d01657c8b..8d512c2400 100644 --- a/didman/api/v1/api.go +++ b/didman/api/v1/api.go @@ -23,17 +23,17 @@ import ( "context" "errors" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/didman" ) var _ StrictServerInterface = (*Wrapper)(nil) diff --git a/didman/api/v1/api_test.go b/didman/api/v1/api_test.go index 577cd51b17..22cca2aa05 100644 --- a/didman/api/v1/api_test.go +++ b/didman/api/v1/api_test.go @@ -21,17 +21,17 @@ package v1 import ( "errors" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/didman" "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 9a888b8bf1..53c1df3bb6 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/v6/core" "net/http" ) diff --git a/didman/api/v1/client_test.go b/didman/api/v1/client_test.go index 3520f291a5..5ef821ce4b 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/v6/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/v6/test/http" "github.com/stretchr/testify/assert" ) diff --git a/didman/api/v1/types.go b/didman/api/v1/types.go index ce2a41ed74..bb06178562 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/v6/didman" "schneider.vip/problem" ) diff --git a/didman/cmd/cmd.go b/didman/cmd/cmd.go index b5ec61fae1..ad79773be2 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/didman/api/v1" "github.com/spf13/cobra" ) diff --git a/didman/cmd/cmd_test.go b/didman/cmd/cmd_test.go index af57b5d00a..e46825eecf 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/v6/core" + v1 "github.com/nuts-foundation/nuts-node/v6/didman/api/v1" + http2 "github.com/nuts-foundation/nuts-node/v6/test/http" "github.com/stretchr/testify/assert" "net/http" "net/http/httptest" diff --git a/didman/didman.go b/didman/didman.go index 825f98610f..e3fb2d2859 100644 --- a/didman/didman.go +++ b/didman/didman.go @@ -26,19 +26,19 @@ import ( "errors" "fmt" "github.com/mr-tron/base58" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "net/url" "sync" 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/didman/log" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" ) // ModuleName contains the name of this module: Didman diff --git a/didman/didman_test.go b/didman/didman_test.go index b80ea67444..1233517f9a 100644 --- a/didman/didman_test.go +++ b/didman/didman_test.go @@ -24,10 +24,10 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "io" "net/url" "strings" @@ -37,11 +37,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/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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vdr" "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..a959bf4727 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/v6/core" "github.com/sirupsen/logrus" ) diff --git a/discovery/api/server/api.go b/discovery/api/server/api.go index fe8b3d2b7b..df5fdebfab 100644 --- a/discovery/api/server/api.go +++ b/discovery/api/server/api.go @@ -23,9 +23,9 @@ import ( "errors" "github.com/labstack/echo/v4" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/discovery" - "github.com/nuts-foundation/nuts-node/discovery/api/server/client" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/discovery" + "github.com/nuts-foundation/nuts-node/v6/discovery/api/server/client" "net/http" ) diff --git a/discovery/api/server/api_test.go b/discovery/api/server/api_test.go index e04bd02f20..8279b5b5f4 100644 --- a/discovery/api/server/api_test.go +++ b/discovery/api/server/api_test.go @@ -22,7 +22,7 @@ import ( "context" "errors" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/discovery" + "github.com/nuts-foundation/nuts-node/v6/discovery" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/discovery/api/server/client/http.go b/discovery/api/server/client/http.go index 802dcba13f..fd2733f89c 100644 --- a/discovery/api/server/client/http.go +++ b/discovery/api/server/client/http.go @@ -24,9 +24,9 @@ import ( "encoding/json" "fmt" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/discovery/log" - "github.com/nuts-foundation/nuts-node/http/client" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/discovery/log" + "github.com/nuts-foundation/nuts-node/v6/http/client" "io" "net/http" "net/url" diff --git a/discovery/api/server/client/http_test.go b/discovery/api/server/client/http_test.go index 513699bea2..f2348ca173 100644 --- a/discovery/api/server/client/http_test.go +++ b/discovery/api/server/client/http_test.go @@ -22,7 +22,7 @@ import ( "context" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - testHTTP "github.com/nuts-foundation/nuts-node/test/http" + testHTTP "github.com/nuts-foundation/nuts-node/v6/test/http" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "net/http" diff --git a/discovery/api/v1/api.go b/discovery/api/v1/api.go index b05a56ee59..c9024bece6 100644 --- a/discovery/api/v1/api.go +++ b/discovery/api/v1/api.go @@ -22,12 +22,12 @@ import ( "context" "errors" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/core/to" - "github.com/nuts-foundation/nuts-node/discovery" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/core/to" + "github.com/nuts-foundation/nuts-node/v6/discovery" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" "net/http" "net/url" ) diff --git a/discovery/api/v1/api_test.go b/discovery/api/v1/api_test.go index 3a831ac364..92139f6a4b 100644 --- a/discovery/api/v1/api_test.go +++ b/discovery/api/v1/api_test.go @@ -23,10 +23,10 @@ import ( "errors" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/discovery" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/discovery" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/discovery/api/v1/types.go b/discovery/api/v1/types.go index 2c3c738ee1..fcddc7c00e 100644 --- a/discovery/api/v1/types.go +++ b/discovery/api/v1/types.go @@ -20,7 +20,7 @@ package v1 import ( "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/discovery" + "github.com/nuts-foundation/nuts-node/v6/discovery" ) // VerifiablePresentation is a type alias for the VerifiablePresentation from the go-did library. diff --git a/discovery/client.go b/discovery/client.go index 9ee3afe2fb..024bac6ab4 100644 --- a/discovery/client.go +++ b/discovery/client.go @@ -29,17 +29,17 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/discovery/api/server/client" - "github.com/nuts-foundation/nuts-node/discovery/log" - "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/pe" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/discovery/api/server/client" + "github.com/nuts-foundation/nuts-node/v6/discovery/log" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) // clientRegistrationManager is a client component, responsible for managing registrations on a Discovery Service. diff --git a/discovery/client_test.go b/discovery/client_test.go index 3322c0876e..d23eaa7999 100644 --- a/discovery/client_test.go +++ b/discovery/client_test.go @@ -24,17 +24,17 @@ import ( "github.com/lestrrat-go/jwx/v3/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/discovery/api/server/client" - "github.com/nuts-foundation/nuts-node/storage" - "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/pe" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vcr/verifier" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/discovery/api/server/client" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/discovery/cmd/cmd.go b/discovery/cmd/cmd.go index 7746d1e362..f24a424663 100644 --- a/discovery/cmd/cmd.go +++ b/discovery/cmd/cmd.go @@ -19,7 +19,7 @@ package cmd import ( - "github.com/nuts-foundation/nuts-node/discovery" + "github.com/nuts-foundation/nuts-node/v6/discovery" "github.com/spf13/pflag" ) diff --git a/discovery/definition.go b/discovery/definition.go index e032ae696e..bb7c60706e 100644 --- a/discovery/definition.go +++ b/discovery/definition.go @@ -22,8 +22,8 @@ import ( "bytes" "embed" "encoding/json" - "github.com/nuts-foundation/nuts-node/vcr/pe" - v2 "github.com/nuts-foundation/nuts-node/vcr/pe/schema/v2" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + v2 "github.com/nuts-foundation/nuts-node/v6/vcr/pe/schema/v2" "github.com/santhosh-tekuri/jsonschema" ) diff --git a/discovery/log/logger.go b/discovery/log/logger.go index 3a4fcf4b4a..54be68dc1c 100644 --- a/discovery/log/logger.go +++ b/discovery/log/logger.go @@ -19,7 +19,7 @@ package log import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/sirupsen/logrus" ) diff --git a/discovery/module.go b/discovery/module.go index ef8174af80..9251b22b4e 100644 --- a/discovery/module.go +++ b/discovery/module.go @@ -24,15 +24,15 @@ import ( "fmt" ssi "github.com/nuts-foundation/go-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/discovery/api/server/client" - "github.com/nuts-foundation/nuts-node/discovery/log" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/discovery/api/server/client" + "github.com/nuts-foundation/nuts-node/v6/discovery/log" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "net/url" "os" "path" diff --git a/discovery/module_test.go b/discovery/module_test.go index 752e431e11..dadff3b278 100644 --- a/discovery/module_test.go +++ b/discovery/module_test.go @@ -25,17 +25,17 @@ import ( "github.com/lestrrat-go/jwx/v3/jwt" "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/discovery/api/server/client" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test" - "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/pe" - "github.com/nuts-foundation/nuts-node/vcr/verifier" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/discovery/api/server/client" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/discovery/store.go b/discovery/store.go index e440a082a0..b65f3d6bc3 100644 --- a/discovery/store.go +++ b/discovery/store.go @@ -24,7 +24,7 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vcr/credential/store" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential/store" "slices" "strconv" "strings" @@ -32,8 +32,8 @@ import ( "github.com/google/uuid" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/discovery/log" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/discovery/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" "gorm.io/gorm" "gorm.io/gorm/clause" "gorm.io/gorm/schema" diff --git a/discovery/store_test.go b/discovery/store_test.go index 8239aa0a80..1495780a6a 100644 --- a/discovery/store_test.go +++ b/discovery/store_test.go @@ -22,8 +22,8 @@ import ( "github.com/lestrrat-go/jwx/v3/jwt" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core/to" - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v6/core/to" + "github.com/nuts-foundation/nuts-node/v6/storage" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/discovery/test.go b/discovery/test.go index f016014862..2d162ce54e 100644 --- a/discovery/test.go +++ b/discovery/test.go @@ -33,10 +33,10 @@ 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/to" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/core/to" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" "time" ) diff --git a/docs/generate_docs.go b/docs/generate_docs.go index b91249d6b8..73d980d71b 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/v6/cmd" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/spf13/pflag" ) diff --git a/e2e-tests/browser/client/iam/types.go b/e2e-tests/browser/client/iam/types.go index 5641bce851..170ca3ab93 100644 --- a/e2e-tests/browser/client/iam/types.go +++ b/e2e-tests/browser/client/iam/types.go @@ -21,9 +21,9 @@ package iam import ( "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/vcr/pe" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) // DIDDocument is an alias diff --git a/e2e-tests/browser/openid4vp_employeecredential/main_test.go b/e2e-tests/browser/openid4vp_employeecredential/main_test.go index 712b487f64..fbe47e6c5b 100644 --- a/e2e-tests/browser/openid4vp_employeecredential/main_test.go +++ b/e2e-tests/browser/openid4vp_employeecredential/main_test.go @@ -29,10 +29,10 @@ import ( "github.com/chromedp/chromedp" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/e2e-tests/browser" - iamAPI "github.com/nuts-foundation/nuts-node/e2e-tests/browser/client/iam" - didAPI "github.com/nuts-foundation/nuts-node/vdr/api/v2" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/e2e-tests/browser" + iamAPI "github.com/nuts-foundation/nuts-node/v6/e2e-tests/browser/client/iam" + didAPI "github.com/nuts-foundation/nuts-node/v6/vdr/api/v2" "github.com/stretchr/testify/require" ) diff --git a/e2e-tests/browser/openid4vp_employeecredential/openid4vp.go b/e2e-tests/browser/openid4vp_employeecredential/openid4vp.go index 2c88820624..bcf3fa7569 100644 --- a/e2e-tests/browser/openid4vp_employeecredential/openid4vp.go +++ b/e2e-tests/browser/openid4vp_employeecredential/openid4vp.go @@ -24,7 +24,7 @@ import ( "context" "fmt" - "github.com/nuts-foundation/nuts-node/e2e-tests/browser/client/iam" + "github.com/nuts-foundation/nuts-node/v6/e2e-tests/browser/client/iam" ) type OpenID4VP struct { diff --git a/e2e-tests/browser/rfc019_selfsigned/apps/selfsigned.go b/e2e-tests/browser/rfc019_selfsigned/apps/selfsigned.go index 58015e9c09..7801b0f066 100644 --- a/e2e-tests/browser/rfc019_selfsigned/apps/selfsigned.go +++ b/e2e-tests/browser/rfc019_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/v6/auth/api/auth/v1/client" + "github.com/nuts-foundation/nuts-node/v6/core" + vcrAPI "github.com/nuts-foundation/nuts-node/v6/vcr/api/vcr/v2" ) var NodeClientConfig = core.ClientConfig{Address: "http://localhost:8081"} diff --git a/e2e-tests/browser/rfc019_selfsigned/main_test.go b/e2e-tests/browser/rfc019_selfsigned/main_test.go index 4e7b436e0c..dde6a66d7f 100644 --- a/e2e-tests/browser/rfc019_selfsigned/main_test.go +++ b/e2e-tests/browser/rfc019_selfsigned/main_test.go @@ -26,10 +26,10 @@ import ( "time" "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/browser" - "github.com/nuts-foundation/nuts-node/e2e-tests/browser/rfc019_selfsigned/apps" - didAPI "github.com/nuts-foundation/nuts-node/vdr/api/v1" + didmanAPI "github.com/nuts-foundation/nuts-node/v6/didman/api/v1" + "github.com/nuts-foundation/nuts-node/v6/e2e-tests/browser" + "github.com/nuts-foundation/nuts-node/v6/e2e-tests/browser/rfc019_selfsigned/apps" + didAPI "github.com/nuts-foundation/nuts-node/v6/vdr/api/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/e2e-tests/browser/util.go b/e2e-tests/browser/util.go index cdb338ad73..56fd804584 100644 --- a/e2e-tests/browser/util.go +++ b/e2e-tests/browser/util.go @@ -22,8 +22,8 @@ package browser import ( "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - vcrAPI "github.com/nuts-foundation/nuts-node/vcr/api/vcr/v2" + "github.com/nuts-foundation/nuts-node/v6/core" + vcrAPI "github.com/nuts-foundation/nuts-node/v6/vcr/api/vcr/v2" ) func IssueOrganizationCredential(subject string, organization *did.Document, name, city string, clientConfig core.ClientConfig) error { diff --git a/e2e-tests/migration/main_test.go b/e2e-tests/migration/main_test.go index 2875d63ddb..eebfd18442 100644 --- a/e2e-tests/migration/main_test.go +++ b/e2e-tests/migration/main_test.go @@ -23,9 +23,9 @@ package migration import ( "encoding/json" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" "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 265e01a822..6365d7039e 100644 --- a/echo/echo_integration_test.go +++ b/echo/echo_integration_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/nuts-foundation/nuts-node/test/node" + "github.com/nuts-foundation/nuts-node/v6/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 f6ecd1f4a5..1c1739a3ce 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/v6/events" ) // ConfEventsPort defines the port for the NATS server diff --git a/events/conn.go b/events/conn.go index b7e7cb2f2c..1f5a67c9d9 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/v6/events/log" ) // Conn defines the methods required in the NATS connection structure diff --git a/events/event.go b/events/event.go index f118113836..73de90872e 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/v6/core" ) const moduleName = "Events" diff --git a/events/integration_test.go b/events/integration_test.go index 62422a6c1a..a77d26026a 100644 --- a/events/integration_test.go +++ b/events/integration_test.go @@ -29,9 +29,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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/test/io" "github.com/stretchr/testify/assert" ) diff --git a/events/log/logger.go b/events/log/logger.go index d3edb3b0cf..43353d97d8 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/v6/core" "github.com/sirupsen/logrus" ) diff --git a/events/test.go b/events/test.go index b76e7be9a9..f2bd1f6ced 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/v6/test" "testing" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/test/io" ) func NewTestManager(t *testing.T) Event { diff --git a/events/types.go b/events/types.go index 1f4554097f..a45a207eba 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/v6/network/dag" ) // TransactionWithPayload holds the transaction and byte payload diff --git a/events/types_test.go b/events/types_test.go index 6bcc01adc2..87c632eaf6 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/v6/network/dag" "github.com/stretchr/testify/assert" ) diff --git a/go.mod b/go.mod index 25a846d6b1..d632f574c3 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/v6 // 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..604b8455d0 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/v6/golden_hammer" "github.com/spf13/pflag" ) diff --git a/golden_hammer/log/logger.go b/golden_hammer/log/logger.go index ea721c54df..d4097d9865 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/v6/core" "github.com/sirupsen/logrus" ) diff --git a/golden_hammer/module.go b/golden_hammer/module.go index dd94a02aa5..cb13138228 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" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/didman" + "github.com/nuts-foundation/nuts-node/v6/golden_hammer/log" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "net/url" "sort" "strings" diff --git a/golden_hammer/module_test.go b/golden_hammer/module_test.go index a7b2b75b65..8142536a2d 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" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/didman" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/test/pki" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/http/client/caching.go b/http/client/caching.go index 9e4191bacd..ab34a790b0 100644 --- a/http/client/caching.go +++ b/http/client/caching.go @@ -21,7 +21,7 @@ package client import ( "bytes" "fmt" - "github.com/nuts-foundation/nuts-node/http/log" + "github.com/nuts-foundation/nuts-node/v6/http/log" "github.com/pquerna/cachecontrol" "io" "net/http" diff --git a/http/client/caching_test.go b/http/client/caching_test.go index 7c8ec33528..c2088a3a16 100644 --- a/http/client/caching_test.go +++ b/http/client/caching_test.go @@ -21,7 +21,7 @@ package client import ( "bytes" "fmt" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v6/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "io" diff --git a/http/client/client.go b/http/client/client.go index cb4e347ce3..a5c01ea1c1 100644 --- a/http/client/client.go +++ b/http/client/client.go @@ -28,8 +28,8 @@ import ( "net/http" "time" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/tracing" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/tracing" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" ) diff --git a/http/client/client_test.go b/http/client/client_test.go index 19ee707436..f0b3b0411c 100644 --- a/http/client/client_test.go +++ b/http/client/client_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/tracing" + "github.com/nuts-foundation/nuts-node/v6/tracing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/http/client/ssrf_test.go b/http/client/ssrf_test.go index 188bccdfc8..1577ea993c 100644 --- a/http/client/ssrf_test.go +++ b/http/client/ssrf_test.go @@ -28,7 +28,7 @@ import ( "time" "code.dny.dev/ssrf" - "github.com/nuts-foundation/nuts-node/tracing" + "github.com/nuts-foundation/nuts-node/v6/tracing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/http/cmd/cmd.go b/http/cmd/cmd.go index f98d5e5b83..eea825e57c 100644 --- a/http/cmd/cmd.go +++ b/http/cmd/cmd.go @@ -20,7 +20,7 @@ package cmd import ( "fmt" - "github.com/nuts-foundation/nuts-node/http" + "github.com/nuts-foundation/nuts-node/v6/http" "github.com/spf13/pflag" ) diff --git a/http/echo.go b/http/echo.go index 6446d666bb..c8c41a63ae 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/v6/core" "github.com/sirupsen/logrus" "net/http" "strings" diff --git a/http/engine.go b/http/engine.go index de98b6e621..88129acba3 100644 --- a/http/engine.go +++ b/http/engine.go @@ -31,13 +31,13 @@ import ( "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" - "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/tracing" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" + "github.com/nuts-foundation/nuts-node/v6/core" + cryptoEngine "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/http/client" + "github.com/nuts-foundation/nuts-node/v6/http/log" + "github.com/nuts-foundation/nuts-node/v6/http/tokenV2" + "github.com/nuts-foundation/nuts-node/v6/tracing" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" "go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho" ) diff --git a/http/engine_test.go b/http/engine_test.go index 18d770e8e7..e5682d5f31 100644 --- a/http/engine_test.go +++ b/http/engine_test.go @@ -35,10 +35,10 @@ import ( "github.com/lestrrat-go/jwx/v3/jwa" "github.com/lestrrat-go/jwx/v3/jwk" "github.com/lestrrat-go/jwx/v3/jwt" - "github.com/nuts-foundation/nuts-node/core" - "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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/http/client" + "github.com/nuts-foundation/nuts-node/v6/http/log" + "github.com/nuts-foundation/nuts-node/v6/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..c73da13192 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/v6/core" "github.com/sirupsen/logrus" ) diff --git a/http/requestlogger.go b/http/requestlogger.go index c1e2f44985..d5825423dc 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/v6/core" "github.com/sirupsen/logrus" "mime" ) diff --git a/http/requestlogger_test.go b/http/requestlogger_test.go index 8526a5f557..7f9cded716 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/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 84c126af50..4d49fca01b 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/v6/http/log" "github.com/lestrrat-go/jwx/v3/jwk" ) diff --git a/http/tokenV2/middleware.go b/http/tokenV2/middleware.go index ab731e5bbb..193a5b8f9d 100644 --- a/http/tokenV2/middleware.go +++ b/http/tokenV2/middleware.go @@ -32,9 +32,9 @@ import ( "github.com/lestrrat-go/jwx/v3/jwa" "github.com/lestrrat-go/jwx/v3/jws" "github.com/lestrrat-go/jwx/v3/jwt" - "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/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/http/log" "github.com/sirupsen/logrus" ) diff --git a/http/tokenV2/middleware_test.go b/http/tokenV2/middleware_test.go index a4805e8b84..465837f5b9 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/v6/core" "net/http" "net/http/httptest" "testing" "time" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v6/audit" "golang.org/x/crypto/ssh" diff --git a/http/user/session.go b/http/user/session.go index 1e81933e7a..d7248e6c67 100644 --- a/http/user/session.go +++ b/http/user/session.go @@ -29,9 +29,9 @@ import ( "github.com/lestrrat-go/jwx/v3/jwk" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/log" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v6/auth/log" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/storage" "net/http" "time" ) diff --git a/http/user/session_test.go b/http/user/session_test.go index 3695402bd8..81458c69d2 100644 --- a/http/user/session_test.go +++ b/http/user/session_test.go @@ -27,7 +27,7 @@ import ( "github.com/lestrrat-go/jwx/v3/jwk" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v6/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "net/http" diff --git a/jsonld/jsonld.go b/jsonld/jsonld.go index d6e5a70fba..04ad8c4fa5 100644 --- a/jsonld/jsonld.go +++ b/jsonld/jsonld.go @@ -22,8 +22,8 @@ import ( "bytes" "fmt" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/jsonld/log" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/jsonld/log" "github.com/piprate/json-gold/ld" ) diff --git a/jsonld/jsonld_test.go b/jsonld/jsonld_test.go index 1b7b1d0215..5dd4a61518 100644 --- a/jsonld/jsonld_test.go +++ b/jsonld/jsonld_test.go @@ -22,7 +22,7 @@ import ( "encoding/json" "testing" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/stretchr/testify/assert" ) diff --git a/jsonld/ldutils.go b/jsonld/ldutils.go index 34100e3f1e..4cce2c8f1e 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/v6/jsonld/log" + "github.com/nuts-foundation/nuts-node/v6/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..a096273a3f 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/v6/core" "github.com/sirupsen/logrus" ) diff --git a/jsonld/test.go b/jsonld/test.go index db13040365..2a86bbc41b 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/v6/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 e8735f76c2..9853652f9f 100644 --- a/jsonld/testsuite/compat_test.go +++ b/jsonld/testsuite/compat_test.go @@ -22,12 +22,12 @@ 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/storage/orm" - "github.com/nuts-foundation/nuts-node/vcr/signature" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature" + "github.com/nuts-foundation/nuts-node/v6/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..5910d413da 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/v6/cmd" "github.com/sirupsen/logrus" "os" "os/signal" diff --git a/main_test.go b/main_test.go index 45df58769b..8c05aa38e4 100644 --- a/main_test.go +++ b/main_test.go @@ -25,17 +25,17 @@ import ( "github.com/knadh/koanf/parsers/yaml" "github.com/knadh/koanf/providers/structs" "github.com/knadh/koanf/v2" - "github.com/nuts-foundation/nuts-node/auth" - "github.com/nuts-foundation/nuts-node/cmd" - "github.com/nuts-foundation/nuts-node/core" - "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/storage" - "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/v6/auth" + "github.com/nuts-foundation/nuts-node/v6/cmd" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/events" + httpEngine "github.com/nuts-foundation/nuts-node/v6/http" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/test/pki" + v1 "github.com/nuts-foundation/nuts-node/v6/vdr/api/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "io" diff --git a/network/api/v1/api.go b/network/api/v1/api.go index 8089f877c2..dc987c431b 100644 --- a/network/api/v1/api.go +++ b/network/api/v1/api.go @@ -23,15 +23,15 @@ 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/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/network/log" "net/http" "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/v6/core" + hash2 "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/network/dag" ) var _ StrictServerInterface = (*Wrapper)(nil) diff --git a/network/api/v1/api_test.go b/network/api/v1/api_test.go index 344c35b08d..9bd686a153 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/v6/test/http" "github.com/stretchr/testify/require" "strings" "testing" "time" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v6/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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/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 a1d06a172a..a3e9e257c0 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/v6/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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/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..b752e3f6f0 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/v6/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/v6/network/transport" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag" "github.com/stretchr/testify/assert" ) diff --git a/network/api/v1/types.go b/network/api/v1/types.go index 4fdad1c3be..291024a28a 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/v6/network/transport" "time" ) diff --git a/network/cmd/cmd.go b/network/cmd/cmd.go index 82ba685b28..41d4a0edd8 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/v6/network" + "github.com/nuts-foundation/nuts-node/v6/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/v6/core" + hash2 "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + v1 "github.com/nuts-foundation/nuts-node/v6/network/api/v1" + "github.com/nuts-foundation/nuts-node/v6/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..86704e2c08 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/v6/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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + http2 "github.com/nuts-foundation/nuts-node/v6/test/http" "github.com/stretchr/testify/assert" ) diff --git a/network/config.go b/network/config.go index cd56f3888f..9fd84aed1b 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/v6/network/transport/v2" "time" ) diff --git a/network/dag/consistency.go b/network/dag/consistency.go index 5e0dd847f4..093e74c698 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/v6/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v6/network/log" "sync" "time" ) diff --git a/network/dag/consistency_test.go b/network/dag/consistency_test.go index af6fa50762..2f2228fc56 100644 --- a/network/dag/consistency_test.go +++ b/network/dag/consistency_test.go @@ -21,11 +21,11 @@ package dag import ( "context" "encoding/binary" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/network/dag/tree" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/test/io" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/network/dag/dag.go b/network/dag/dag.go index a8e6260019..f6a4d23cdf 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/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 4b072621fe..243f947e7f 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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/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 8b96036091..533bbc6fc9 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag/tree" "math" ) diff --git a/network/dag/keys.go b/network/dag/keys.go index d1b4ad3de2..ab7c804421 100644 --- a/network/dag/keys.go +++ b/network/dag/keys.go @@ -21,8 +21,8 @@ import ( "crypto" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto/hash" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) // SourceTXKeyResolver implements the SourceTXKeyResolver interface. diff --git a/network/dag/keys_test.go b/network/dag/keys_test.go index ca60aea340..194ed07195 100644 --- a/network/dag/keys_test.go +++ b/network/dag/keys_test.go @@ -23,8 +23,8 @@ import ( "crypto/rand" 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/resolver" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/network/dag/mock.go b/network/dag/mock.go index cf62a78aba..1a1b831642 100644 --- a/network/dag/mock.go +++ b/network/dag/mock.go @@ -14,9 +14,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/v6/core" + hash "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + tree "github.com/nuts-foundation/nuts-node/v6/network/dag/tree" gomock "go.uber.org/mock/gomock" ) diff --git a/network/dag/notifier.go b/network/dag/notifier.go index 15ea29f6da..5d4dde744e 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/v6/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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/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 bb7b61d9c4..57261e1800 100644 --- a/network/dag/notifier_mock.go +++ b/network/dag/notifier_mock.go @@ -13,7 +13,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/v6/crypto/hash" gomock "go.uber.org/mock/gomock" ) diff --git a/network/dag/notifier_test.go b/network/dag/notifier_test.go index 07021bac81..e8e91e52b9 100644 --- a/network/dag/notifier_test.go +++ b/network/dag/notifier_test.go @@ -24,11 +24,11 @@ import ( "encoding/json" "errors" "github.com/nuts-foundation/go-stoabs" - "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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/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 0102c4f167..e978aea235 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/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "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/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/network/log" ) // 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 55f3f3a5c2..7de4aa8cc7 100644 --- a/network/dag/pal_test.go +++ b/network/dag/pal_test.go @@ -24,13 +24,13 @@ import ( "crypto/elliptic" "crypto/rand" "crypto/rsa" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/require" "testing" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/network/dag/parser.go b/network/dag/parser.go index 7912213723..1ae1920df8 100644 --- a/network/dag/parser.go +++ b/network/dag/parser.go @@ -29,7 +29,7 @@ import ( "github.com/lestrrat-go/jwx/v3/jwk" "github.com/lestrrat-go/jwx/v3/jws" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/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 f86723369c..65bc5b076d 100644 --- a/network/dag/parser_test.go +++ b/network/dag/parser_test.go @@ -31,7 +31,7 @@ import ( "github.com/lestrrat-go/jwx/v3/jwa" "github.com/lestrrat-go/jwx/v3/jwk" "github.com/lestrrat-go/jwx/v3/jws" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/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..e147f1e5d6 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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/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..1ffa73a0e9 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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/test/io" ) func TestPayloadStore_ReadWrite(t *testing.T) { diff --git a/network/dag/signing.go b/network/dag/signing.go index a623b0469e..019d022ab7 100644 --- a/network/dag/signing.go +++ b/network/dag/signing.go @@ -27,7 +27,7 @@ import ( "github.com/lestrrat-go/jwx/v3/jwk" "github.com/lestrrat-go/jwx/v3/jws" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" ) const errSigningTransactionFmt = "error while signing transaction: %w" diff --git a/network/dag/signing_test.go b/network/dag/signing_test.go index 5883391a0f..c8eb753d61 100644 --- a/network/dag/signing_test.go +++ b/network/dag/signing_test.go @@ -20,14 +20,14 @@ package dag import ( "github.com/lestrrat-go/jwx/v3/jwk" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v6/audit" "github.com/stretchr/testify/require" "testing" "time" - "github.com/nuts-foundation/nuts-node/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto" - hash2 "github.com/nuts-foundation/nuts-node/crypto/hash" + hash2 "github.com/nuts-foundation/nuts-node/v6/crypto/hash" "github.com/stretchr/testify/assert" ) diff --git a/network/dag/state.go b/network/dag/state.go index fe60a74525..8b78e8b0a6 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v6/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 6d8beb38ae..493a67784b 100644 --- a/network/dag/state_test.go +++ b/network/dag/state_test.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test" io_prometheus_client "github.com/prometheus/client_model/go" "github.com/stretchr/testify/require" "go.uber.org/atomic" @@ -38,9 +38,9 @@ import ( "testing" "time" - "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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v6/test/io" "github.com/stretchr/testify/assert" ) diff --git a/network/dag/test.go b/network/dag/test.go index 7e5eab7277..5c5f1c5e66 100644 --- a/network/dag/test.go +++ b/network/dag/test.go @@ -25,16 +25,16 @@ import ( "fmt" "github.com/lestrrat-go/jwx/v3/jwk" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/audit" + "github.com/nuts-foundation/nuts-node/v6/audit" "path" "testing" "time" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v6/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/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/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 5c3c5fddf5..25d1f242ba 100644 --- a/network/dag/transaction.go +++ b/network/dag/transaction.go @@ -28,7 +28,7 @@ import ( "github.com/lestrrat-go/jwx/v3/jwa" "github.com/lestrrat-go/jwx/v3/jwk" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/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..c0ee45e0b1 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/v6/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..f5bafa5d22 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/v6/crypto/hash" "math" "testing" ) diff --git a/network/dag/tree/iblt.go b/network/dag/tree/iblt.go index fde1c40f5c..c081a78b47 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/v6/crypto/hash" "github.com/twmb/murmur3" ) diff --git a/network/dag/tree/iblt_test.go b/network/dag/tree/iblt_test.go index 150a7d6079..215b026a8c 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/v6/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..ce837f00b5 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/v6/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..4ba5fd452a 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/v6/crypto/hash" ) const testLeafSize = uint32(4) diff --git a/network/dag/tree/xor.go b/network/dag/tree/xor.go index c260196cf1..ec8c4237a3 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/v6/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..2f30a19f13 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/v6/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..2cae2df157 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/v6/network/dag/tree" ) type treeStore struct { diff --git a/network/dag/treestore_test.go b/network/dag/treestore_test.go index 1ddcc6d2fb..9013e6655b 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/v6/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v6/test/io" ) const testLeafSize = 512 diff --git a/network/dag/verifier.go b/network/dag/verifier.go index 3950610e4d..0c37cd9f7b 100644 --- a/network/dag/verifier.go +++ b/network/dag/verifier.go @@ -23,7 +23,7 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/lestrrat-go/jwx/v3/jwa" "github.com/lestrrat-go/jwx/v3/jwk" diff --git a/network/dag/verifier_test.go b/network/dag/verifier_test.go index af6fbddd13..8da7e46bc9 100644 --- a/network/dag/verifier_test.go +++ b/network/dag/verifier_test.go @@ -25,16 +25,16 @@ import ( "crypto/elliptic" "crypto/rand" "errors" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/require" "testing" "time" "github.com/lestrrat-go/jwx/v3/jwk" "github.com/nuts-foundation/go-stoabs" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/hash" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/network/interface.go b/network/interface.go index 847d6e58e7..cd9813d93d 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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/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..0b5227afa4 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/v6/core" "github.com/sirupsen/logrus" ) diff --git a/network/mock.go b/network/mock.go index 4a2c5c8ecb..fc0469a946 100644 --- a/network/mock.go +++ b/network/mock.go @@ -14,9 +14,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/v6/crypto/hash" + dag "github.com/nuts-foundation/nuts-node/v6/network/dag" + transport "github.com/nuts-foundation/nuts-node/v6/network/transport" gomock "go.uber.org/mock/gomock" ) diff --git a/network/network.go b/network/network.go index 82502bac48..c01ff4bd2f 100644 --- a/network/network.go +++ b/network/network.go @@ -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/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/events" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/network/log" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/network/transport/grpc" + "github.com/nuts-foundation/nuts-node/v6/network/transport/v2" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "go.etcd.io/bbolt" ) diff --git a/network/network_integration_test.go b/network/network_integration_test.go index 0bc9af1c7d..812e7acf71 100644 --- a/network/network_integration_test.go +++ b/network/network_integration_test.go @@ -24,9 +24,9 @@ import ( "encoding/json" "fmt" "github.com/google/uuid" - testPKI "github.com/nuts-foundation/nuts-node/test/pki" - "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + testPKI "github.com/nuts-foundation/nuts-node/v6/test/pki" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "hash/crc32" "net/url" "path" @@ -38,20 +38,20 @@ 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/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/events" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/network/log" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/network/transport/grpc" + v2 "github.com/nuts-foundation/nuts-node/v6/network/transport/v2" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/test/io" "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 cd7e29b724..b733483c81 100644 --- a/network/network_test.go +++ b/network/network_test.go @@ -39,20 +39,20 @@ 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" - testPKI "github.com/nuts-foundation/nuts-node/test/pki" - "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/events" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test/io" + testPKI "github.com/nuts-foundation/nuts-node/v6/test/pki" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "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..f7c651a37d 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/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/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 1e0b1e88e8..6145518c0c 100644 --- a/network/test.go +++ b/network/test.go @@ -19,15 +19,15 @@ package network import ( - "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" "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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/events" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test/io" "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..ed48f9f951 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/v6/core" "time" ) diff --git a/network/transport/connection_manager_mock.go b/network/transport/connection_manager_mock.go index 8cf63fb483..dafed0221b 100644 --- a/network/transport/connection_manager_mock.go +++ b/network/transport/connection_manager_mock.go @@ -14,7 +14,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/v6/core" gomock "go.uber.org/mock/gomock" ) diff --git a/network/transport/grpc/addressbook.go b/network/transport/grpc/addressbook.go index 0470209e64..62be0c25fb 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/v6/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..72d985598a 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/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/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 185b393772..14d694b7e1 100644 --- a/network/transport/grpc/authenticator.go +++ b/network/transport/grpc/authenticator.go @@ -22,10 +22,10 @@ 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/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/network/log" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "net/url" "strings" ) diff --git a/network/transport/grpc/authenticator_mock.go b/network/transport/grpc/authenticator_mock.go index c5b9ec9eee..67c831121a 100644 --- a/network/transport/grpc/authenticator_mock.go +++ b/network/transport/grpc/authenticator_mock.go @@ -13,7 +13,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/v6/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 889c25fedf..3a0acc6f38 100644 --- a/network/transport/grpc/authenticator_test.go +++ b/network/transport/grpc/authenticator_test.go @@ -20,14 +20,14 @@ package grpc import ( "crypto/x509" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/require" "os" "testing" 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/v6/network/transport" "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..f63717fc21 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/v6/network/log" "math/rand" "sync" "time" diff --git a/network/transport/grpc/backoff_test.go b/network/transport/grpc/backoff_test.go index c3eed0c584..630e3ba8f0 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/v6/test/io" "path" "sync" "testing" diff --git a/network/transport/grpc/config.go b/network/transport/grpc/config.go index 4f89bec209..6f38d765bc 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/v6/core" + networkTypes "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/pki" "google.golang.org/grpc" "net" "time" diff --git a/network/transport/grpc/config_test.go b/network/transport/grpc/config_test.go index 86338e200c..f1cf444587 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/pki" + testPKI "github.com/nuts-foundation/nuts-node/v6/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..5e2f71a7b9 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/v6/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/v6/network/log" + "github.com/nuts-foundation/nuts-node/v6/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..68c931a0da 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/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..ed6a78d900 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/v6/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 213d5da93b..af54a6f6c8 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/network/log" + "github.com/nuts-foundation/nuts-node/v6/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 f5aa5e2144..3e5dde74a0 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/v6/core" + testPKI "github.com/nuts-foundation/nuts-node/v6/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/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test" + io2 "github.com/nuts-foundation/nuts-node/v6/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 c428827d6f..93bd1423f9 100644 --- a/network/transport/grpc/connection_mock.go +++ b/network/transport/grpc/connection_mock.go @@ -12,7 +12,7 @@ package grpc import ( reflect "reflect" - transport "github.com/nuts-foundation/nuts-node/network/transport" + transport "github.com/nuts-foundation/nuts-node/v6/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..e2ddc4baf2 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/v6/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/v6/network/transport" "github.com/stretchr/testify/assert" ) diff --git a/network/transport/grpc/interface.go b/network/transport/grpc/interface.go index 960c725726..c6209687cb 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/v6/network/transport" "google.golang.org/grpc" ) diff --git a/network/transport/grpc/interface_mock.go b/network/transport/grpc/interface_mock.go index 1c6e951c24..3341bcf7b8 100644 --- a/network/transport/grpc/interface_mock.go +++ b/network/transport/grpc/interface_mock.go @@ -13,8 +13,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/v6/core" + transport "github.com/nuts-foundation/nuts-node/v6/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..310c1074cb 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/v6/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..fe24791603 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/v6/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 ab6dff02f3..b087044428 100644 --- a/network/transport/grpc/stats_test.go +++ b/network/transport/grpc/stats_test.go @@ -22,7 +22,7 @@ import ( "errors" "testing" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v6/network/transport" "github.com/prometheus/client_golang/prometheus" io_prometheus_client "github.com/prometheus/client_model/go" "github.com/stretchr/testify/assert" diff --git a/network/transport/grpc/test.go b/network/transport/grpc/test.go index 8fb624747c..dfb907da5d 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/v6/network/transport" "google.golang.org/grpc/status" "testing" ) diff --git a/network/transport/grpc/testprotocol_impl.pb.go b/network/transport/grpc/testprotocol_impl.pb.go index 717d7a916d..129b2f1c8a 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/network/transport" "google.golang.org/grpc" ) diff --git a/network/transport/grpc/tls_offloading.go b/network/transport/grpc/tls_offloading.go index f114bc05ef..13e79b9523 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/network/log" + "github.com/nuts-foundation/nuts-node/v6/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 347b7fa27a..f7f467ba44 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/v6/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 293da7e827..dc87dda71b 100644 --- a/network/transport/grpc/util.go +++ b/network/transport/grpc/util.go @@ -21,7 +21,7 @@ package grpc import ( "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/network/transport" + "github.com/nuts-foundation/nuts-node/v6/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..b6a23fbc9b 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/v6/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 9748f8fd82..b152674f74 100644 --- a/network/transport/protocol_mock.go +++ b/network/transport/protocol_mock.go @@ -12,7 +12,7 @@ package transport import ( reflect "reflect" - core "github.com/nuts-foundation/nuts-node/core" + core "github.com/nuts-foundation/nuts-node/v6/core" gomock "go.uber.org/mock/gomock" ) diff --git a/network/transport/types.go b/network/transport/types.go index 6ea2c7c48c..f388a3552e 100644 --- a/network/transport/types.go +++ b/network/transport/types.go @@ -29,7 +29,7 @@ import ( "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/sirupsen/logrus" ) diff --git a/network/transport/types_test.go b/network/transport/types_test.go index e71162bfca..37716aba5e 100644 --- a/network/transport/types_test.go +++ b/network/transport/types_test.go @@ -19,7 +19,7 @@ package transport import ( - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/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..4efb36358c 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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/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..6c779f6068 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/v6/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/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/test" "github.com/stretchr/testify/assert" ) diff --git a/network/transport/v2/gossip/manager.go b/network/transport/v2/gossip/manager.go index ff322a935c..f2985a719a 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/v6/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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/log" + "github.com/nuts-foundation/nuts-node/v6/network/transport" ) const maxQueueSize = 100 diff --git a/network/transport/v2/gossip/manager_test.go b/network/transport/v2/gossip/manager_test.go index 85c9b6e5d4..a0fc77349e 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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/transport" "github.com/stretchr/testify/assert" ) diff --git a/network/transport/v2/gossip/mock.go b/network/transport/v2/gossip/mock.go index c78fdd998f..7636e46c8e 100644 --- a/network/transport/v2/gossip/mock.go +++ b/network/transport/v2/gossip/mock.go @@ -12,8 +12,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/v6/crypto/hash" + transport "github.com/nuts-foundation/nuts-node/v6/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..b4459123ba 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/v6/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 8d6a474010..e65dadbca0 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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/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..dc905ab58a 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/v6/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..97fde85f58 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/v6/crypto/hash" "github.com/stretchr/testify/assert" ) diff --git a/network/transport/v2/handlers.go b/network/transport/v2/handlers.go index 893a75ce16..dce927a322 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v6/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 01a8d14dc4..a45f462d4f 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/v6/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/v6/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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/network/transport" ) var ( diff --git a/network/transport/v2/peer_diagnostics.go b/network/transport/v2/peer_diagnostics.go index 28415c7081..c1e7a38339 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/v6/network/transport" "sync" "time" ) diff --git a/network/transport/v2/peer_diagnostics_test.go b/network/transport/v2/peer_diagnostics_test.go index 60b8c14be4..2f0c834407 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/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 716a4528c5..5b7e8b6561 100644 --- a/network/transport/v2/protocol.go +++ b/network/transport/v2/protocol.go @@ -24,21 +24,21 @@ import ( "fmt" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "strings" "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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/log" + "github.com/nuts-foundation/nuts-node/v6/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" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/network/transport/grpc" ) var _ grpc.Protocol = (*protocol)(nil) diff --git a/network/transport/v2/protocol_integration_test.go b/network/transport/v2/protocol_integration_test.go index 02c06e0c73..a1b6076a25 100644 --- a/network/transport/v2/protocol_integration_test.go +++ b/network/transport/v2/protocol_integration_test.go @@ -22,8 +22,8 @@ package v2 import ( "context" "fmt" - "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "hash/crc32" "path" "sync" @@ -31,15 +31,15 @@ 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" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/network/log" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/network/transport/grpc" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/test/io" "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 2f84b2a41a..ef2dfb1fa7 100644 --- a/network/transport/v2/protocol_test.go +++ b/network/transport/v2/protocol_test.go @@ -23,7 +23,7 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/require" "go.uber.org/goleak" "strings" @@ -32,18 +32,18 @@ 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/v6/network/transport/v2/gossip" + "github.com/nuts-foundation/nuts-node/v6/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" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/network/transport/grpc" ) type protocolMocks struct { diff --git a/network/transport/v2/senders.go b/network/transport/v2/senders.go index 4509dc48ef..ba3b26f92a 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v6/network/log" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/network/transport/grpc" ) const transactionListMessageOverhead = 512 diff --git a/network/transport/v2/senders_mock.go b/network/transport/v2/senders_mock.go index 5c2ad466d5..bd810cbe0b 100644 --- a/network/transport/v2/senders_mock.go +++ b/network/transport/v2/senders_mock.go @@ -12,10 +12,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/v6/crypto/hash" + tree "github.com/nuts-foundation/nuts-node/v6/network/dag/tree" + transport "github.com/nuts-foundation/nuts-node/v6/network/transport" + grpc "github.com/nuts-foundation/nuts-node/v6/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..671b3e65be 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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/network/dag/tree" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/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..5b56245c0f 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/network/log" + "github.com/nuts-foundation/nuts-node/v6/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 a3df827136..b9d575c781 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/v6/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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/test" "github.com/stretchr/testify/assert" "go.uber.org/goleak" ) diff --git a/network/tx.go b/network/tx.go index d42ae9949b..3c1137c535 100644 --- a/network/tx.go +++ b/network/tx.go @@ -23,8 +23,8 @@ import ( "time" "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/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network/dag" ) // TransactionTemplate creates a new Template with the given required properties. diff --git a/pki/interface.go b/pki/interface.go index ad3f429f86..ad6c502ef4 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/v6/core" "time" ) diff --git a/pki/logger.go b/pki/logger.go index ed49e47999..99a867ad2a 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/v6/core" "github.com/sirupsen/logrus" ) diff --git a/pki/mock.go b/pki/mock.go index 3411fc81db..1dfbcbe8fd 100644 --- a/pki/mock.go +++ b/pki/mock.go @@ -15,7 +15,7 @@ import ( reflect "reflect" time "time" - core "github.com/nuts-foundation/nuts-node/core" + core "github.com/nuts-foundation/nuts-node/v6/core" gomock "go.uber.org/mock/gomock" ) diff --git a/pki/pki.go b/pki/pki.go index d5e1b25763..073d921092 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/v6/core" "os" "time" ) diff --git a/pki/pki_test.go b/pki/pki_test.go index 5028f4601f..309f90c71f 100644 --- a/pki/pki_test.go +++ b/pki/pki_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pki/validator.go b/pki/validator.go index 1fef65b4de..a8c3f8ef13 100644 --- a/pki/validator.go +++ b/pki/validator.go @@ -30,7 +30,7 @@ import ( "sync" "time" - "github.com/nuts-foundation/nuts-node/tracing" + "github.com/nuts-foundation/nuts-node/v6/tracing" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" ) diff --git a/pki/validator_test.go b/pki/validator_test.go index 6332ce996a..e9f44d47dc 100644 --- a/pki/validator_test.go +++ b/pki/validator_test.go @@ -33,7 +33,7 @@ import ( "sync" "testing" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/policy/authzen/client.go b/policy/authzen/client.go index f367510a66..46830a65a8 100644 --- a/policy/authzen/client.go +++ b/policy/authzen/client.go @@ -26,7 +26,7 @@ import ( "fmt" "net/http" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" ) const evaluationsPath = "/access/v1/evaluations" diff --git a/policy/interface.go b/policy/interface.go index 8a805a236c..47c31fd261 100644 --- a/policy/interface.go +++ b/policy/interface.go @@ -23,8 +23,8 @@ import ( "errors" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/policy/authzen" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/policy/authzen" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" ) // ModuleName is the name of the policy module. diff --git a/policy/local.go b/policy/local.go index f8f6e93b89..ae3130bf91 100644 --- a/policy/local.go +++ b/policy/local.go @@ -22,11 +22,11 @@ import ( "context" "encoding/json" "fmt" - "github.com/nuts-foundation/nuts-node/core" - httpClient "github.com/nuts-foundation/nuts-node/http/client" - "github.com/nuts-foundation/nuts-node/policy/authzen" - "github.com/nuts-foundation/nuts-node/vcr/pe" - v2 "github.com/nuts-foundation/nuts-node/vcr/pe/schema/v2" + "github.com/nuts-foundation/nuts-node/v6/core" + httpClient "github.com/nuts-foundation/nuts-node/v6/http/client" + "github.com/nuts-foundation/nuts-node/v6/policy/authzen" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + v2 "github.com/nuts-foundation/nuts-node/v6/vcr/pe/schema/v2" "io" "os" "strings" diff --git a/policy/local_test.go b/policy/local_test.go index 139b12702d..0b9b40d6ae 100644 --- a/policy/local_test.go +++ b/policy/local_test.go @@ -20,8 +20,8 @@ package policy import ( "context" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" "testing" "github.com/stretchr/testify/assert" diff --git a/policy/mock.go b/policy/mock.go index 88a06382d6..19c03e5d08 100644 --- a/policy/mock.go +++ b/policy/mock.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - authzen "github.com/nuts-foundation/nuts-node/policy/authzen" + authzen "github.com/nuts-foundation/nuts-node/v6/policy/authzen" gomock "go.uber.org/mock/gomock" ) diff --git a/policy/scope_granter.go b/policy/scope_granter.go index 9f141c8a7d..38bb325fe9 100644 --- a/policy/scope_granter.go +++ b/policy/scope_granter.go @@ -24,8 +24,8 @@ import ( "strings" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/policy/authzen" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/policy/authzen" ) // ScopeGranter computes the scopes to grant for an access token request, based on a diff --git a/policy/scope_granter_test.go b/policy/scope_granter_test.go index 9201aa850d..e72731614b 100644 --- a/policy/scope_granter_test.go +++ b/policy/scope_granter_test.go @@ -24,8 +24,8 @@ import ( "testing" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/policy/authzen" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/policy/authzen" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/storage/bbolt.go b/storage/bbolt.go index 3def337e46..f855fa9a62 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/storage/log" bboltLib "go.etcd.io/bbolt" ) diff --git a/storage/bbolt_test.go b/storage/bbolt_test.go index 5328ce2f6d..133d413840 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/v6/test" + "github.com/nuts-foundation/nuts-node/v6/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 68659e9b31..22782b2395 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/v6/storage" "github.com/spf13/pflag" ) diff --git a/storage/engine.go b/storage/engine.go index e7211c8329..b2ce9cdd15 100644 --- a/storage/engine.go +++ b/storage/engine.go @@ -33,10 +33,10 @@ import ( _ "github.com/microsoft/go-mssqldb/azuread" 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/storage/log" - "github.com/nuts-foundation/nuts-node/storage/sql_migrations" - "github.com/nuts-foundation/nuts-node/tracing" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/storage/log" + "github.com/nuts-foundation/nuts-node/v6/storage/sql_migrations" + "github.com/nuts-foundation/nuts-node/v6/tracing" "github.com/nuts-foundation/sqlite" "github.com/piprate/json-gold/ld" "github.com/pressly/goose/v3" diff --git a/storage/engine_azuresql_test.go b/storage/engine_azuresql_test.go index 972c998e08..a1f97853c6 100644 --- a/storage/engine_azuresql_test.go +++ b/storage/engine_azuresql_test.go @@ -20,7 +20,7 @@ package storage import ( "fmt" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/stretchr/testify/require" "testing" ) diff --git a/storage/engine_test.go b/storage/engine_test.go index 5c18a28f9e..ddb944b67c 100644 --- a/storage/engine_test.go +++ b/storage/engine_test.go @@ -30,8 +30,8 @@ import ( "github.com/alicebob/miniredis/v2" 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/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 80dbbd8161..79d87d61be 100644 --- a/storage/interface.go +++ b/storage/interface.go @@ -23,7 +23,7 @@ import ( "time" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "gorm.io/gorm" ) diff --git a/storage/leia.go b/storage/leia.go index 5ef26da06f..91a7a1fc39 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/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 c79b308758..5d36658580 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/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/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..9a7df2621a 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/v6/core" "github.com/sirupsen/logrus" ) diff --git a/storage/mock.go b/storage/mock.go index c8f30a84ae..3c152140a4 100644 --- a/storage/mock.go +++ b/storage/mock.go @@ -14,7 +14,7 @@ import ( time "time" stoabs "github.com/nuts-foundation/go-stoabs" - core "github.com/nuts-foundation/nuts-node/core" + core "github.com/nuts-foundation/nuts-node/v6/core" gomock "go.uber.org/mock/gomock" gorm "gorm.io/gorm" ) diff --git a/storage/orm/did_document.go b/storage/orm/did_document.go index d0def02736..0361480f71 100644 --- a/storage/orm/did_document.go +++ b/storage/orm/did_document.go @@ -24,7 +24,7 @@ import ( "github.com/google/uuid" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/jsonld" + "github.com/nuts-foundation/nuts-node/v6/jsonld" "gorm.io/gorm/schema" ) diff --git a/storage/orm/test.go b/storage/orm/test.go index 816a8a01c2..534f74478d 100644 --- a/storage/orm/test.go +++ b/storage/orm/test.go @@ -19,7 +19,7 @@ package orm import ( - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v6/storage" "github.com/stretchr/testify/require" "gorm.io/gorm" "testing" diff --git a/storage/rds_iam.go b/storage/rds_iam.go index 54ae89b0f1..be66682fbd 100644 --- a/storage/rds_iam.go +++ b/storage/rds_iam.go @@ -31,7 +31,7 @@ import ( "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/feature/rds/auth" _ "github.com/jackc/pgx/v5/stdlib" // Import postgres driver for sql.Open - "github.com/nuts-foundation/nuts-node/storage/log" + "github.com/nuts-foundation/nuts-node/v6/storage/log" ) var loadAWSConfigForRegion = func(ctx context.Context, region string) (aws.Config, error) { diff --git a/storage/redis.go b/storage/redis.go index e9e77ae450..c703d9e7de 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/storage/log" "github.com/redis/go-redis/v9" "github.com/sirupsen/logrus" "path" diff --git a/storage/test.go b/storage/test.go index 9d0a13af53..52dc49a5a0 100644 --- a/storage/test.go +++ b/storage/test.go @@ -24,13 +24,13 @@ import ( "fmt" "github.com/alicebob/miniredis/v2" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v6/test/io" "testing" "time" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-stoabs/bbolt" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/stretchr/testify/require" "gorm.io/gorm" ) diff --git a/test/http/server.go b/test/http/server.go index cf44a18e9d..20e19cae5d 100644 --- a/test/http/server.go +++ b/test/http/server.go @@ -20,7 +20,7 @@ package http import ( "crypto/tls" - "github.com/nuts-foundation/nuts-node/test/pki" + "github.com/nuts-foundation/nuts-node/v6/test/pki" "net/http" "net/http/httptest" "testing" diff --git a/test/node/server.go b/test/node/server.go index 441a55355e..2d4c5ff3ab 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/v6/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/v6/cmd" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/test/io" ) const testServerConfig = `verbosity: debug diff --git a/test/pki/test.go b/test/pki/test.go index f8a9dda3e4..5e51cb87eb 100644 --- a/test/pki/test.go +++ b/test/pki/test.go @@ -28,7 +28,7 @@ import ( "encoding/asn1" "encoding/base64" "github.com/lestrrat-go/jwx/v3/cert" - "github.com/nuts-foundation/nuts-node/test/io" + "github.com/nuts-foundation/nuts-node/v6/test/io" "math/big" "net" "os" diff --git a/tracing/cmd/cmd.go b/tracing/cmd/cmd.go index df72748818..6a489e99f4 100644 --- a/tracing/cmd/cmd.go +++ b/tracing/cmd/cmd.go @@ -20,7 +20,7 @@ package cmd import ( - "github.com/nuts-foundation/nuts-node/tracing" + "github.com/nuts-foundation/nuts-node/v6/tracing" "github.com/spf13/pflag" ) diff --git a/tracing/engine.go b/tracing/engine.go index 9b79af8f2b..4617e09f3f 100644 --- a/tracing/engine.go +++ b/tracing/engine.go @@ -27,7 +27,7 @@ import ( "sync/atomic" "time" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/sirupsen/logrus" "go.opentelemetry.io/contrib/bridges/otellogrus" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" diff --git a/tracing/engine_test.go b/tracing/engine_test.go index 87be42d331..7611e91cc2 100644 --- a/tracing/engine_test.go +++ b/tracing/engine_test.go @@ -24,7 +24,7 @@ import ( "net/http" "testing" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/vcr/ambassador.go b/vcr/ambassador.go index 63dd274816..8632acb32b 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/events" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" "github.com/piprate/json-gold/ld" ) diff --git a/vcr/ambassador_test.go b/vcr/ambassador_test.go index a70038ba45..b4688609bc 100644 --- a/vcr/ambassador_test.go +++ b/vcr/ambassador_test.go @@ -32,18 +32,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/audit" - "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" - vcrTest "github.com/nuts-foundation/nuts-node/vcr/test" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/crypto/util" + "github.com/nuts-foundation/nuts-node/v6/events" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + vcrTest "github.com/nuts-foundation/nuts-node/v6/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" "github.com/piprate/json-gold/ld" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/vcr/api/openid4vci/v0/api.go b/vcr/api/openid4vci/v0/api.go index 0297535816..b24d712fe5 100644 --- a/vcr/api/openid4vci/v0/api.go +++ b/vcr/api/openid4vci/v0/api.go @@ -23,13 +23,13 @@ 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/auth/oauth" - "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" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/vdr" "net/http" ) diff --git a/vcr/api/openid4vci/v0/api_test.go b/vcr/api/openid4vci/v0/api_test.go index fbc6a8d987..e393c5de68 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/v6/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..4b4a0edb5e 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/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 1601839982..ee8d59dc67 100644 --- a/vcr/api/openid4vci/v0/holder_test.go +++ b/vcr/api/openid4vci/v0/holder_test.go @@ -24,11 +24,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/vcr" - "github.com/nuts-foundation/nuts-node/vcr/holder" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" "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 19d5325a0c..003e8aa4dc 100644 --- a/vcr/api/openid4vci/v0/issuer.go +++ b/vcr/api/openid4vci/v0/issuer.go @@ -24,9 +24,9 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/vcr/issuer" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" "net/http" "strings" ) diff --git a/vcr/api/openid4vci/v0/issuer_test.go b/vcr/api/openid4vci/v0/issuer_test.go index e1ee52f15d..5f1b2dfd9c 100644 --- a/vcr/api/openid4vci/v0/issuer_test.go +++ b/vcr/api/openid4vci/v0/issuer_test.go @@ -22,12 +22,12 @@ import ( "context" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - oauth2 "github.com/nuts-foundation/nuts-node/auth/oauth" - "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" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" + oauth2 "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vcr/api/openid4vci/v0/types.go b/vcr/api/openid4vci/v0/types.go index bd375be388..f1e7c36f83 100644 --- a/vcr/api/openid4vci/v0/types.go +++ b/vcr/api/openid4vci/v0/types.go @@ -18,7 +18,7 @@ package v0 -import "github.com/nuts-foundation/nuts-node/auth/oauth" +import "github.com/nuts-foundation/nuts-node/v6/auth/oauth" func (r RequestAccessToken200JSONResponse) MarshalJSON() ([]byte, error) { return oauth.TokenResponse(r).MarshalJSON() diff --git a/vcr/api/vcr/v2/api.go b/vcr/api/vcr/v2/api.go index 8d7c21b128..c2c08095a7 100644 --- a/vcr/api/vcr/v2/api.go +++ b/vcr/api/vcr/v2/api.go @@ -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/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" - vcrTypes "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vcr/verifier" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + vcrTypes "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) var clockFn = func() time.Time { diff --git a/vcr/api/vcr/v2/api_test.go b/vcr/api/vcr/v2/api_test.go index e0d8d22776..1f8104dd99 100644 --- a/vcr/api/vcr/v2/api_test.go +++ b/vcr/api/vcr/v2/api_test.go @@ -29,22 +29,22 @@ import ( "time" "github.com/labstack/echo/v4" - "github.com/nuts-foundation/nuts-node/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/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/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/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "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 cbf3b208e3..8b97b3e355 100644 --- a/vcr/api/vcr/v2/client.go +++ b/vcr/api/vcr/v2/client.go @@ -24,7 +24,7 @@ import ( "encoding/json" "fmt" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "io" "net/http" ) diff --git a/vcr/api/vcr/v2/client_test.go b/vcr/api/vcr/v2/client_test.go index df4d3b5700..0b6b7a04d1 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/v6/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/v6/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..02b63a2b15 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/v6/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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/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 50e58921f9..2f249d5690 100644 --- a/vcr/api/vcr/v2/registry_test.go +++ b/vcr/api/vcr/v2/registry_test.go @@ -25,9 +25,9 @@ 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/vcr" - "github.com/nuts-foundation/nuts-node/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" "github.com/stretchr/testify/require" "github.com/stretchr/testify/assert" diff --git a/vcr/api/vcr/v2/types.go b/vcr/api/vcr/v2/types.go index 6b13a861ce..d965ba7e73 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/v6/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 01db27af37..17c0d78f49 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/v6/vcr" + "github.com/nuts-foundation/nuts-node/v6/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/v6/core" + api "github.com/nuts-foundation/nuts-node/v6/vcr/api/vcr/v2" "github.com/spf13/cobra" ) diff --git a/vcr/cmd/cmd_test.go b/vcr/cmd/cmd_test.go index 347d22ad88..06de4feefb 100644 --- a/vcr/cmd/cmd_test.go +++ b/vcr/cmd/cmd_test.go @@ -23,14 +23,14 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/nuts-foundation/nuts-node/core" - v2 "github.com/nuts-foundation/nuts-node/vcr/api/vcr/v2" + "github.com/nuts-foundation/nuts-node/v6/core" + v2 "github.com/nuts-foundation/nuts-node/v6/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/v6/test/http" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" ) diff --git a/vcr/config.go b/vcr/config.go index 614ddf7291..2fdb6f236f 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/v6/vcr/openid4vci" "time" ) diff --git a/vcr/context_test.go b/vcr/context_test.go index 915d39574b..055d896f75 100644 --- a/vcr/context_test.go +++ b/vcr/context_test.go @@ -20,10 +20,10 @@ package vcr import ( - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/assets" - "github.com/nuts-foundation/nuts-node/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr/assets" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" "github.com/piprate/json-gold/ld" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/vcr/credential/resolver.go b/vcr/credential/resolver.go index 182eda33e7..f22934314b 100644 --- a/vcr/credential/resolver.go +++ b/vcr/credential/resolver.go @@ -24,9 +24,9 @@ import ( "fmt" "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/pki" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" ) // FindValidator finds the Validator the provided credential based on its Type diff --git a/vcr/credential/resolver_test.go b/vcr/credential/resolver_test.go index 504da44bd8..c63adb3c90 100644 --- a/vcr/credential/resolver_test.go +++ b/vcr/credential/resolver_test.go @@ -27,8 +27,8 @@ import ( "github.com/lestrrat-go/jwx/v3/jws" "github.com/lestrrat-go/jwx/v3/jwt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" "github.com/stretchr/testify/require" "testing" diff --git a/vcr/credential/revocation_test.go b/vcr/credential/revocation_test.go index 0ce0ec435f..d8e279ec51 100644 --- a/vcr/credential/revocation_test.go +++ b/vcr/credential/revocation_test.go @@ -26,7 +26,7 @@ import ( "time" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" "github.com/stretchr/testify/assert" ) diff --git a/vcr/credential/store/sql_test.go b/vcr/credential/store/sql_test.go index 3284d8d379..e40e52c3b8 100644 --- a/vcr/credential/store/sql_test.go +++ b/vcr/credential/store/sql_test.go @@ -22,7 +22,7 @@ import ( "encoding/json" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v6/storage" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/vcr/credential/util_test.go b/vcr/credential/util_test.go index 06d016c7fb..fa1c73dba0 100644 --- a/vcr/credential/util_test.go +++ b/vcr/credential/util_test.go @@ -23,8 +23,8 @@ 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/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/vcr/credential/validator.go b/vcr/credential/validator.go index 8ae00f2cab..da572165f9 100644 --- a/vcr/credential/validator.go +++ b/vcr/credential/validator.go @@ -28,11 +28,11 @@ import ( "github.com/lestrrat-go/jwx/v3/jwk" "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/pki" - "github.com/nuts-foundation/nuts-node/vcr/revocation" - "github.com/nuts-foundation/nuts-node/vdr/didx509" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/vcr/revocation" + "github.com/nuts-foundation/nuts-node/v6/vdr/didx509" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "net/url" "strings" ) diff --git a/vcr/credential/validator_test.go b/vcr/credential/validator_test.go index a6c2659fe7..76784b94cc 100644 --- a/vcr/credential/validator_test.go +++ b/vcr/credential/validator_test.go @@ -20,7 +20,7 @@ package credential import ( - "github.com/nuts-foundation/nuts-node/pki" + "github.com/nuts-foundation/nuts-node/v6/pki" "go.uber.org/mock/gomock" "testing" "time" @@ -29,10 +29,10 @@ 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/revocation" - "github.com/nuts-foundation/nuts-node/vcr/test" - "github.com/nuts-foundation/nuts-node/vdr" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr/revocation" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/vdr" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" ) diff --git a/vcr/holder/interface.go b/vcr/holder/interface.go index 5776f30f6f..8a697ff6e6 100644 --- a/vcr/holder/interface.go +++ b/vcr/holder/interface.go @@ -24,9 +24,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/pe" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" ) // VerifiableCredentialLDContextV1 holds the URI of the JSON-LD context for Verifiable Credentials. diff --git a/vcr/holder/memory_wallet.go b/vcr/holder/memory_wallet.go index 9adbb3af0f..8d4f668866 100644 --- a/vcr/holder/memory_wallet.go +++ b/vcr/holder/memory_wallet.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/core" - "github.com/nuts-foundation/nuts-node/crypto" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" - "github.com/nuts-foundation/nuts-node/vcr/pe" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/piprate/json-gold/ld" ) diff --git a/vcr/holder/mock.go b/vcr/holder/mock.go index e12b0f8019..9aafc47d21 100644 --- a/vcr/holder/mock.go +++ b/vcr/holder/mock.go @@ -16,8 +16,8 @@ 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" - pe "github.com/nuts-foundation/nuts-node/vcr/pe" + core "github.com/nuts-foundation/nuts-node/v6/core" + pe "github.com/nuts-foundation/nuts-node/v6/vcr/pe" gomock "go.uber.org/mock/gomock" ) diff --git a/vcr/holder/openid.go b/vcr/holder/openid.go index fd975152d5..e8370f9f7d 100644 --- a/vcr/holder/openid.go +++ b/vcr/holder/openid.go @@ -22,19 +22,19 @@ import ( "context" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" "net/http" "time" "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/log" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - vcrTypes "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + vcrTypes "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) // 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 8d6f45b655..2ad4397ce4 100644 --- a/vcr/holder/openid_mock.go +++ b/vcr/holder/openid_mock.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - openid4vci "github.com/nuts-foundation/nuts-node/vcr/openid4vci" + openid4vci "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" gomock "go.uber.org/mock/gomock" ) diff --git a/vcr/holder/openid_test.go b/vcr/holder/openid_test.go index a8a76ebe7c..4a10bf4e68 100644 --- a/vcr/holder/openid_test.go +++ b/vcr/holder/openid_test.go @@ -24,13 +24,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/auth/oauth" - "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" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vcr/holder/presenter.go b/vcr/holder/presenter.go index bff5d75cfe..087c8d3bd9 100644 --- a/vcr/holder/presenter.go +++ b/vcr/holder/presenter.go @@ -30,13 +30,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/oauth" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/pe" - "github.com/nuts-foundation/nuts-node/vcr/signature" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/piprate/json-gold/ld" ) diff --git a/vcr/holder/presenter_test.go b/vcr/holder/presenter_test.go index 899945b428..0167f58890 100644 --- a/vcr/holder/presenter_test.go +++ b/vcr/holder/presenter_test.go @@ -26,19 +26,19 @@ 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/auth/oauth" - "github.com/nuts-foundation/nuts-node/core/to" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/pe" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vcr/test" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/core/to" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vcr/holder/sql_wallet.go b/vcr/holder/sql_wallet.go index 7323332558..b7a91feb24 100644 --- a/vcr/holder/sql_wallet.go +++ b/vcr/holder/sql_wallet.go @@ -27,19 +27,19 @@ 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/jsonld" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/credential/store" - - "github.com/nuts-foundation/nuts-node/vcr/log" - "github.com/nuts-foundation/nuts-node/vcr/pe" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vcr/verifier" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential/store" + + "github.com/nuts-foundation/nuts-node/v6/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "gorm.io/gorm" "gorm.io/gorm/schema" ) diff --git a/vcr/holder/sql_wallet_test.go b/vcr/holder/sql_wallet_test.go index 75d4767538..6604b058e4 100644 --- a/vcr/holder/sql_wallet_test.go +++ b/vcr/holder/sql_wallet_test.go @@ -26,22 +26,22 @@ import ( "github.com/google/uuid" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" "gorm.io/gorm" 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/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/vdr" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/vcr/interface.go b/vcr/interface.go index e4e5cb03b7..90321f382d 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/v6/vcr/types" "time" - "github.com/nuts-foundation/nuts-node/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/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/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" ) // Finder is the VCR interface for searching VCs diff --git a/vcr/issuer/interface.go b/vcr/issuer/interface.go index 6add1ef3db..1b951aa8c3 100644 --- a/vcr/issuer/interface.go +++ b/vcr/issuer/interface.go @@ -25,8 +25,8 @@ 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/credential" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/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 82f3cfdea7..1669af167d 100644 --- a/vcr/issuer/issuer.go +++ b/vcr/issuer/issuer.go @@ -27,25 +27,25 @@ import ( "time" "github.com/nuts-foundation/go-stoabs" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vcr/revocation" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/vcr/revocation" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "gorm.io/gorm" "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" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/trust" + "github.com/nuts-foundation/nuts-node/v6/vcr/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 36a038fea9..d73a3e5cb1 100644 --- a/vcr/issuer/issuer_test.go +++ b/vcr/issuer/issuer_test.go @@ -34,22 +34,22 @@ 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" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/test/io" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vcr/revocation" - "github.com/nuts-foundation/nuts-node/vcr/signature" - "github.com/nuts-foundation/nuts-node/vcr/test" - "github.com/nuts-foundation/nuts-node/vcr/trust" - vcr "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vcr/verifier" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/test/io" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/vcr/revocation" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/trust" + vcr "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "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 fe51c1e2ae..bbb5cf37b7 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/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/v6/vcr/credential" ) const issuedBackupShelf = "credentials" diff --git a/vcr/issuer/leia_store_test.go b/vcr/issuer/leia_store_test.go index f3764b9ee8..7ad35e2f28 100644 --- a/vcr/issuer/leia_store_test.go +++ b/vcr/issuer/leia_store_test.go @@ -29,7 +29,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/v6/vcr/types" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" @@ -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/jsonld" - "github.com/nuts-foundation/nuts-node/test/io" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/test/io" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" ) func TestNewLeiaStore(t *testing.T) { diff --git a/vcr/issuer/mock.go b/vcr/issuer/mock.go index 888da1919a..bfbc511535 100644 --- a/vcr/issuer/mock.go +++ b/vcr/issuer/mock.go @@ -16,8 +16,8 @@ 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" - credential "github.com/nuts-foundation/nuts-node/vcr/credential" + core "github.com/nuts-foundation/nuts-node/v6/core" + credential "github.com/nuts-foundation/nuts-node/v6/vcr/credential" gomock "go.uber.org/mock/gomock" ) diff --git a/vcr/issuer/network_publisher.go b/vcr/issuer/network_publisher.go index 4844c6c49a..16a9b724b1 100644 --- a/vcr/issuer/network_publisher.go +++ b/vcr/issuer/network_publisher.go @@ -24,14 +24,14 @@ 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/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) type networkPublisher struct { diff --git a/vcr/issuer/network_publisher_test.go b/vcr/issuer/network_publisher_test.go index 82470eba1d..9359b86501 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" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "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 7af39befda..994b09d636 100644 --- a/vcr/issuer/openid.go +++ b/vcr/issuer/openid.go @@ -28,14 +28,14 @@ import ( "github.com/lestrrat-go/jwx/v3/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/storage" - "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/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer/assets" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "io/fs" "net/http" "os" diff --git a/vcr/issuer/openid_mock.go b/vcr/issuer/openid_mock.go index 1eb709fca9..cee0691d10 100644 --- a/vcr/issuer/openid_mock.go +++ b/vcr/issuer/openid_mock.go @@ -14,7 +14,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/v6/vcr/openid4vci" gomock "go.uber.org/mock/gomock" ) diff --git a/vcr/issuer/openid_store.go b/vcr/issuer/openid_store.go index 0471301164..77ba8ae306 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/storage" + "github.com/nuts-foundation/nuts-node/v6/storage" ) // OpenIDStore defines the storage API for OpenID Credential Issuance flows. diff --git a/vcr/issuer/openid_store_test.go b/vcr/issuer/openid_store_test.go index 9fcbf80109..cee82ffc42 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/storage" + "github.com/nuts-foundation/nuts-node/v6/storage" "github.com/stretchr/testify/assert" "testing" ) diff --git a/vcr/issuer/openid_test.go b/vcr/issuer/openid_test.go index 62ca9e0b6e..593ea395a6 100644 --- a/vcr/issuer/openid_test.go +++ b/vcr/issuer/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/storage" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vcr/issuer/sql_store.go b/vcr/issuer/sql_store.go index aecc8cb3c7..36b9ef36ec 100644 --- a/vcr/issuer/sql_store.go +++ b/vcr/issuer/sql_store.go @@ -24,11 +24,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/core" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/credential/store" - "github.com/nuts-foundation/nuts-node/vcr/log" - "github.com/nuts-foundation/nuts-node/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential/store" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" "gorm.io/gorm" "gorm.io/gorm/schema" ) diff --git a/vcr/issuer/sql_store_test.go b/vcr/issuer/sql_store_test.go index 95b491e629..76deeea497 100644 --- a/vcr/issuer/sql_store_test.go +++ b/vcr/issuer/sql_store_test.go @@ -23,11 +23,11 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/test" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vdr" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vdr" "github.com/stretchr/testify/require" "gorm.io/gorm" ) diff --git a/vcr/log/log.go b/vcr/log/log.go index b00de90daa..8e0fdfb8b2 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/v6/core" "github.com/sirupsen/logrus" ) diff --git a/vcr/mock.go b/vcr/mock.go index 9e7bd7a73a..8a886b5b3b 100644 --- a/vcr/mock.go +++ b/vcr/mock.go @@ -17,9 +17,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/v6/vcr/holder" + issuer "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" + verifier "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" gomock "go.uber.org/mock/gomock" ) diff --git a/vcr/openid4vci/identifiers.go b/vcr/openid4vci/identifiers.go index 37c2f4bed3..84ff10f105 100644 --- a/vcr/openid4vci/identifiers.go +++ b/vcr/openid4vci/identifiers.go @@ -22,10 +22,10 @@ import ( "crypto/tls" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/http/client" - "github.com/nuts-foundation/nuts-node/vcr/log" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/http/client" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "net/http" "net/url" "sync/atomic" diff --git a/vcr/openid4vci/identifiers_test.go b/vcr/openid4vci/identifiers_test.go index 1ae1232e14..c20d96e012 100644 --- a/vcr/openid4vci/identifiers_test.go +++ b/vcr/openid4vci/identifiers_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/test/pki" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/test/pki" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "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 c355aa96d5..907ab690c8 100644 --- a/vcr/openid4vci/issuer_client.go +++ b/vcr/openid4vci/issuer_client.go @@ -25,9 +25,9 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" "io" "net/http" "net/http/httptrace" diff --git a/vcr/openid4vci/issuer_client_mock.go b/vcr/openid4vci/issuer_client_mock.go index 370f86f84e..bb69f2b703 100644 --- a/vcr/openid4vci/issuer_client_mock.go +++ b/vcr/openid4vci/issuer_client_mock.go @@ -14,7 +14,7 @@ import ( reflect "reflect" vc "github.com/nuts-foundation/go-did/vc" - oauth "github.com/nuts-foundation/nuts-node/auth/oauth" + oauth "github.com/nuts-foundation/nuts-node/v6/auth/oauth" gomock "go.uber.org/mock/gomock" ) diff --git a/vcr/openid4vci/test.go b/vcr/openid4vci/test.go index f105ff4674..bc258fc6f5 100644 --- a/vcr/openid4vci/test.go +++ b/vcr/openid4vci/test.go @@ -23,8 +23,8 @@ import ( "encoding/json" "fmt" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/auth/oauth" - "github.com/nuts-foundation/nuts-node/test" + "github.com/nuts-foundation/nuts-node/v6/auth/oauth" + "github.com/nuts-foundation/nuts-node/v6/test" "net/http" "testing" "time" diff --git a/vcr/openid4vci/wallet_client.go b/vcr/openid4vci/wallet_client.go index e1b4fc1fa5..c5b4b68d2f 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/v6/core" "net/url" ) diff --git a/vcr/pe/presentation_definition.go b/vcr/pe/presentation_definition.go index 2610e332fa..a571b8e256 100644 --- a/vcr/pe/presentation_definition.go +++ b/vcr/pe/presentation_definition.go @@ -23,7 +23,7 @@ import ( "errors" "fmt" "github.com/lestrrat-go/jwx/v3/jws" - v2 "github.com/nuts-foundation/nuts-node/vcr/pe/schema/v2" + v2 "github.com/nuts-foundation/nuts-node/v6/vcr/pe/schema/v2" "strings" "github.com/PaesslerAG/jsonpath" diff --git a/vcr/pe/presentation_definition_test.go b/vcr/pe/presentation_definition_test.go index 71b64b8069..8d5f3025fb 100644 --- a/vcr/pe/presentation_definition_test.go +++ b/vcr/pe/presentation_definition_test.go @@ -26,8 +26,8 @@ import ( "encoding/base64" "encoding/json" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core/to" - vcrTest "github.com/nuts-foundation/nuts-node/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/core/to" + vcrTest "github.com/nuts-foundation/nuts-node/v6/vcr/test" "strings" "testing" @@ -35,7 +35,7 @@ import ( "github.com/lestrrat-go/jwx/v3/jwt" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/vcr/pe/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/vcr/pe/presentation_submission.go b/vcr/pe/presentation_submission.go index 52788ea573..0ab9aad6ad 100644 --- a/vcr/pe/presentation_submission.go +++ b/vcr/pe/presentation_submission.go @@ -28,8 +28,8 @@ import ( "github.com/google/uuid" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/vcr/credential" - v2 "github.com/nuts-foundation/nuts-node/vcr/pe/schema/v2" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + v2 "github.com/nuts-foundation/nuts-node/v6/vcr/pe/schema/v2" ) // ParsePresentationSubmission validates the given JSON and parses it into a PresentationSubmission. diff --git a/vcr/pe/presentation_submission_test.go b/vcr/pe/presentation_submission_test.go index 1241723b5d..1431185c7e 100644 --- a/vcr/pe/presentation_submission_test.go +++ b/vcr/pe/presentation_submission_test.go @@ -28,8 +28,8 @@ 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/pe/test" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/pe/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/vcr/pe/selector_test.go b/vcr/pe/selector_test.go index d740b17b6e..409fe9ae36 100644 --- a/vcr/pe/selector_test.go +++ b/vcr/pe/selector_test.go @@ -23,7 +23,7 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core/to" + "github.com/nuts-foundation/nuts-node/v6/core/to" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/vcr/pe/submission_requirement_test.go b/vcr/pe/submission_requirement_test.go index aa4c07c3d3..1728dbc57a 100644 --- a/vcr/pe/submission_requirement_test.go +++ b/vcr/pe/submission_requirement_test.go @@ -24,7 +24,7 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/core/to" + "github.com/nuts-foundation/nuts-node/v6/core/to" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/vcr/pe/util_test.go b/vcr/pe/util_test.go index d9579dd0e9..b5d54c23d8 100644 --- a/vcr/pe/util_test.go +++ b/vcr/pe/util_test.go @@ -21,7 +21,7 @@ package pe import ( "encoding/json" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/vcr/revocation/statuslist2021_issuer.go b/vcr/revocation/statuslist2021_issuer.go index 387717e0c0..4bb8f0ab6b 100644 --- a/vcr/revocation/statuslist2021_issuer.go +++ b/vcr/revocation/statuslist2021_issuer.go @@ -28,16 +28,16 @@ import ( "strings" "time" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "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/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" "gorm.io/gorm" "gorm.io/gorm/clause" ) diff --git a/vcr/revocation/statuslist2021_issuer_test.go b/vcr/revocation/statuslist2021_issuer_test.go index 1eb31d9eec..6966c47bd3 100644 --- a/vcr/revocation/statuslist2021_issuer_test.go +++ b/vcr/revocation/statuslist2021_issuer_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/go-did/vc" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gorm.io/gorm" diff --git a/vcr/revocation/statuslist2021_verifier.go b/vcr/revocation/statuslist2021_verifier.go index 47f514229f..278343ed74 100644 --- a/vcr/revocation/statuslist2021_verifier.go +++ b/vcr/revocation/statuslist2021_verifier.go @@ -28,9 +28,9 @@ import ( "time" "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/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" "gorm.io/gorm/clause" ) diff --git a/vcr/revocation/statuslist2021_verifier_test.go b/vcr/revocation/statuslist2021_verifier_test.go index dfe9eb6f3f..9051964845 100644 --- a/vcr/revocation/statuslist2021_verifier_test.go +++ b/vcr/revocation/statuslist2021_verifier_test.go @@ -28,8 +28,8 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/vcr/test" - "github.com/nuts-foundation/nuts-node/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/vcr/revocation/types.go b/vcr/revocation/types.go index 4bde9dd649..b8204e030c 100644 --- a/vcr/revocation/types.go +++ b/vcr/revocation/types.go @@ -30,10 +30,10 @@ import ( "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/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "gorm.io/gorm" ) diff --git a/vcr/revocation/types_test.go b/vcr/revocation/types_test.go index e0a642b5ea..cb85344adf 100644 --- a/vcr/revocation/types_test.go +++ b/vcr/revocation/types_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/nuts-foundation/go-did/did" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v6/storage" "github.com/stretchr/testify/assert" ) diff --git a/vcr/search.go b/vcr/search.go index 2e6ffc2eb1..a9383f4956 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" "github.com/sirupsen/logrus" "reflect" "sort" diff --git a/vcr/search_test.go b/vcr/search_test.go index d8fd1c151b..9070450653 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/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/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 8d3bcc2033..d73d2ff8bb 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/v3/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/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/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 6f5591dde3..f5c1f73df4 100644 --- a/vcr/signature/json_web_signature_test.go +++ b/vcr/signature/json_web_signature_test.go @@ -23,9 +23,9 @@ import ( "github.com/lestrrat-go/jwx/v3/jwa" "github.com/lestrrat-go/jwx/v3/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/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/jsonld" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/vcr/signature/proof/jsonld.go b/vcr/signature/proof/jsonld.go index b91f620afb..aa94a577b2 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/v6/jsonld" "strings" "time" "github.com/lestrrat-go/jwx/v3/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/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/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 cc4d807e9d..78f7f641b2 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/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/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/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/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 fd38aec95e..dbdc8bdd51 100644 --- a/vcr/signature/proof/proof.go +++ b/vcr/signature/proof/proof.go @@ -22,7 +22,7 @@ import ( "context" "crypto" "encoding/json" - "github.com/nuts-foundation/nuts-node/vcr/signature" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature" ) // Document represents the document to sign. It does not contain proofs or signatures diff --git a/vcr/store.go b/vcr/store.go index 2c1a12e8ea..5788919e49 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/v6/core" "reflect" "time" - "github.com/nuts-foundation/nuts-node/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/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 d6e10048f1..4aec88d075 100644 --- a/vcr/store_test.go +++ b/vcr/store_test.go @@ -26,9 +26,9 @@ import ( "encoding/json" "github.com/lestrrat-go/jwx/v3/jwk" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/vcr/test" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/require" "os" "testing" diff --git a/vcr/test.go b/vcr/test.go index 0dd2436a02..10cbddfb9f 100644 --- a/vcr/test.go +++ b/vcr/test.go @@ -20,21 +20,21 @@ package vcr import ( - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "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" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" - "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/events" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test/io" + "github.com/nuts-foundation/nuts-node/v6/vcr/trust" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" "path" diff --git a/vcr/test/credentials.go b/vcr/test/credentials.go index e405589000..c0945b5fc1 100644 --- a/vcr/test/credentials.go +++ b/vcr/test/credentials.go @@ -32,15 +32,15 @@ import ( "github.com/lestrrat-go/jwx/v3/jws" "github.com/lestrrat-go/jwx/v3/jwt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/test/pki" - "github.com/nuts-foundation/nuts-node/vcr/assets" + "github.com/nuts-foundation/nuts-node/v6/test/pki" + "github.com/nuts-foundation/nuts-node/v6/vcr/assets" "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/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr" ) func ValidNutsAuthorizationCredential(t testing.TB) vc.VerifiableCredential { diff --git a/vcr/test/formats_integration_test.go b/vcr/test/formats_integration_test.go index 0760ec4071..8318f5f6fd 100644 --- a/vcr/test/formats_integration_test.go +++ b/vcr/test/formats_integration_test.go @@ -22,10 +22,10 @@ import ( "context" "encoding/json" "github.com/nuts-foundation/go-did/vc" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/test/node" - "github.com/nuts-foundation/nuts-node/vcr" - v2 "github.com/nuts-foundation/nuts-node/vcr/api/vcr/v2" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/test/node" + "github.com/nuts-foundation/nuts-node/v6/vcr" + v2 "github.com/nuts-foundation/nuts-node/v6/vcr/api/vcr/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "net/http/httptest" diff --git a/vcr/test/openid4vci_integration_test.go b/vcr/test/openid4vci_integration_test.go index 3e90ed0761..ccdb34986e 100644 --- a/vcr/test/openid4vci_integration_test.go +++ b/vcr/test/openid4vci_integration_test.go @@ -21,12 +21,12 @@ package test import ( "bytes" "encoding/json" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vcr/issuer" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "io" "net/http" @@ -37,11 +37,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/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" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/test/node" + "github.com/nuts-foundation/nuts-node/v6/vcr" + credentialTypes "github.com/nuts-foundation/nuts-node/v6/vcr/credential" "github.com/stretchr/testify/require" ) diff --git a/vcr/test/test.go b/vcr/test/test.go index a27b4030ee..b7b52a41ef 100644 --- a/vcr/test/test.go +++ b/vcr/test/test.go @@ -26,10 +26,10 @@ 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" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/jwx" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/audit" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/jwx" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" "github.com/stretchr/testify/require" "testing" "time" diff --git a/vcr/trust/trust_test.go b/vcr/trust/trust_test.go index 524d61c84e..f42e2e8bb9 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/v6/test/io" "github.com/stretchr/testify/assert" ) diff --git a/vcr/vcr.go b/vcr/vcr.go index 7804c5f1e1..56b2de7542 100644 --- a/vcr/vcr.go +++ b/vcr/vcr.go @@ -25,13 +25,13 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-leia/v4" - "github.com/nuts-foundation/nuts-node/http/client" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/openid4vci" - "github.com/nuts-foundation/nuts-node/vcr/revocation" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/http/client" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/vcr/revocation" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "io/fs" "net/http" "path" @@ -41,19 +41,19 @@ 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/events" - "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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/events" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/assets" + "github.com/nuts-foundation/nuts-node/v6/vcr/holder" + "github.com/nuts-foundation/nuts-node/v6/vcr/issuer" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/trust" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vcr/verifier" "gopkg.in/yaml.v3" ) diff --git a/vcr/vcr_test.go b/vcr/vcr_test.go index affb404c1a..64800d2fed 100644 --- a/vcr/vcr_test.go +++ b/vcr/vcr_test.go @@ -27,13 +27,13 @@ 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/http/client" - "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/vcr/test" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/http/client" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/openid4vci" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/require" "os" "path" @@ -41,18 +41,18 @@ 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/v6/events" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/test/io" + vcrTypes "github.com/nuts-foundation/nuts-node/v6/vcr/types" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/vcr/verifier/interface.go b/vcr/verifier/interface.go index 7f7edbbdfe..fa9f185015 100644 --- a/vcr/verifier/interface.go +++ b/vcr/verifier/interface.go @@ -23,11 +23,11 @@ import ( "io" "time" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" 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/v6/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 74bbcfb4f5..648eba6d69 100644 --- a/vcr/verifier/leia_store.go +++ b/vcr/verifier/leia_store.go @@ -24,12 +24,12 @@ 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" - "github.com/nuts-foundation/nuts-node/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" ) const revocationBackupShelf = "revocations" diff --git a/vcr/verifier/leia_store_test.go b/vcr/verifier/leia_store_test.go index 070d74b30c..333a0ed81b 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/v6/test/io" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" "github.com/stretchr/testify/assert" ) diff --git a/vcr/verifier/mock.go b/vcr/verifier/mock.go index a56070622f..2a9d47b108 100644 --- a/vcr/verifier/mock.go +++ b/vcr/verifier/mock.go @@ -15,8 +15,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/v6/core" + credential "github.com/nuts-foundation/nuts-node/v6/vcr/credential" gomock "go.uber.org/mock/gomock" ) diff --git a/vcr/verifier/signature_verifier.go b/vcr/verifier/signature_verifier.go index 53cbcd6a0d..e9df5bae68 100644 --- a/vcr/verifier/signature_verifier.go +++ b/vcr/verifier/signature_verifier.go @@ -27,13 +27,13 @@ import ( "github.com/lestrrat-go/jwx/v3/jwt" "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/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/types" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) type signatureVerifier struct { diff --git a/vcr/verifier/signature_verifier_test.go b/vcr/verifier/signature_verifier_test.go index b91a7c084e..3527309638 100644 --- a/vcr/verifier/signature_verifier_test.go +++ b/vcr/verifier/signature_verifier_test.go @@ -39,19 +39,19 @@ import ( "github.com/google/uuid" "github.com/lestrrat-go/jwx/v3/cert" "github.com/lestrrat-go/jwx/v3/jwa" - testpki "github.com/nuts-foundation/nuts-node/test/pki" - "github.com/nuts-foundation/nuts-node/vdr/didx509" + testpki "github.com/nuts-foundation/nuts-node/v6/test/pki" + "github.com/nuts-foundation/nuts-node/v6/vdr/didx509" "github.com/lestrrat-go/jwx/v3/jwk" 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" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/vdr/didjwk" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vdr/didjwk" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vcr/verifier/verifier.go b/vcr/verifier/verifier.go index 2ad697e621..b20aeb4b4b 100644 --- a/vcr/verifier/verifier.go +++ b/vcr/verifier/verifier.go @@ -25,20 +25,20 @@ import ( "strings" "time" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/vcr/revocation" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/vcr/revocation" 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/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" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/log" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/trust" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) const ( diff --git a/vcr/verifier/verifier_test.go b/vcr/verifier/verifier_test.go index 51f01a2e4e..ada53df768 100644 --- a/vcr/verifier/verifier_test.go +++ b/vcr/verifier/verifier_test.go @@ -31,27 +31,27 @@ import ( "testing" "time" - "github.com/nuts-foundation/nuts-node/core/to" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/test/pki" + "github.com/nuts-foundation/nuts-node/v6/core/to" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/test/pki" "github.com/lestrrat-go/jwx/v3/jwk" "github.com/lestrrat-go/jwx/v3/jwt" 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/storage/spi" - "github.com/nuts-foundation/nuts-node/jsonld" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/test/io" - "github.com/nuts-foundation/nuts-node/vcr/credential" - "github.com/nuts-foundation/nuts-node/vcr/revocation" - "github.com/nuts-foundation/nuts-node/vcr/signature/proof" - "github.com/nuts-foundation/nuts-node/vcr/test" - "github.com/nuts-foundation/nuts-node/vcr/trust" - "github.com/nuts-foundation/nuts-node/vcr/types" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test/io" + "github.com/nuts-foundation/nuts-node/v6/vcr/credential" + "github.com/nuts-foundation/nuts-node/v6/vcr/revocation" + "github.com/nuts-foundation/nuts-node/v6/vcr/signature/proof" + "github.com/nuts-foundation/nuts-node/v6/vcr/test" + "github.com/nuts-foundation/nuts-node/v6/vcr/trust" + "github.com/nuts-foundation/nuts-node/v6/vcr/types" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "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 c648bd20ec..90ad9b0afa 100644 --- a/vdr/api/v1/api.go +++ b/vdr/api/v1/api.go @@ -23,18 +23,18 @@ import ( "context" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "net/http" "time" "github.com/labstack/echo/v4" "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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" ) var _ StrictServerInterface = (*Wrapper)(nil) diff --git a/vdr/api/v1/api_test.go b/vdr/api/v1/api_test.go index 75e955053e..8c16e1636e 100644 --- a/vdr/api/v1/api_test.go +++ b/vdr/api/v1/api_test.go @@ -22,20 +22,20 @@ package v1 import ( "context" "errors" - "github.com/nuts-foundation/nuts-node/core/to" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/core/to" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" "net/http" "testing" "time" "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/hash" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "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 66f76eeefe..19409e6af9 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/v6/core" "io" "net/http" ) diff --git a/vdr/api/v1/client_test.go b/vdr/api/v1/client_test.go index fb0313d8bd..d3507deabe 100644 --- a/vdr/api/v1/client_test.go +++ b/vdr/api/v1/client_test.go @@ -21,8 +21,8 @@ import ( "crypto/rand" "encoding/json" "errors" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/require" "net/http" "net/http/httptest" @@ -31,8 +31,8 @@ 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" + http2 "github.com/nuts-foundation/nuts-node/v6/test/http" + "github.com/nuts-foundation/nuts-node/v6/vdr" "github.com/stretchr/testify/assert" "schneider.vip/problem" ) diff --git a/vdr/api/v1/types.go b/vdr/api/v1/types.go index b6922a50d5..f79fafdd0d 100644 --- a/vdr/api/v1/types.go +++ b/vdr/api/v1/types.go @@ -19,8 +19,8 @@ package v1 import ( "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) // DIDDocument is an alias diff --git a/vdr/api/v2/api.go b/vdr/api/v2/api.go index 8a691b13e9..b5d4ac135f 100644 --- a/vdr/api/v2/api.go +++ b/vdr/api/v2/api.go @@ -25,15 +25,15 @@ import ( "github.com/labstack/echo/v4" 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/http/cache" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/didweb" - "github.com/nuts-foundation/nuts-node/vdr/log" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/http/cache" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/didweb" + "github.com/nuts-foundation/nuts-node/v6/vdr/log" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "net/http" "time" ) diff --git a/vdr/api/v2/api_test.go b/vdr/api/v2/api_test.go index 8bac17f6e1..d2c7e34c76 100644 --- a/vdr/api/v2/api_test.go +++ b/vdr/api/v2/api_test.go @@ -25,17 +25,17 @@ import ( "errors" "github.com/labstack/echo/v4" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" "net/http" "net/url" "testing" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/vdr" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/vdr" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vdr/api/v2/client.go b/vdr/api/v2/client.go index 4fd3b7b0f2..9aca9e25df 100644 --- a/vdr/api/v2/client.go +++ b/vdr/api/v2/client.go @@ -24,7 +24,7 @@ import ( "net/http" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" ) // HTTPClient holds the server address and other basic settings for the http client diff --git a/vdr/api/v2/client_test.go b/vdr/api/v2/client_test.go index a9165989c0..d218b6d7cb 100644 --- a/vdr/api/v2/client_test.go +++ b/vdr/api/v2/client_test.go @@ -26,9 +26,9 @@ import ( "time" "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" + "github.com/nuts-foundation/nuts-node/v6/core" + http2 "github.com/nuts-foundation/nuts-node/v6/test/http" + "github.com/nuts-foundation/nuts-node/v6/vdr" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/vdr/api/v2/types.go b/vdr/api/v2/types.go index 573e44c18b..7688cf78ad 100644 --- a/vdr/api/v2/types.go +++ b/vdr/api/v2/types.go @@ -19,7 +19,7 @@ package v2 import ( "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) // DIDDocument is an alias diff --git a/vdr/cmd/cmd.go b/vdr/cmd/cmd.go index 5fad559902..6bb9c553cd 100644 --- a/vdr/cmd/cmd.go +++ b/vdr/cmd/cmd.go @@ -23,17 +23,17 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" "io" "os" "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" - apiv2 "github.com/nuts-foundation/nuts-node/vdr/api/v2" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + api "github.com/nuts-foundation/nuts-node/v6/vdr/api/v1" + apiv2 "github.com/nuts-foundation/nuts-node/v6/vdr/api/v2" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/spf13/cobra" ) diff --git a/vdr/cmd/cmd_test.go b/vdr/cmd/cmd_test.go index ab8f7ef82a..27c3e91138 100644 --- a/vdr/cmd/cmd_test.go +++ b/vdr/cmd/cmd_test.go @@ -24,7 +24,7 @@ import ( "crypto/elliptic" "crypto/rand" "encoding/json" - v2 "github.com/nuts-foundation/nuts-node/vdr/api/v2" + v2 "github.com/nuts-foundation/nuts-node/v6/vdr/api/v2" "github.com/stretchr/testify/require" "net/http" "net/http/httptest" @@ -32,10 +32,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/v6/core" + http2 "github.com/nuts-foundation/nuts-node/v6/test/http" + "github.com/nuts-foundation/nuts-node/v6/vdr" + v1 "github.com/nuts-foundation/nuts-node/v6/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 491a8174a0..ee2f1cd8fc 100644 --- a/vdr/did_owner.go +++ b/vdr/did_owner.go @@ -21,9 +21,9 @@ package vdr import ( "context" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "gorm.io/gorm" "strings" "sync" diff --git a/vdr/did_owner_test.go b/vdr/did_owner_test.go index 04d30d297e..018fecaae7 100644 --- a/vdr/did_owner_test.go +++ b/vdr/did_owner_test.go @@ -21,10 +21,10 @@ package vdr import ( "context" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vdr/didjwk/resolver.go b/vdr/didjwk/resolver.go index 7989067693..10c221fe10 100644 --- a/vdr/didjwk/resolver.go +++ b/vdr/didjwk/resolver.go @@ -21,7 +21,7 @@ package didjwk import ( "encoding/base64" "fmt" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "reflect" godid "github.com/nuts-foundation/go-did" diff --git a/vdr/didkey/resolver.go b/vdr/didkey/resolver.go index e03235a105..a85e670d1a 100644 --- a/vdr/didkey/resolver.go +++ b/vdr/didkey/resolver.go @@ -33,7 +33,7 @@ import ( "github.com/multiformats/go-multicodec" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "io" ) diff --git a/vdr/didnuts/ambassador.go b/vdr/didnuts/ambassador.go index c25a1550ee..967d18a8e3 100644 --- a/vdr/didnuts/ambassador.go +++ b/vdr/didnuts/ambassador.go @@ -30,14 +30,14 @@ 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/core" - nutsCrypto "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/network/dag" - "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/log" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/events" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/log" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) // DIDDocumentType contains network transaction mime-type to identify a DID Document in the network. diff --git a/vdr/didnuts/ambassador_test.go b/vdr/didnuts/ambassador_test.go index 0532e1ad98..d6cbf7096e 100644 --- a/vdr/didnuts/ambassador_test.go +++ b/vdr/didnuts/ambassador_test.go @@ -33,16 +33,16 @@ import ( "github.com/lestrrat-go/jwx/v3/jwk" "github.com/nats-io/nats.go" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/audit" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/crypto/dpop" - "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/orm" - "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/dpop" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/events" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vdr/didnuts/didstore/event.go b/vdr/didnuts/didstore/event.go index 7e1a8178a5..bb6b8c1331 100644 --- a/vdr/didnuts/didstore/event.go +++ b/vdr/didnuts/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/v6/crypto/hash" ) // event contains the transaction reference and ordering of all DID document updates diff --git a/vdr/didnuts/didstore/event_test.go b/vdr/didnuts/didstore/event_test.go index 079ecf8d9f..ecef81606e 100644 --- a/vdr/didnuts/didstore/event_test.go +++ b/vdr/didnuts/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/v6/crypto/hash" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/vdr/didnuts/didstore/finder.go b/vdr/didnuts/didstore/finder.go index b846bbc1b6..26882ecd47 100644 --- a/vdr/didnuts/didstore/finder.go +++ b/vdr/didnuts/didstore/finder.go @@ -19,7 +19,7 @@ package didstore import ( "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) // Finder is a helper that implements the DocFinder interface diff --git a/vdr/didnuts/didstore/finder_test.go b/vdr/didnuts/didstore/finder_test.go index ecddc79feb..b884bab0f1 100644 --- a/vdr/didnuts/didstore/finder_test.go +++ b/vdr/didnuts/didstore/finder_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vdr/didnuts/didstore/integration_test.go b/vdr/didnuts/didstore/integration_test.go index 488c5e4e45..074b97eaa8 100644 --- a/vdr/didnuts/didstore/integration_test.go +++ b/vdr/didnuts/didstore/integration_test.go @@ -21,12 +21,12 @@ package didstore import ( "encoding/json" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "testing" "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/vdr/didnuts/didstore/interface.go b/vdr/didnuts/didstore/interface.go index d180c7741b..ba72f09d6e 100644 --- a/vdr/didnuts/didstore/interface.go +++ b/vdr/didnuts/didstore/interface.go @@ -20,8 +20,8 @@ package didstore import ( "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) // Store is the interface that groups all low level VDR DID storage operations. diff --git a/vdr/didnuts/didstore/merge.go b/vdr/didnuts/didstore/merge.go index c140423261..685c46d336 100644 --- a/vdr/didnuts/didstore/merge.go +++ b/vdr/didnuts/didstore/merge.go @@ -18,7 +18,7 @@ package didstore import ( - "github.com/nuts-foundation/nuts-node/vdr/didnuts/util" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/util" "sort" "strings" diff --git a/vdr/didnuts/didstore/metadata.go b/vdr/didnuts/didstore/metadata.go index c22a0414ae..83f3f25161 100644 --- a/vdr/didnuts/didstore/metadata.go +++ b/vdr/didnuts/didstore/metadata.go @@ -19,10 +19,10 @@ package didstore import ( - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "time" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" ) // documentMetadata is like VDR documentMetadata but usable for storage diff --git a/vdr/didnuts/didstore/metadata_test.go b/vdr/didnuts/didstore/metadata_test.go index d0a32f7454..b234ef81f1 100644 --- a/vdr/didnuts/didstore/metadata_test.go +++ b/vdr/didnuts/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/v6/crypto/hash" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/vdr/didnuts/didstore/mock.go b/vdr/didnuts/didstore/mock.go index ffd4e66d94..863dc153b5 100644 --- a/vdr/didnuts/didstore/mock.go +++ b/vdr/didnuts/didstore/mock.go @@ -13,8 +13,8 @@ import ( reflect "reflect" did "github.com/nuts-foundation/go-did/did" - orm "github.com/nuts-foundation/nuts-node/storage/orm" - resolver "github.com/nuts-foundation/nuts-node/vdr/resolver" + orm "github.com/nuts-foundation/nuts-node/v6/storage/orm" + resolver "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" gomock "go.uber.org/mock/gomock" ) diff --git a/vdr/didnuts/didstore/reader.go b/vdr/didnuts/didstore/reader.go index 7d7c7d470f..1ffdfe412f 100644 --- a/vdr/didnuts/didstore/reader.go +++ b/vdr/didnuts/didstore/reader.go @@ -24,8 +24,8 @@ 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/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) func readDocument(tx stoabs.ReadTx, documentHash hash.SHA256Hash) (did.Document, error) { diff --git a/vdr/didnuts/didstore/reader_test.go b/vdr/didnuts/didstore/reader_test.go index b0f12d7302..ebe22dec7d 100644 --- a/vdr/didnuts/didstore/reader_test.go +++ b/vdr/didnuts/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/resolver" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" diff --git a/vdr/didnuts/didstore/store.go b/vdr/didnuts/didstore/store.go index 389062e916..5eb8597960 100644 --- a/vdr/didnuts/didstore/store.go +++ b/vdr/didnuts/didstore/store.go @@ -25,12 +25,12 @@ import ( "fmt" "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/crypto/hash" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/vdr/log" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vdr/log" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) var _ core.Configurable = (*store)(nil) diff --git a/vdr/didnuts/didstore/store_test.go b/vdr/didnuts/didstore/store_test.go index bcf0f726fd..62e143ab03 100644 --- a/vdr/didnuts/didstore/store_test.go +++ b/vdr/didnuts/didstore/store_test.go @@ -28,9 +28,9 @@ 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/storage" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/redis/go-redis/v9" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/vdr/didnuts/didstore/test.go b/vdr/didnuts/didstore/test.go index f340ba2b47..4c7779735c 100644 --- a/vdr/didnuts/didstore/test.go +++ b/vdr/didnuts/didstore/test.go @@ -20,14 +20,14 @@ package didstore import ( "encoding/json" - "github.com/nuts-foundation/nuts-node/core" + "github.com/nuts-foundation/nuts-node/v6/core" "testing" "time" - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v6/storage" "github.com/stretchr/testify/require" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" diff --git a/vdr/didnuts/didstore/writer.go b/vdr/didnuts/didstore/writer.go index 9c40ba233c..a298826a9b 100644 --- a/vdr/didnuts/didstore/writer.go +++ b/vdr/didnuts/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/v6/crypto/hash" ) func writeEventList(tx stoabs.WriteTx, newEventList eventList, id did.DID) error { diff --git a/vdr/didnuts/didstore/writer_test.go b/vdr/didnuts/didstore/writer_test.go index 7602f22c2c..8ebd203ed5 100644 --- a/vdr/didnuts/didstore/writer_test.go +++ b/vdr/didnuts/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/v6/crypto/hash" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vdr/didnuts/manager.go b/vdr/didnuts/manager.go index 77824252c1..d44caf7920 100644 --- a/vdr/didnuts/manager.go +++ b/vdr/didnuts/manager.go @@ -24,23 +24,23 @@ import ( "encoding/json" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v6/storage" "time" "github.com/lestrrat-go/jwx/v3/jwk" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "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/jsonld" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/storage/orm" - didnutsStore "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/didnuts/util" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/log" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/jsonld" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + didnutsStore "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/util" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/log" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "gorm.io/gorm" ) diff --git a/vdr/didnuts/manager_test.go b/vdr/didnuts/manager_test.go index 948eb8b6f9..41575f899f 100644 --- a/vdr/didnuts/manager_test.go +++ b/vdr/didnuts/manager_test.go @@ -34,15 +34,15 @@ import ( "github.com/lestrrat-go/jwx/v3/jwk" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/audit" - nutsCrypto "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/network/dag" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vdr/didnuts/resolver.go b/vdr/didnuts/resolver.go index 5be2bc14b8..7aa68327e9 100644 --- a/vdr/didnuts/resolver.go +++ b/vdr/didnuts/resolver.go @@ -22,8 +22,8 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) const maxControllerDepth = 5 diff --git a/vdr/didnuts/resolver_test.go b/vdr/didnuts/resolver_test.go index d4379a0f98..e91cce1ce3 100644 --- a/vdr/didnuts/resolver_test.go +++ b/vdr/didnuts/resolver_test.go @@ -21,8 +21,8 @@ package didnuts import ( "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/vdr/didnuts/validators.go b/vdr/didnuts/validators.go index d0bfbac6ff..d9e86e4eb1 100644 --- a/vdr/didnuts/validators.go +++ b/vdr/didnuts/validators.go @@ -25,8 +25,8 @@ import ( "github.com/lestrrat-go/jwx/v3/jwk" 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/resolver" + "github.com/nuts-foundation/nuts-node/v6/network/transport" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) // NetworkDocumentValidator creates a DID Document validator that checks for inconsistencies in the DID Document: diff --git a/vdr/didnuts/validators_test.go b/vdr/didnuts/validators_test.go index 600986613a..d5320229a7 100644 --- a/vdr/didnuts/validators_test.go +++ b/vdr/didnuts/validators_test.go @@ -23,7 +23,7 @@ import ( "crypto/elliptic" "crypto/rand" "errors" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "testing" ssi "github.com/nuts-foundation/go-did" diff --git a/vdr/didsubject/did.go b/vdr/didsubject/did.go index 0507fa3138..3810a41349 100644 --- a/vdr/didsubject/did.go +++ b/vdr/didsubject/did.go @@ -20,7 +20,7 @@ package didsubject import ( "errors" - "github.com/nuts-foundation/nuts-node/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" "github.com/nuts-foundation/go-did/did" "gorm.io/gorm" diff --git a/vdr/didsubject/did_document.go b/vdr/didsubject/did_document.go index 6a31eaeb5c..358c1f6d10 100644 --- a/vdr/didsubject/did_document.go +++ b/vdr/didsubject/did_document.go @@ -21,7 +21,7 @@ package didsubject import ( "encoding/json" "errors" - "github.com/nuts-foundation/nuts-node/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" "time" "github.com/google/uuid" diff --git a/vdr/didsubject/did_document_test.go b/vdr/didsubject/did_document_test.go index 5697eab6fe..10ec9e54dc 100644 --- a/vdr/didsubject/did_document_test.go +++ b/vdr/didsubject/did_document_test.go @@ -23,7 +23,7 @@ import ( "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gorm.io/gorm" diff --git a/vdr/didsubject/interface.go b/vdr/didsubject/interface.go index 7d1d0fec3a..7a019e73d5 100644 --- a/vdr/didsubject/interface.go +++ b/vdr/didsubject/interface.go @@ -24,7 +24,7 @@ import ( ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" ) // ErrInvalidService is returned when a service is invalid, e.g. invalid field values, duplicate ID, not found, etc. diff --git a/vdr/didsubject/manager.go b/vdr/didsubject/manager.go index 58f87811f7..32774d8c6f 100644 --- a/vdr/didsubject/manager.go +++ b/vdr/didsubject/manager.go @@ -28,12 +28,12 @@ import ( "github.com/mr-tron/base58" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/storage/orm" - "github.com/nuts-foundation/nuts-node/vdr/log" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vdr/log" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "gorm.io/gorm" "regexp" "sort" diff --git a/vdr/didsubject/manager_test.go b/vdr/didsubject/manager_test.go index 7c9abb3c87..cc14f0a6e7 100644 --- a/vdr/didsubject/manager_test.go +++ b/vdr/didsubject/manager_test.go @@ -24,8 +24,8 @@ import ( "errors" "fmt" ssi "github.com/nuts-foundation/go-did" - "github.com/nuts-foundation/nuts-node/crypto/storage/spi" - "github.com/nuts-foundation/nuts-node/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/crypto/storage/spi" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" "net/url" "strings" "testing" @@ -33,9 +33,9 @@ import ( "github.com/google/uuid" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/core/to" - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core/to" + "github.com/nuts-foundation/nuts-node/v6/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gorm.io/gorm" diff --git a/vdr/didsubject/mock.go b/vdr/didsubject/mock.go index 101e434dd6..f64ce1591d 100644 --- a/vdr/didsubject/mock.go +++ b/vdr/didsubject/mock.go @@ -15,7 +15,7 @@ import ( ssi "github.com/nuts-foundation/go-did" did "github.com/nuts-foundation/go-did/did" - orm "github.com/nuts-foundation/nuts-node/storage/orm" + orm "github.com/nuts-foundation/nuts-node/v6/storage/orm" gomock "go.uber.org/mock/gomock" ) diff --git a/vdr/didsubject/resolver.go b/vdr/didsubject/resolver.go index 868292df1e..5b39a38d29 100644 --- a/vdr/didsubject/resolver.go +++ b/vdr/didsubject/resolver.go @@ -21,7 +21,7 @@ package didsubject import ( "errors" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "gorm.io/gorm" "time" ) diff --git a/vdr/didsubject/resolver_test.go b/vdr/didsubject/resolver_test.go index 9ee731b976..3e1cc972c0 100644 --- a/vdr/didsubject/resolver_test.go +++ b/vdr/didsubject/resolver_test.go @@ -18,12 +18,12 @@ package didsubject import ( - "github.com/nuts-foundation/nuts-node/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" "testing" "time" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/vdr/didsubject/test.go b/vdr/didsubject/test.go index 85b5267ea6..358c789424 100644 --- a/vdr/didsubject/test.go +++ b/vdr/didsubject/test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v6/storage" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gorm.io/gorm" diff --git a/vdr/didweb/manager.go b/vdr/didweb/manager.go index f0734de40d..4ba4eb28fe 100644 --- a/vdr/didweb/manager.go +++ b/vdr/didweb/manager.go @@ -24,14 +24,14 @@ import ( "encoding/json" "errors" "fmt" - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" - "github.com/nuts-foundation/nuts-node/storage/orm" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" "time" "github.com/google/uuid" ssi "github.com/nuts-foundation/go-did" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" "gorm.io/gorm" ) diff --git a/vdr/didweb/manager_test.go b/vdr/didweb/manager_test.go index 70a301e17b..206450e027 100644 --- a/vdr/didweb/manager_test.go +++ b/vdr/didweb/manager_test.go @@ -19,13 +19,13 @@ package didweb import ( - nutsCrypto "github.com/nuts-foundation/nuts-node/crypto" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" "strings" "testing" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/vdr/didweb/test.go b/vdr/didweb/test.go index 1ec162f640..9bd7a3a6e5 100644 --- a/vdr/didweb/test.go +++ b/vdr/didweb/test.go @@ -20,7 +20,7 @@ package didweb import ( "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/storage" + "github.com/nuts-foundation/nuts-node/v6/storage" "github.com/stretchr/testify/require" "gorm.io/gorm" "net/url" diff --git a/vdr/didweb/web.go b/vdr/didweb/web.go index 1749b03e53..de11fd7379 100644 --- a/vdr/didweb/web.go +++ b/vdr/didweb/web.go @@ -22,10 +22,10 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/core" - "github.com/nuts-foundation/nuts-node/http/client" - "github.com/nuts-foundation/nuts-node/vdr/log" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/http/client" + "github.com/nuts-foundation/nuts-node/v6/vdr/log" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "io" "mime" "net/http" diff --git a/vdr/didweb/web_test.go b/vdr/didweb/web_test.go index e3ce623b6f..c060cec0a8 100644 --- a/vdr/didweb/web_test.go +++ b/vdr/didweb/web_test.go @@ -20,7 +20,7 @@ package didweb import ( "github.com/nuts-foundation/go-did/did" - http2 "github.com/nuts-foundation/nuts-node/test/http" + http2 "github.com/nuts-foundation/nuts-node/v6/test/http" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "io" diff --git a/vdr/didx509/resolver.go b/vdr/didx509/resolver.go index 51be2dace9..1f03cbdd50 100644 --- a/vdr/didx509/resolver.go +++ b/vdr/didx509/resolver.go @@ -25,8 +25,8 @@ import ( "fmt" 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/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "strings" ) diff --git a/vdr/didx509/resolver_test.go b/vdr/didx509/resolver_test.go index ba827d6c99..4de887ec54 100644 --- a/vdr/didx509/resolver_test.go +++ b/vdr/didx509/resolver_test.go @@ -26,8 +26,8 @@ import ( "github.com/lestrrat-go/jwx/v3/cert" "github.com/minio/sha256-simd" "github.com/nuts-foundation/go-did/did" - testpki "github.com/nuts-foundation/nuts-node/test/pki" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + testpki "github.com/nuts-foundation/nuts-node/v6/test/pki" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "strings" diff --git a/vdr/didx509/x509_utils_test.go b/vdr/didx509/x509_utils_test.go index 64f70b87b5..462cf5968c 100644 --- a/vdr/didx509/x509_utils_test.go +++ b/vdr/didx509/x509_utils_test.go @@ -27,7 +27,7 @@ import ( "errors" "fmt" "github.com/lestrrat-go/jwx/v3/cert" - "github.com/nuts-foundation/nuts-node/test/pki" + "github.com/nuts-foundation/nuts-node/v6/test/pki" "github.com/stretchr/testify/require" "slices" "strings" diff --git a/vdr/interface.go b/vdr/interface.go index 0c1996730b..adcbb100d2 100644 --- a/vdr/interface.go +++ b/vdr/interface.go @@ -20,8 +20,8 @@ package vdr import ( "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "net/url" ) diff --git a/vdr/legacy_integration_test.go b/vdr/legacy_integration_test.go index 3c7302aebf..cc0e973c81 100644 --- a/vdr/legacy_integration_test.go +++ b/vdr/legacy_integration_test.go @@ -23,12 +23,12 @@ import ( crypto2 "crypto" "encoding/json" "fmt" - "github.com/nuts-foundation/nuts-node/audit" - "github.com/nuts-foundation/nuts-node/pki" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" - "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "go.uber.org/mock/gomock" "net/url" "sync" @@ -37,15 +37,15 @@ 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/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/events" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/network/dag" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/test" + "github.com/nuts-foundation/nuts-node/v6/test/io" 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..4143e2af52 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/v6/core" "github.com/sirupsen/logrus" ) diff --git a/vdr/mock.go b/vdr/mock.go index ba54c789d3..23ecf35d1b 100644 --- a/vdr/mock.go +++ b/vdr/mock.go @@ -14,8 +14,8 @@ import ( reflect "reflect" did "github.com/nuts-foundation/go-did/did" - didsubject "github.com/nuts-foundation/nuts-node/vdr/didsubject" - resolver "github.com/nuts-foundation/nuts-node/vdr/resolver" + didsubject "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + resolver "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" gomock "go.uber.org/mock/gomock" ) diff --git a/vdr/resolver/did.go b/vdr/resolver/did.go index 09b7577e54..295f105bcd 100644 --- a/vdr/resolver/did.go +++ b/vdr/resolver/did.go @@ -22,7 +22,7 @@ import ( "errors" "github.com/lestrrat-go/jwx/v3/cert" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" "sync" "time" ) diff --git a/vdr/resolver/did_test.go b/vdr/resolver/did_test.go index bbad2a808a..2434c90cf2 100644 --- a/vdr/resolver/did_test.go +++ b/vdr/resolver/did_test.go @@ -26,7 +26,7 @@ import ( "github.com/lestrrat-go/jwx/v3/cert" 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/v6/crypto/hash" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" "io" diff --git a/vdr/resolver/key.go b/vdr/resolver/key.go index 44ec2f4851..d17281f87d 100644 --- a/vdr/resolver/key.go +++ b/vdr/resolver/key.go @@ -23,7 +23,7 @@ import ( "errors" "fmt" "github.com/nuts-foundation/go-did/did" - "github.com/nuts-foundation/nuts-node/crypto/hash" + "github.com/nuts-foundation/nuts-node/v6/crypto/hash" "reflect" "strings" "time" diff --git a/vdr/resolver/key_mock.go b/vdr/resolver/key_mock.go index 6582c18b81..31be7e139b 100644 --- a/vdr/resolver/key_mock.go +++ b/vdr/resolver/key_mock.go @@ -15,7 +15,7 @@ import ( time "time" did "github.com/nuts-foundation/go-did/did" - hash "github.com/nuts-foundation/nuts-node/crypto/hash" + hash "github.com/nuts-foundation/nuts-node/v6/crypto/hash" gomock "go.uber.org/mock/gomock" ) diff --git a/vdr/resolver/service_test.go b/vdr/resolver/service_test.go index 82c9bc0306..d35c067b93 100644 --- a/vdr/resolver/service_test.go +++ b/vdr/resolver/service_test.go @@ -22,7 +22,7 @@ import ( "fmt" 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/v6/crypto/hash" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" "testing" diff --git a/vdr/test.go b/vdr/test.go index 30e1f63137..ce9fd74e47 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/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/crypto/util" ) // Two TestDIDs which can be used during testing: diff --git a/vdr/vdr.go b/vdr/vdr.go index e4b630460c..3964cd17b7 100644 --- a/vdr/vdr.go +++ b/vdr/vdr.go @@ -27,28 +27,28 @@ import ( "context" "errors" "fmt" - "github.com/nuts-foundation/nuts-node/pki" + "github.com/nuts-foundation/nuts-node/v6/pki" "net/url" "slices" "sync" "time" "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/events" - "github.com/nuts-foundation/nuts-node/network" - "github.com/nuts-foundation/nuts-node/storage" - "github.com/nuts-foundation/nuts-node/vdr/didjwk" - "github.com/nuts-foundation/nuts-node/vdr/didkey" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" - didnutsStore "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/didweb" - "github.com/nuts-foundation/nuts-node/vdr/didx509" - "github.com/nuts-foundation/nuts-node/vdr/log" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/events" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/vdr/didjwk" + "github.com/nuts-foundation/nuts-node/v6/vdr/didkey" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" + didnutsStore "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/didweb" + "github.com/nuts-foundation/nuts-node/v6/vdr/didx509" + "github.com/nuts-foundation/nuts-node/v6/vdr/log" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" ) // ModuleName is the name of the engine diff --git a/vdr/vdr_test.go b/vdr/vdr_test.go index 5207d19711..89c7153322 100644 --- a/vdr/vdr_test.go +++ b/vdr/vdr_test.go @@ -28,18 +28,18 @@ import ( "github.com/lestrrat-go/jwx/v3/jwk" 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/http/client" - "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/storage/orm" - "github.com/nuts-foundation/nuts-node/vdr/didnuts" - "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore" - "github.com/nuts-foundation/nuts-node/vdr/didsubject" - "github.com/nuts-foundation/nuts-node/vdr/resolver" + "github.com/nuts-foundation/nuts-node/v6/audit" + "github.com/nuts-foundation/nuts-node/v6/core" + nutsCrypto "github.com/nuts-foundation/nuts-node/v6/crypto" + "github.com/nuts-foundation/nuts-node/v6/http/client" + "github.com/nuts-foundation/nuts-node/v6/network" + "github.com/nuts-foundation/nuts-node/v6/pki" + "github.com/nuts-foundation/nuts-node/v6/storage" + "github.com/nuts-foundation/nuts-node/v6/storage/orm" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts" + "github.com/nuts-foundation/nuts-node/v6/vdr/didnuts/didstore" + "github.com/nuts-foundation/nuts-node/v6/vdr/didsubject" + "github.com/nuts-foundation/nuts-node/v6/vdr/resolver" "github.com/sirupsen/logrus" logTest "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" From f5d05849b02da0d9174da48e675ad6a8f8397974 Mon Sep 17 00:00:00 2001 From: Steven van der Vegt Date: Wed, 9 Sep 2026 08:17:55 +0200 Subject: [PATCH 2/8] build: let the Docker build stamp the module version from git Assisted-by: AI (cherry picked from commit 35d3bccfd8e9e9dc00782929a1348fe7770100fe) --- .dockerignore | 4 +++- Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 3907951d33..5ee852eb4b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,7 @@ -# Ignore everything that starts with a dot +# Ignore everything that starts with a dot, except .git: go build reads the +# version from the checked-out tag (see Dockerfile). .* +!.git # Readme files and docs README.rst README_template.rst diff --git a/Dockerfile b/Dockerfile index 3cf07cd2d8..6263cbc6ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,9 @@ COPY go.sum . RUN go mod download && go mod verify COPY . . -RUN 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 +# git is needed so go build can stamp the module version from the checked-out tag +RUN apk add --no-cache git +RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-w -s -X 'github.com/nuts-foundation/nuts-node/v6/core.GitCommit=${GIT_COMMIT}' -X 'github.com/nuts-foundation/nuts-node/v6/core.GitBranch=${GIT_BRANCH}' -X 'github.com/nuts-foundation/nuts-node/v6/core.GitVersion=${GIT_VERSION}'" -o /opt/nuts/nuts # alpine FROM alpine:3.24.1 From 6d36d6e49f47551890e8ac3682ccb4ff34363bf5 Mon Sep 17 00:00:00 2001 From: Steven van der Vegt Date: Wed, 9 Sep 2026 08:21:54 +0200 Subject: [PATCH 3/8] build: derive the module path in build files, add bump-major target The ldflags -X keys in the Dockerfile, makefile and binaries workflow now take the module path from "go list -m" instead of hardcoding it, so a major version bump only touches go.mod, the imports and the .proto go_package options. "make bump-major" does all of those. .dockerignore now excludes only untracked files. Excluding tracked files made "git status" inside the builder report deletions, which stamped the version as "+dirty". Assisted-by: AI (cherry picked from commit d87b2ba93922883da49db536e80d542796d6e82c) --- .dockerignore | 34 ++++++++++++++------------- .github/workflows/build-binaries.yaml | 2 +- Dockerfile | 2 +- makefile | 13 +++++++++- 4 files changed, 32 insertions(+), 19 deletions(-) diff --git a/.dockerignore b/.dockerignore index 5ee852eb4b..c04a67f210 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,17 +1,19 @@ -# Ignore everything that starts with a dot, except .git: go build reads the -# version from the checked-out tag (see Dockerfile). -.* -!.git -# Readme files and docs -README.rst -README_template.rst -generate_readme.sh -docs -COPYING -# Build file -Dockerfile* -makefile -nuts-node -development +# Only untracked and local files are excluded. Tracked files must stay in the +# build context: go build runs "git status" to stamp the module version from +# the checked-out tag, and marks the version "+dirty" when tracked files are +# missing (see Dockerfile). +.claude +.idea +.run +.DS_Store +**/.DS_Store +CLAUDE-* data -e2e-tests +**/data +docs/_build +*.pem +*.key +*.db +nuts +nuts-node +nuts.yaml diff --git a/.github/workflows/build-binaries.yaml b/.github/workflows/build-binaries.yaml index cebeba6254..49034b737c 100644 --- a/.github/workflows/build-binaries.yaml +++ b/.github/workflows/build-binaries.yaml @@ -55,7 +55,7 @@ jobs: - name: Build run: | - GOOS=linux GOARCH=${{ matrix.arch }} go build -o nuts-linux-${{ matrix.arch }} -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 nuts-linux-${{ matrix.arch }} + MODULE=$(go list -m) && GOOS=linux GOARCH=${{ matrix.arch }} go build -ldflags="-w -s -X '${MODULE}/core.GitCommit=${GIT_COMMIT}' -X '${MODULE}/core.GitBranch=${GIT_BRANCH}' -X '${MODULE}/core.GitVersion=${GIT_VERSION}'" -o nuts-linux-${{ matrix.arch }} - name: Upload binary env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Dockerfile b/Dockerfile index 6263cbc6ce..19533d3260 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN go mod download && go mod verify COPY . . # git is needed so go build can stamp the module version from the checked-out tag RUN apk add --no-cache git -RUN GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-w -s -X 'github.com/nuts-foundation/nuts-node/v6/core.GitCommit=${GIT_COMMIT}' -X 'github.com/nuts-foundation/nuts-node/v6/core.GitBranch=${GIT_BRANCH}' -X 'github.com/nuts-foundation/nuts-node/v6/core.GitVersion=${GIT_VERSION}'" -o /opt/nuts/nuts +RUN MODULE=$(go list -m) && GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-w -s -X '${MODULE}/core.GitCommit=${GIT_COMMIT}' -X '${MODULE}/core.GitBranch=${GIT_BRANCH}' -X '${MODULE}/core.GitVersion=${GIT_VERSION}'" -o /opt/nuts/nuts # alpine FROM alpine:3.24.1 diff --git a/makefile b/makefile index b506f054f5..6e4262f526 100644 --- a/makefile +++ b/makefile @@ -128,8 +128,10 @@ OUTPUT ?= "$(shell pwd)/nuts" 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))" +# Module path including the major version suffix (e.g. .../nuts-node/v6). +MODULE := $(shell go list -m) build: - go build -tags jwx_es256k -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 -tags jwx_es256k -ldflags="-w -s -X '$(MODULE)/core.GitCommit=${GIT_COMMIT}' -X '$(MODULE)/core.GitBranch=${GIT_BRANCH}' -X '$(MODULE)/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:master . @@ -137,3 +139,12 @@ docker: docker-dev: docker docker build -t nutsfoundation/nuts-node:dev development/dev-image + +# Bump the major version in the module path (e.g. /v6 -> /v7). Run once on the +# commit that starts a new major and commit the result. gomajor rewrites go.mod +# and every import; the .proto go_package options are rewritten here because +# gomajor does not touch them. Build files read the path from "go list -m". +bump-major: + go run github.com/icholy/gomajor@v0.15.0 path -next + perl -pi -e 's#"github.com/nuts-foundation/nuts-node(/v\d+)?/#"'"$$(go list -m)"'/#' $$(git ls-files '*.proto') + go mod tidy From f2dd15309f9701b3ede943c58d063f57badef2d8 Mon Sep 17 00:00:00 2001 From: Steven van der Vegt Date: Wed, 9 Sep 2026 08:24:57 +0200 Subject: [PATCH 4/8] build: stop embedding quotes in the makefile's git variables Assisted-by: AI (cherry picked from commit c5f2cddd7026d464d505db87e2fa6508218eedca) --- makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/makefile b/makefile index 6e4262f526..ff518c4922 100644 --- a/makefile +++ b/makefile @@ -125,9 +125,9 @@ e2e-test: cd e2e-tests && IMAGE_NODE_A=nutsfoundation/nuts-node:e2e IMAGE_NODE_B=nutsfoundation/nuts-node:e2e ./run-tests.sh OUTPUT ?= "$(shell pwd)/nuts" -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))" +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)) # Module path including the major version suffix (e.g. .../nuts-node/v6). MODULE := $(shell go list -m) build: From b68f307f703279b1c171a882b18a1a24e12bf2e5 Mon Sep 17 00:00:00 2001 From: Steven van der Vegt Date: Wed, 9 Sep 2026 08:25:45 +0200 Subject: [PATCH 5/8] ci: check out full history so go build can stamp the version Assisted-by: AI (cherry picked from commit d0091acce12760af394baf445467ba6a0b01bfe4) --- .github/workflows/build-images.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml index e8ed4951a4..06b808a3c2 100644 --- a/.github/workflows/build-images.yaml +++ b/.github/workflows/build-images.yaml @@ -29,6 +29,10 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: persist-credentials: false + # Full history so go build can derive the version from the nearest + # tag. A shallow clone stamps untagged builds as v6.0.0-