Chore: use any rather than interface{} (#74066)
This commit is contained in:
@@ -27,7 +27,7 @@ func TestCachingMiddleware(t *testing.T) {
|
||||
clienttest.WithMiddlewares(NewCachingMiddleware(cs)),
|
||||
)
|
||||
|
||||
jsonDataMap := map[string]interface{}{}
|
||||
jsonDataMap := map[string]any{}
|
||||
jsonDataBytes, err := json.Marshal(&jsonDataMap)
|
||||
require.NoError(t, err)
|
||||
|
||||
@@ -202,7 +202,7 @@ func TestCachingMiddleware(t *testing.T) {
|
||||
clienttest.WithResourceResponses([]*backend.CallResourceResponse{simulatedPluginResponse}),
|
||||
)
|
||||
|
||||
jsonDataMap := map[string]interface{}{}
|
||||
jsonDataMap := map[string]any{}
|
||||
jsonDataBytes, err := json.Marshal(&jsonDataMap)
|
||||
require.NoError(t, err)
|
||||
|
||||
@@ -279,7 +279,7 @@ func TestCachingMiddleware(t *testing.T) {
|
||||
reqCtx := contexthandler.FromContext(req.Context())
|
||||
require.Nil(t, reqCtx)
|
||||
|
||||
jsonDataMap := map[string]interface{}{}
|
||||
jsonDataMap := map[string]any{}
|
||||
jsonDataBytes, err := json.Marshal(&jsonDataMap)
|
||||
require.NoError(t, err)
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ type CookiesMiddleware struct {
|
||||
skipCookiesNames []string
|
||||
}
|
||||
|
||||
func (m *CookiesMiddleware) applyCookies(ctx context.Context, pCtx backend.PluginContext, req interface{}) error {
|
||||
func (m *CookiesMiddleware) applyCookies(ctx context.Context, pCtx backend.PluginContext, req any) error {
|
||||
reqCtx := contexthandler.FromContext(ctx)
|
||||
// if request not for a datasource or no HTTP request context skip middleware
|
||||
if req == nil || pCtx.DataSourceInstanceSettings == nil || reqCtx == nil || reqCtx.Req == nil {
|
||||
|
||||
@@ -33,7 +33,7 @@ func TestCookiesMiddleware(t *testing.T) {
|
||||
clienttest.WithMiddlewares(NewCookiesMiddleware([]string{"grafana_session"})),
|
||||
)
|
||||
|
||||
jsonDataMap := map[string]interface{}{}
|
||||
jsonDataMap := map[string]any{}
|
||||
jsonDataBytes, err := json.Marshal(&jsonDataMap)
|
||||
require.NoError(t, err)
|
||||
|
||||
@@ -102,7 +102,7 @@ func TestCookiesMiddleware(t *testing.T) {
|
||||
clienttest.WithMiddlewares(NewCookiesMiddleware([]string{"grafana_session"})),
|
||||
)
|
||||
|
||||
jsonDataMap := map[string]interface{}{
|
||||
jsonDataMap := map[string]any{
|
||||
"keepCookies": []string{"cookie2", "grafana_session"},
|
||||
}
|
||||
jsonDataBytes, err := json.Marshal(&jsonDataMap)
|
||||
|
||||
@@ -26,7 +26,7 @@ type HTTPClientMiddleware struct {
|
||||
next plugins.Client
|
||||
}
|
||||
|
||||
func (m *HTTPClientMiddleware) applyHeaders(ctx context.Context, pReq interface{}) context.Context {
|
||||
func (m *HTTPClientMiddleware) applyHeaders(ctx context.Context, pReq any) context.Context {
|
||||
if pReq == nil {
|
||||
return ctx
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ func TestOAuthTokenMiddleware(t *testing.T) {
|
||||
clienttest.WithMiddlewares(NewOAuthTokenMiddleware(oAuthTokenService)),
|
||||
)
|
||||
|
||||
jsonDataMap := map[string]interface{}{}
|
||||
jsonDataMap := map[string]any{}
|
||||
jsonDataBytes, err := json.Marshal(&jsonDataMap)
|
||||
require.NoError(t, err)
|
||||
|
||||
@@ -82,7 +82,7 @@ func TestOAuthTokenMiddleware(t *testing.T) {
|
||||
TokenType: "bearer",
|
||||
AccessToken: "access-token",
|
||||
}
|
||||
token = token.WithExtra(map[string]interface{}{"id_token": "id-token"})
|
||||
token = token.WithExtra(map[string]any{"id_token": "id-token"})
|
||||
oAuthTokenService := &oauthtokentest.Service{
|
||||
Token: token,
|
||||
}
|
||||
@@ -91,7 +91,7 @@ func TestOAuthTokenMiddleware(t *testing.T) {
|
||||
clienttest.WithMiddlewares(NewOAuthTokenMiddleware(oAuthTokenService)),
|
||||
)
|
||||
|
||||
jsonDataMap := map[string]interface{}{
|
||||
jsonDataMap := map[string]any{
|
||||
"oauthPassThru": true,
|
||||
}
|
||||
jsonDataBytes, err := json.Marshal(&jsonDataMap)
|
||||
|
||||
Reference in New Issue
Block a user