Skip to content

build: add /v5 major version suffix to the module path #4491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevenvegt merged 8 commits into from
Sep 9, 2026
Merged

build: add /v5 major version suffix to the module path #4491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1d46e63
build: add /v5 major version suffix to the module path
stevenvegt Sep 9, 2026
a3467a1
build: let the Docker build stamp the module version from git
stevenvegt Sep 9, 2026
cc34831
build: derive the module path in build files, add bump-major target
stevenvegt Sep 9, 2026
4139d8f
ci: check out full history so go build can stamp the version
stevenvegt Sep 9, 2026
5aceea8
build: address linter findings on the changed build files
stevenvegt Sep 9, 2026
5db10d1
build: document and apply the DL3018 ignore on both apk add lines
stevenvegt Sep 9, 2026
5179b04
build: use /v5 module path in .proto go_package options
stevenvegt Sep 9, 2026
81f2052
build: limit this PR to the module path rename
stevenvegt Sep 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ COPY go.sum .
RUN go mod download && go mod verify

COPY . .
RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-w -s -X 'github.com/nuts-foundation/nuts-node/core.GitCommit=${GIT_COMMIT}' -X 'github.com/nuts-foundation/nuts-node/core.GitBranch=${GIT_BRANCH}' -X 'github.com/nuts-foundation/nuts-node/core.GitVersion=${GIT_VERSION}'" -o /opt/nuts/nuts
RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-w -s -X 'github.com/nuts-foundation/nuts-node/v5/core.GitCommit=${GIT_COMMIT}' -X 'github.com/nuts-foundation/nuts-node/v5/core.GitBranch=${GIT_BRANCH}' -X 'github.com/nuts-foundation/nuts-node/v5/core.GitVersion=${GIT_VERSION}'" -o /opt/nuts/nuts

# alpine
FROM alpine:3.22.2
Expand Down
6 changes: 3 additions & 3 deletions api/ssi_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
ssi "github.com/nuts-foundation/go-did"
"github.com/nuts-foundation/go-did/did"
"github.com/nuts-foundation/go-did/vc"
"github.com/nuts-foundation/nuts-node/crypto/hash"
vcr "github.com/nuts-foundation/nuts-node/vcr/api/vcr/v2"
vdrTypes "github.com/nuts-foundation/nuts-node/vdr/types"
"github.com/nuts-foundation/nuts-node/v5/crypto/hash"
vcr "github.com/nuts-foundation/nuts-node/v5/vcr/api/vcr/v2"
vdrTypes "github.com/nuts-foundation/nuts-node/v5/vdr/types"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion audit/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ package audit
import (
"fmt"
"github.com/labstack/echo/v4"
"github.com/nuts-foundation/nuts-node/core"
"github.com/nuts-foundation/nuts-node/v5/core"
)

// StrictMiddleware is like SetOnEchoContext but then as handler for strict server interfaces.
Expand Down
2 changes: 1 addition & 1 deletion audit/http_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package audit

import (
"github.com/labstack/echo/v4"
"github.com/nuts-foundation/nuts-node/core"
"github.com/nuts-foundation/nuts-node/v5/core"
"github.com/stretchr/testify/assert"
"net/http"
"testing"
Expand Down
16 changes: 8 additions & 8 deletions auth/api/auth/v1/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"context"
"encoding/json"
"fmt"
"github.com/nuts-foundation/nuts-node/audit"
"github.com/nuts-foundation/nuts-node/v5/audit"
"net/http"
"net/url"
"regexp"
Expand All @@ -31,17 +31,17 @@ import (

ssi "github.com/nuts-foundation/go-did"
"github.com/nuts-foundation/go-did/vc"
"github.com/nuts-foundation/nuts-node/auth/api/auth/v1/client"
"github.com/nuts-foundation/nuts-node/vcr"
"github.com/nuts-foundation/nuts-node/v5/auth/api/auth/v1/client"
"github.com/nuts-foundation/nuts-node/v5/vcr"

"github.com/labstack/echo/v4"

"github.com/nuts-foundation/go-did/did"
"github.com/nuts-foundation/nuts-node/auth"
"github.com/nuts-foundation/nuts-node/auth/contract"
"github.com/nuts-foundation/nuts-node/auth/log"
"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/core"
"github.com/nuts-foundation/nuts-node/v5/auth"
"github.com/nuts-foundation/nuts-node/v5/auth/contract"
"github.com/nuts-foundation/nuts-node/v5/auth/log"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
"github.com/nuts-foundation/nuts-node/v5/core"
)

var _ StrictServerInterface = (*Wrapper)(nil)
Expand Down
20 changes: 10 additions & 10 deletions auth/api/auth/v1/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ import (
ssi "github.com/nuts-foundation/go-did"
"github.com/nuts-foundation/go-did/did"
"github.com/nuts-foundation/go-did/vc"
"github.com/nuts-foundation/nuts-node/audit"
pkg2 "github.com/nuts-foundation/nuts-node/auth"
"github.com/nuts-foundation/nuts-node/auth/contract"
"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/auth/services/dummy"
"github.com/nuts-foundation/nuts-node/auth/services/oauth"
"github.com/nuts-foundation/nuts-node/core"
"github.com/nuts-foundation/nuts-node/vcr"
"github.com/nuts-foundation/nuts-node/vcr/credential"
"github.com/nuts-foundation/nuts-node/vdr"
"github.com/nuts-foundation/nuts-node/v5/audit"
pkg2 "github.com/nuts-foundation/nuts-node/v5/auth"
"github.com/nuts-foundation/nuts-node/v5/auth/contract"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/services/dummy"
"github.com/nuts-foundation/nuts-node/v5/auth/services/oauth"
"github.com/nuts-foundation/nuts-node/v5/core"
"github.com/nuts-foundation/nuts-node/v5/vcr"
"github.com/nuts-foundation/nuts-node/v5/vcr/credential"
"github.com/nuts-foundation/nuts-node/v5/vdr"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
Expand Down
4 changes: 2 additions & 2 deletions auth/api/auth/v1/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"strings"
"time"

"github.com/nuts-foundation/nuts-node/auth/log"
"github.com/nuts-foundation/nuts-node/core"
"github.com/nuts-foundation/nuts-node/v5/auth/log"
"github.com/nuts-foundation/nuts-node/v5/core"
)

type oauthAPIError struct {
Expand Down
4 changes: 2 additions & 2 deletions auth/api/auth/v1/client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package client

import (
"context"
"github.com/nuts-foundation/nuts-node/core"
"github.com/nuts-foundation/nuts-node/v5/core"
"github.com/stretchr/testify/require"
"net/http"
"net/http/httptest"
Expand All @@ -31,7 +31,7 @@ import (

"github.com/stretchr/testify/assert"

http2 "github.com/nuts-foundation/nuts-node/test/http"
http2 "github.com/nuts-foundation/nuts-node/v5/test/http"
)

func TestHTTPClient_CreateAccessToken(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion auth/api/auth/v1/client/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package client

import (
"github.com/nuts-foundation/go-did/vc"
"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
)

// JwtBearerGrantType defines the grant-type to use in the access token request
Expand Down
2 changes: 1 addition & 1 deletion auth/api/auth/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package v1

import (
"github.com/nuts-foundation/go-did/vc"
"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
)

// VerifiableCredential is an alias to use from within the API
Expand Down
4 changes: 2 additions & 2 deletions auth/api/means/v1/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
package v1

import (
"github.com/nuts-foundation/nuts-node/auth"
"github.com/nuts-foundation/nuts-node/core"
"github.com/nuts-foundation/nuts-node/v5/auth"
"github.com/nuts-foundation/nuts-node/v5/core"
)

// Wrapper bridges Echo routes to the server backend.
Expand Down
22 changes: 11 additions & 11 deletions auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ import (
"path"
"time"

"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/auth/services/notary"
"github.com/nuts-foundation/nuts-node/auth/services/oauth"
"github.com/nuts-foundation/nuts-node/core"
"github.com/nuts-foundation/nuts-node/crypto"
"github.com/nuts-foundation/nuts-node/didman"
"github.com/nuts-foundation/nuts-node/jsonld"
"github.com/nuts-foundation/nuts-node/pki"
"github.com/nuts-foundation/nuts-node/vcr"
"github.com/nuts-foundation/nuts-node/vdr/didservice"
"github.com/nuts-foundation/nuts-node/vdr/didstore"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/services/notary"
"github.com/nuts-foundation/nuts-node/v5/auth/services/oauth"
"github.com/nuts-foundation/nuts-node/v5/core"
"github.com/nuts-foundation/nuts-node/v5/crypto"
"github.com/nuts-foundation/nuts-node/v5/didman"
"github.com/nuts-foundation/nuts-node/v5/jsonld"
"github.com/nuts-foundation/nuts-node/v5/pki"
"github.com/nuts-foundation/nuts-node/v5/vcr"
"github.com/nuts-foundation/nuts-node/v5/vdr/didservice"
"github.com/nuts-foundation/nuts-node/v5/vdr/didstore"
)

// ErrMissingPublicURL is returned when the publicUrl is missing from the config
Expand Down
10 changes: 5 additions & 5 deletions auth/auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
package auth

import (
"github.com/nuts-foundation/nuts-node/crypto"
"github.com/nuts-foundation/nuts-node/pki"
"github.com/nuts-foundation/nuts-node/vcr"
"github.com/nuts-foundation/nuts-node/vdr/didstore"
"github.com/nuts-foundation/nuts-node/v5/crypto"
"github.com/nuts-foundation/nuts-node/v5/pki"
"github.com/nuts-foundation/nuts-node/v5/vcr"
"github.com/nuts-foundation/nuts-node/v5/vdr/didstore"
"go.uber.org/mock/gomock"
"testing"

"github.com/nuts-foundation/nuts-node/core"
"github.com/nuts-foundation/nuts-node/v5/core"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
2 changes: 1 addition & 1 deletion auth/cmd/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package cmd

import (
"github.com/nuts-foundation/nuts-node/auth"
"github.com/nuts-foundation/nuts-node/v5/auth"
"github.com/spf13/pflag"
)

Expand Down
4 changes: 2 additions & 2 deletions auth/cmd/cmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
package cmd

import (
"github.com/nuts-foundation/nuts-node/auth"
"github.com/nuts-foundation/nuts-node/core"
"github.com/nuts-foundation/nuts-node/v5/auth"
"github.com/nuts-foundation/nuts-node/v5/core"
"github.com/stretchr/testify/require"
"sort"
"testing"
Expand Down
8 changes: 4 additions & 4 deletions auth/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
package auth

import (
"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/auth/services/dummy"
"github.com/nuts-foundation/nuts-node/auth/services/selfsigned"
"github.com/nuts-foundation/nuts-node/auth/services/uzi"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/services/dummy"
"github.com/nuts-foundation/nuts-node/v5/auth/services/selfsigned"
"github.com/nuts-foundation/nuts-node/v5/auth/services/uzi"
)

// Config holds all the configuration params
Expand Down
4 changes: 2 additions & 2 deletions auth/interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
package auth

import (
"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/auth/services/oauth"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/services/oauth"
)

// AuthenticationServices is the interface which should be implemented for clients or mocks
Expand Down
2 changes: 1 addition & 1 deletion auth/log/logger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package log

import (
"github.com/nuts-foundation/nuts-node/core"
"github.com/nuts-foundation/nuts-node/v5/core"
"github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions auth/services/dummy/dummy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (

ssi "github.com/nuts-foundation/go-did"
"github.com/nuts-foundation/go-did/vc"
"github.com/nuts-foundation/nuts-node/auth/contract"
"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/contract"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
)

// ContractFormat is the contract format type
Expand Down
4 changes: 2 additions & 2 deletions auth/services/dummy/dummy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (

ssi "github.com/nuts-foundation/go-did"
"github.com/nuts-foundation/go-did/vc"
"github.com/nuts-foundation/nuts-node/auth/contract"
"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/contract"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions auth/services/irma/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ package irma

import (
"fmt"
"github.com/nuts-foundation/nuts-node/auth/contract"
"github.com/nuts-foundation/nuts-node/v5/auth/contract"
"os"
"path/filepath"

"github.com/nuts-foundation/nuts-node/auth/log"
"github.com/nuts-foundation/nuts-node/v5/auth/log"
"github.com/sirupsen/logrus"

irma "github.com/privacybydesign/irmago"
Expand Down
6 changes: 3 additions & 3 deletions auth/services/irma/irmacontract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"strings"
"time"

"github.com/nuts-foundation/nuts-node/auth/contract"
"github.com/nuts-foundation/nuts-node/auth/log"
"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/contract"
"github.com/nuts-foundation/nuts-node/v5/auth/log"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
irma "github.com/privacybydesign/irmago"
)

Expand Down
6 changes: 3 additions & 3 deletions auth/services/irma/irmacontract_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"testing"
"time"

"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/services"

"github.com/nuts-foundation/nuts-node/auth/contract"
"github.com/nuts-foundation/nuts-node/v5/auth/contract"

"github.com/nuts-foundation/nuts-node/auth/test"
"github.com/nuts-foundation/nuts-node/v5/auth/test"

irma "github.com/privacybydesign/irmago"
"github.com/stretchr/testify/assert"
Expand Down
8 changes: 4 additions & 4 deletions auth/services/irma/signer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"encoding/json"
"fmt"
"github.com/labstack/echo/v4"
"github.com/nuts-foundation/nuts-node/core"
"github.com/nuts-foundation/nuts-node/v5/core"
"github.com/sirupsen/logrus"
"net/http"
"os"
Expand All @@ -35,9 +35,9 @@ import (
"github.com/privacybydesign/irmago/server/irmaserver"

"github.com/mdp/qrterminal/v3"
"github.com/nuts-foundation/nuts-node/auth/contract"
"github.com/nuts-foundation/nuts-node/auth/log"
"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/contract"
"github.com/nuts-foundation/nuts-node/v5/auth/log"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
irmago "github.com/privacybydesign/irmago"
"github.com/privacybydesign/irmago/server"
)
Expand Down
10 changes: 5 additions & 5 deletions auth/services/irma/signer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ import (

"github.com/privacybydesign/irmago/server/irmaserver"

"github.com/nuts-foundation/nuts-node/crypto"
"github.com/nuts-foundation/nuts-node/vcr"
"github.com/nuts-foundation/nuts-node/vdr"
"github.com/nuts-foundation/nuts-node/v5/crypto"
"github.com/nuts-foundation/nuts-node/v5/vcr"
"github.com/nuts-foundation/nuts-node/v5/vdr"

"github.com/nuts-foundation/nuts-node/auth/contract"
"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/contract"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
irma "github.com/privacybydesign/irmago"
irmaservercore "github.com/privacybydesign/irmago/server"
"github.com/stretchr/testify/assert"
Expand Down
6 changes: 3 additions & 3 deletions auth/services/irma/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ package irma
import (
"errors"
"fmt"
"github.com/nuts-foundation/nuts-node/auth/log"
"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/log"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
"strings"
"time"

"github.com/lestrrat-go/jwx/jwt"
"github.com/nuts-foundation/go-did/vc"
"github.com/nuts-foundation/nuts-node/auth/contract"
"github.com/nuts-foundation/nuts-node/v5/auth/contract"

irma "github.com/privacybydesign/irmago"
)
Expand Down
8 changes: 4 additions & 4 deletions auth/services/irma/validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"testing"

"github.com/nuts-foundation/go-did/vc"
"github.com/nuts-foundation/nuts-node/auth/contract"
"github.com/nuts-foundation/nuts-node/auth/services"
"github.com/nuts-foundation/nuts-node/auth/test"
"github.com/nuts-foundation/nuts-node/crypto"
"github.com/nuts-foundation/nuts-node/v5/auth/contract"
"github.com/nuts-foundation/nuts-node/v5/auth/services"
"github.com/nuts-foundation/nuts-node/v5/auth/test"
"github.com/nuts-foundation/nuts-node/v5/crypto"
irma "github.com/privacybydesign/irmago"
irmaservercore "github.com/privacybydesign/irmago/server"
"github.com/stretchr/testify/assert"
Expand Down
Loading
Loading