update go module version to v2

This commit is contained in:
Livio Amstutz 2022-04-22 16:00:02 +02:00
parent 33a38e9c07
commit 7dd0ea5780
No known key found for this signature in database
GPG key ID: 7AB5FDFBCA448635
59 changed files with 116 additions and 113 deletions

View file

@ -10,9 +10,9 @@ import (
"golang.org/x/oauth2"
"gopkg.in/square/go-jose.v2"
"github.com/caos/oidc/pkg/crypto"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/v2/pkg/crypto"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
var (

View file

@ -5,8 +5,8 @@ import (
"golang.org/x/oauth2"
"github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
//JWTProfileExchange handles the oauth2 jwt profile exchange

View file

@ -7,8 +7,8 @@ import (
"golang.org/x/oauth2"
"gopkg.in/square/go-jose.v2"
"github.com/caos/oidc/pkg/client"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/v2/pkg/client"
"github.com/caos/oidc/v2/pkg/oidc"
)
//jwtProfileTokenSource implement the oauth2.TokenSource

View file

@ -4,9 +4,9 @@ import (
"context"
"net/http"
"github.com/caos/oidc/pkg/client/rp"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/v2/pkg/client/rp"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
const (

View file

@ -1,7 +1,7 @@
package rp
import (
"github.com/caos/oidc/pkg/oidc/grants/tokenexchange"
"github.com/caos/oidc/v2/pkg/oidc/grants/tokenexchange"
)
//DelegationTokenRequest is an implementation of TokenExchangeRequest

View file

@ -9,8 +9,8 @@ import (
"gopkg.in/square/go-jose.v2"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
func NewRemoteKeySet(client *http.Client, jwksURL string, opts ...func(*remoteKeySet)) oidc.KeySet {

View file

@ -10,7 +10,7 @@ import (
"github.com/golang/mock/gomock"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/v2/pkg/oidc"
)
// MockVerifier is a mock of Verifier interface

View file

@ -12,9 +12,9 @@ import (
"golang.org/x/oauth2"
"gopkg.in/square/go-jose.v2"
"github.com/caos/oidc/pkg/client"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/v2/pkg/client"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
const (

View file

@ -5,7 +5,7 @@ import (
"golang.org/x/oauth2"
"github.com/caos/oidc/pkg/oidc/grants/tokenexchange"
"github.com/caos/oidc/v2/pkg/oidc/grants/tokenexchange"
)
//TokenExchangeRP extends the `RelyingParty` interface for the *draft* oauth2 `Token Exchange`

View file

@ -6,7 +6,7 @@ import (
"gopkg.in/square/go-jose.v2"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/v2/pkg/oidc"
)
type IDTokenVerifier interface {

View file

@ -6,9 +6,9 @@ import (
"net/http"
"time"
"github.com/caos/oidc/pkg/client"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/v2/pkg/client"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
type ResourceServer interface {

View file

@ -3,7 +3,7 @@ package oidc
import (
"crypto/sha256"
"github.com/caos/oidc/pkg/crypto"
"github.com/caos/oidc/v2/pkg/crypto"
)
const (

View file

@ -9,8 +9,8 @@ import (
"golang.org/x/oauth2"
"gopkg.in/square/go-jose.v2"
"github.com/caos/oidc/pkg/crypto"
"github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/v2/pkg/crypto"
"github.com/caos/oidc/v2/pkg/http"
)
const (

View file

@ -12,7 +12,7 @@ import (
"gopkg.in/square/go-jose.v2"
str "github.com/caos/oidc/pkg/strings"
str "github.com/caos/oidc/v2/pkg/strings"
)
type Claims interface {

View file

@ -10,9 +10,9 @@ import (
"github.com/gorilla/mux"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
str "github.com/caos/oidc/pkg/strings"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
str "github.com/caos/oidc/v2/pkg/strings"
)
type AuthRequest interface {

View file

@ -13,10 +13,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/pkg/op"
"github.com/caos/oidc/pkg/op/mock"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
"github.com/caos/oidc/v2/pkg/op"
"github.com/caos/oidc/v2/pkg/op/mock"
)
//

View file

@ -3,7 +3,7 @@ package op
import (
"time"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/v2/pkg/oidc"
)
const (

View file

@ -1,7 +1,7 @@
package op
import (
"github.com/caos/oidc/pkg/crypto"
"github.com/caos/oidc/v2/pkg/crypto"
)
type Crypto interface {

View file

@ -6,8 +6,8 @@ import (
"gopkg.in/square/go-jose.v2"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
type DiscoverStorage interface {

View file

@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/require"
"gopkg.in/square/go-jose.v2"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/pkg/op"
"github.com/caos/oidc/pkg/op/mock"
"github.com/caos/oidc/v2/pkg/oidc"
"github.com/caos/oidc/v2/pkg/op"
"github.com/caos/oidc/v2/pkg/op/mock"
)
func TestDiscover(t *testing.T) {

View file

@ -3,7 +3,7 @@ package op_test
import (
"testing"
"github.com/caos/oidc/pkg/op"
"github.com/caos/oidc/v2/pkg/op"
)
func TestEndpoint_Path(t *testing.T) {

View file

@ -3,8 +3,8 @@ package op
import (
"net/http"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
type ErrAuthRequest interface {

View file

@ -6,7 +6,7 @@ import (
"gopkg.in/square/go-jose.v2"
httphelper "github.com/caos/oidc/pkg/http"
httphelper "github.com/caos/oidc/v2/pkg/http"
)
type KeyProvider interface {

View file

@ -11,9 +11,9 @@ import (
"github.com/stretchr/testify/assert"
"gopkg.in/square/go-jose.v2"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/pkg/op"
"github.com/caos/oidc/pkg/op/mock"
"github.com/caos/oidc/v2/pkg/oidc"
"github.com/caos/oidc/v2/pkg/op"
"github.com/caos/oidc/v2/pkg/op/mock"
)
func TestKeys(t *testing.T) {

View file

@ -8,9 +8,10 @@ import (
context "context"
reflect "reflect"
http "github.com/caos/oidc/pkg/http"
op "github.com/caos/oidc/pkg/op"
gomock "github.com/golang/mock/gomock"
http "github.com/caos/oidc/v2/pkg/http"
op "github.com/caos/oidc/v2/pkg/op"
)
// MockAuthorizer is a mock of Authorizer interface.

View file

@ -8,8 +8,8 @@ import (
"github.com/gorilla/schema"
"gopkg.in/square/go-jose.v2"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/pkg/op"
"github.com/caos/oidc/v2/pkg/oidc"
"github.com/caos/oidc/v2/pkg/op"
)
func NewAuthorizer(t *testing.T) op.Authorizer {

View file

@ -5,8 +5,8 @@ import (
"github.com/golang/mock/gomock"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/pkg/op"
"github.com/caos/oidc/v2/pkg/oidc"
"github.com/caos/oidc/v2/pkg/op"
)
func NewClient(t *testing.T) op.Client {

View file

@ -8,9 +8,10 @@ import (
reflect "reflect"
time "time"
oidc "github.com/caos/oidc/pkg/oidc"
op "github.com/caos/oidc/pkg/op"
gomock "github.com/golang/mock/gomock"
oidc "github.com/caos/oidc/v2/pkg/oidc"
op "github.com/caos/oidc/v2/pkg/op"
)
// MockClient is a mock of Client interface.

View file

@ -8,9 +8,10 @@ import (
http "net/http"
reflect "reflect"
op "github.com/caos/oidc/pkg/op"
gomock "github.com/golang/mock/gomock"
language "golang.org/x/text/language"
op "github.com/caos/oidc/v2/pkg/op"
)
// MockConfiguration is a mock of Configuration interface.

View file

@ -8,8 +8,9 @@ import (
context "context"
reflect "reflect"
op "github.com/caos/oidc/pkg/op"
gomock "github.com/golang/mock/gomock"
op "github.com/caos/oidc/v2/pkg/op"
)
// MockKeyProvider is a mock of KeyProvider interface.

View file

@ -9,10 +9,11 @@ import (
reflect "reflect"
time "time"
oidc "github.com/caos/oidc/pkg/oidc"
op "github.com/caos/oidc/pkg/op"
gomock "github.com/golang/mock/gomock"
jose "gopkg.in/square/go-jose.v2"
oidc "github.com/caos/oidc/v2/pkg/oidc"
op "github.com/caos/oidc/v2/pkg/op"
)
// MockStorage is a mock of Storage interface.

View file

@ -6,11 +6,10 @@ import (
"testing"
"time"
"github.com/caos/oidc/pkg/oidc"
"github.com/golang/mock/gomock"
"github.com/caos/oidc/pkg/op"
"github.com/caos/oidc/v2/pkg/oidc"
"github.com/caos/oidc/v2/pkg/op"
)
func NewStorage(t *testing.T) op.Storage {

View file

@ -12,8 +12,8 @@ import (
"golang.org/x/text/language"
"gopkg.in/square/go-jose.v2"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
const (

View file

@ -5,7 +5,7 @@ import (
"errors"
"net/http"
httphelper "github.com/caos/oidc/pkg/http"
httphelper "github.com/caos/oidc/v2/pkg/http"
)
type ProbesFn func(context.Context) error

View file

@ -4,8 +4,8 @@ import (
"context"
"net/http"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
type SessionEnder interface {

View file

@ -6,7 +6,7 @@ import (
"gopkg.in/square/go-jose.v2"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/v2/pkg/oidc"
)
type AuthStorage interface {

View file

@ -4,9 +4,9 @@ import (
"context"
"time"
"github.com/caos/oidc/pkg/crypto"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/pkg/strings"
"github.com/caos/oidc/v2/pkg/crypto"
"github.com/caos/oidc/v2/pkg/oidc"
"github.com/caos/oidc/v2/pkg/strings"
)
type TokenCreator interface {

View file

@ -4,8 +4,8 @@ import (
"context"
"net/http"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
//CodeExchange handles the OAuth 2.0 authorization_code grant, including

View file

@ -6,8 +6,8 @@ import (
"net/http"
"net/url"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
type Introspector interface {

View file

@ -5,8 +5,8 @@ import (
"net/http"
"time"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
type JWTAuthorizationGrantExchanger interface {

View file

@ -6,9 +6,9 @@ import (
"net/http"
"time"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/pkg/strings"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
"github.com/caos/oidc/v2/pkg/strings"
)
type RefreshTokenRequest interface {

View file

@ -5,8 +5,8 @@ import (
"net/http"
"net/url"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
type Exchanger interface {

View file

@ -6,8 +6,8 @@ import (
"net/url"
"strings"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
type Revoker interface {

View file

@ -6,8 +6,8 @@ import (
"net/http"
"strings"
httphelper "github.com/caos/oidc/pkg/http"
"github.com/caos/oidc/pkg/oidc"
httphelper "github.com/caos/oidc/v2/pkg/http"
"github.com/caos/oidc/v2/pkg/oidc"
)
type UserinfoProvider interface {

View file

@ -4,7 +4,7 @@ import (
"context"
"time"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/v2/pkg/oidc"
)
type AccessTokenVerifier interface {

View file

@ -4,7 +4,7 @@ import (
"context"
"time"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/v2/pkg/oidc"
)
type IDTokenHintVerifier interface {

View file

@ -8,7 +8,7 @@ import (
"gopkg.in/square/go-jose.v2"
"github.com/caos/oidc/pkg/oidc"
"github.com/caos/oidc/v2/pkg/oidc"
)
type JWTProfileVerifier interface {