Deps: Replace go-jose v2 with go-jose v3 (#64228)

replace go-jose v2 with go-jose v3
This commit is contained in:
Jo
2023-03-06 15:12:51 +01:00
committed by GitHub
parent 05275cc9a4
commit 45fde4235b
12 changed files with 17 additions and 15 deletions
+1 -1
View File
@@ -11,6 +11,7 @@ import (
_ "github.com/blugelabs/bluge"
_ "github.com/blugelabs/bluge_segment_api"
_ "github.com/crewjam/saml"
_ "github.com/go-jose/go-jose/v3"
_ "github.com/gobwas/glob"
_ "github.com/googleapis/gax-go/v2"
_ "github.com/grafana/dskit/backoff"
@@ -25,7 +26,6 @@ import (
_ "github.com/vectordotdev/go-datemath"
_ "golang.org/x/time/rate"
_ "google.golang.org/genproto/googleapis/cloud/kms/v1"
_ "gopkg.in/square/go-jose.v2"
)
var IsEnterprise bool = false
+1 -1
View File
@@ -8,8 +8,8 @@ import (
"net/http"
"strings"
"github.com/go-jose/go-jose/v3/jwt"
"golang.org/x/oauth2"
"gopkg.in/square/go-jose.v2/jwt"
"github.com/grafana/grafana/pkg/models/roletype"
"github.com/grafana/grafana/pkg/services/org"
+2 -2
View File
@@ -9,10 +9,10 @@ import (
"testing"
"time"
"github.com/go-jose/go-jose/v3"
"github.com/go-jose/go-jose/v3/jwt"
"github.com/stretchr/testify/require"
"golang.org/x/oauth2"
"gopkg.in/square/go-jose.v2"
"gopkg.in/square/go-jose.v2/jwt"
"github.com/grafana/grafana/pkg/services/featuremgmt"
)
+1 -1
View File
@@ -6,8 +6,8 @@ import (
"fmt"
"net/http"
"github.com/go-jose/go-jose/v3/jwt"
"golang.org/x/oauth2"
"gopkg.in/square/go-jose.v2/jwt"
"github.com/grafana/grafana/pkg/models/roletype"
)
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"errors"
"strings"
"gopkg.in/square/go-jose.v2/jwt"
"github.com/go-jose/go-jose/v3/jwt"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/remotecache"
+2 -2
View File
@@ -13,10 +13,10 @@ import (
"testing"
"time"
jose "github.com/go-jose/go-jose/v3"
"github.com/go-jose/go-jose/v3/jwt"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
jose "gopkg.in/square/go-jose.v2"
"gopkg.in/square/go-jose.v2/jwt"
"github.com/grafana/grafana/pkg/infra/remotecache"
"github.com/grafana/grafana/pkg/setting"
+1 -1
View File
@@ -14,7 +14,7 @@ import (
"os"
"time"
jose "gopkg.in/square/go-jose.v2"
jose "github.com/go-jose/go-jose/v3"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/remotecache"
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"encoding/pem"
"fmt"
jose "gopkg.in/square/go-jose.v2"
jose "github.com/go-jose/go-jose/v3"
)
var rsaKeys [3]*rsa.PrivateKey
+2 -2
View File
@@ -3,9 +3,9 @@ package jwt
import (
"testing"
jose "github.com/go-jose/go-jose/v3"
"github.com/go-jose/go-jose/v3/jwt"
"github.com/stretchr/testify/require"
jose "gopkg.in/square/go-jose.v2"
"gopkg.in/square/go-jose.v2/jwt"
)
type noneSigner struct{}
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"reflect"
"time"
"gopkg.in/square/go-jose.v2/jwt"
"github.com/go-jose/go-jose/v3/jwt"
)
func (s *AuthService) initClaimExpectations() error {