Chore: Update go-jose v2 to v3 and retryable http (#92115)

* chore: update go-jose v2 and retryable http

* chore: update go-jose v2 to v3

* lock mysql

* update sql
This commit is contained in:
Jo
2024-08-20 11:51:08 +02:00
committed by GitHub
parent 7198ba3d33
commit f2f6eabd21
10 changed files with 483 additions and 79 deletions
@@ -4,8 +4,9 @@ import (
"context"
"net/http"
"github.com/go-jose/go-jose/v3"
"github.com/grafana/grafana/pkg/services/extsvcauth"
"gopkg.in/square/go-jose.v2"
)
const (
@@ -4,10 +4,10 @@ import (
"context"
"time"
"github.com/go-jose/go-jose/v3"
"github.com/ory/fosite"
"github.com/ory/fosite/handler/oauth2"
"github.com/ory/fosite/handler/rfc7523"
"gopkg.in/square/go-jose.v2"
"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver/utils"
)
@@ -11,14 +11,14 @@ import (
"testing"
"time"
"github.com/go-jose/go-jose/v3"
"github.com/go-jose/go-jose/v3/jwt"
"github.com/google/uuid"
"github.com/ory/fosite"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"golang.org/x/crypto/bcrypt"
"golang.org/x/exp/maps"
"gopkg.in/square/go-jose.v2"
"gopkg.in/square/go-jose.v2/jwt"
"github.com/grafana/grafana/pkg/models/roletype"
ac "github.com/grafana/grafana/pkg/services/accesscontrol"
@@ -4,9 +4,10 @@ import (
"context"
"net/http"
"github.com/go-jose/go-jose/v3"
"github.com/grafana/grafana/pkg/services/extsvcauth"
"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
"gopkg.in/square/go-jose.v2"
)
type FakeService struct {
@@ -6,7 +6,7 @@ import (
context "context"
mock "github.com/stretchr/testify/mock"
jose "gopkg.in/square/go-jose.v2"
jose "github.com/go-jose/go-jose/v3"
oauthserver "github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"
)
@@ -6,7 +6,7 @@ import (
"crypto/rsa"
"errors"
"gopkg.in/square/go-jose.v2"
"github.com/go-jose/go-jose/v3"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/services/extsvcauth/oauthserver"