Skip to content
Merged
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/build-binaries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
GOOS=linux GOARCH=${{ matrix.arch }} go build -o nuts-linux-${{ matrix.arch }} -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 nuts-linux-${{ matrix.arch }}
- name: Upload binary
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
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 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 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
Expand Down
6 changes: 3 additions & 3 deletions api/ssi_types_test.go
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"
"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 (
Expand Down
2 changes: 1 addition & 1 deletion audit/audit.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion audit/http.go
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/v6/core"
"strings"
)

Expand Down
2 changes: 1 addition & 1 deletion audit/http_test.go
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/v6/core"
"github.com/stretchr/testify/assert"
"net/http"
"testing"
Expand Down
18 changes: 9 additions & 9 deletions auth/api/auth/v1/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
Expand Down
28 changes: 14 additions & 14 deletions auth/api/auth/v1/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions auth/api/auth/v1/client/client.go
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/v6/auth/log"
"github.com/nuts-foundation/nuts-node/v6/core"
)

type oauthAPIError struct {
Expand Down
4 changes: 2 additions & 2 deletions auth/api/auth/v1/client/client_test.go
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/v6/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/v6/test/http"
)

func TestHTTPClient_CreateAccessToken(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion auth/api/auth/v1/client/types.go
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/oauth"
"github.com/nuts-foundation/nuts-node/v6/auth/oauth"
)

// 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
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/oauth"
"github.com/nuts-foundation/nuts-node/v6/auth/oauth"
)

// VerifiableCredential is an alias to use from within the API
Expand Down
10 changes: 5 additions & 5 deletions auth/api/iam/access_token.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
40 changes: 20 additions & 20 deletions auth/api/iam/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
52 changes: 26 additions & 26 deletions auth/api/iam/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions auth/api/iam/dpop.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions auth/api/iam/dpop_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions auth/api/iam/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions auth/api/iam/jar.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion auth/api/iam/jar_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading