public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Bump golangci-lint to 2.0.2 (#103572)

Browse Source
This commit is contained in:
Mariell Hoversholm
2025-04-10 14:42:23 +02:00
committed by GitHub
parent b58b6e828e
commit 757be6365a
291 changed files with 1948 additions and 1835 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/pluginproxy/ds_proxy.go
+2 -2
View File
@@ -148,8 +148,8 @@ func (proxy *DataSourceProxy) HandleRequest() {
span.SetAttributes(
attribute.String("datasource_name", proxy.ds.Name),
attribute.String("datasource_type", proxy.ds.Type),
attribute.String("user", proxy.ctx.SignedInUser.Login),
attribute.Int64("org_id", proxy.ctx.SignedInUser.OrgID),
attribute.String("user", proxy.ctx.Login),
attribute.Int64("org_id", proxy.ctx.OrgID),
)
proxy.addTraceFromHeaderValue(span, "X-Panel-Id", "panel_id")
pkg/api/pluginproxy/ds_proxy_test.go
+13 -13
View File
@@ -268,7 +268,7 @@ func TestDataSourceProxy_routeRule(t *testing.T) {
t.Run("plugin route with admin role and user is admin", func(t *testing.T) {
ctx, _ := setUp()
ctx.SignedInUser.OrgRole = org.RoleAdmin
ctx.OrgRole = org.RoleAdmin
proxy, err := setupDSProxyTest(t, ctx, ds, routes, "api/admin")
require.NoError(t, err)
err = proxy.validateRequest()
@@ -278,9 +278,9 @@ func TestDataSourceProxy_routeRule(t *testing.T) {
t.Run("plugin route with RBAC protection user is allowed", func(t *testing.T) {
ctx, _ := setUp()
ctx.SignedInUser.OrgID = int64(1)
ctx.SignedInUser.OrgRole = identity.RoleNone
ctx.SignedInUser.Permissions = map[int64]map[string][]string{1: {"test-app.settings:read": nil}}
ctx.OrgID = int64(1)
ctx.OrgRole = identity.RoleNone
ctx.Permissions = map[int64]map[string][]string{1: {"test-app.settings:read": nil}}
proxy, err := setupDSProxyTest(t, ctx, ds, routes, "api/rbac-restricted")
require.NoError(t, err)
err = proxy.validateRequest()
@@ -289,9 +289,9 @@ func TestDataSourceProxy_routeRule(t *testing.T) {
t.Run("plugin route with RBAC protection user is not allowed", func(t *testing.T) {
ctx, _ := setUp()
ctx.SignedInUser.OrgID = int64(1)
ctx.SignedInUser.OrgRole = identity.RoleNone
ctx.SignedInUser.Permissions = map[int64]map[string][]string{1: {"test-app:read": nil}}
ctx.OrgID = int64(1)
ctx.OrgRole = identity.RoleNone
ctx.Permissions = map[int64]map[string][]string{1: {"test-app:read": nil}}
proxy, err := setupDSProxyTest(t, ctx, ds, routes, "api/rbac-restricted")
require.NoError(t, err)
err = proxy.validateRequest()
@@ -300,9 +300,9 @@ func TestDataSourceProxy_routeRule(t *testing.T) {
t.Run("plugin route with dynamic RBAC protection user is allowed", func(t *testing.T) {
ctx, _ := setUp()
ctx.SignedInUser.OrgID = int64(1)
ctx.SignedInUser.OrgRole = identity.RoleNone
ctx.SignedInUser.Permissions = map[int64]map[string][]string{1: {"datasources:read": {"datasources:uid:dsUID"}}}
ctx.OrgID = int64(1)
ctx.OrgRole = identity.RoleNone
ctx.Permissions = map[int64]map[string][]string{1: {"datasources:read": {"datasources:uid:dsUID"}}}
proxy, err := setupDSProxyTest(t, ctx, ds, routes, "api/rbac-home")
require.NoError(t, err)
err = proxy.validateRequest()
@@ -311,10 +311,10 @@ func TestDataSourceProxy_routeRule(t *testing.T) {
t.Run("plugin route with dynamic RBAC protection user is not allowed", func(t *testing.T) {
ctx, _ := setUp()
ctx.SignedInUser.OrgID = int64(1)
ctx.SignedInUser.OrgRole = identity.RoleNone
ctx.OrgID = int64(1)
ctx.OrgRole = identity.RoleNone
// Has access but to another app
ctx.SignedInUser.Permissions = map[int64]map[string][]string{1: {"datasources:read": {"datasources:uid:notTheDsUID"}}}
ctx.Permissions = map[int64]map[string][]string{1: {"datasources:read": {"datasources:uid:notTheDsUID"}}}
proxy, err := setupDSProxyTest(t, ctx, ds, routes, "api/rbac-home")
require.NoError(t, err)
err = proxy.validateRequest()
pkg/api/pluginproxy/pluginproxy.go
+2 -2
View File
@@ -119,8 +119,8 @@ func (proxy *PluginProxy) HandleRequest() {
proxy.ctx.Req = proxy.ctx.Req.WithContext(ctx)
span.SetAttributes(
attribute.String("user", proxy.ctx.SignedInUser.Login),
attribute.Int64("org_id", proxy.ctx.SignedInUser.OrgID),
attribute.String("user", proxy.ctx.Login),
attribute.Int64("org_id", proxy.ctx.OrgID),
)
proxy.tracer.Inject(ctx, proxy.ctx.Req.Header, span)
pkg/api/pluginproxy/pluginproxy_test.go
+10 -14
View File
@@ -239,11 +239,11 @@ func TestPluginProxy(t *testing.T) {
})
t.Run("When proxying a request should set expected response headers", func(t *testing.T) {
requestHandled := false
requestHandled := make(chan struct{})
backendServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(200)
_, _ = w.Write([]byte("I am the backend"))
requestHandled = true
close(requestHandled)
}))
t.Cleanup(backendServer.Close)
@@ -271,10 +271,10 @@ func TestPluginProxy(t *testing.T) {
require.NoError(t, err)
proxy.HandleRequest()
for {
if requestHandled {
break
}
select {
case <-requestHandled:
case <-t.Context().Done():
t.Fatal("timeout waiting for request to be handled")
}
require.Equal(t, "sandbox", ctx.Resp.Header().Get("Content-Security-Policy"))
@@ -427,10 +427,8 @@ func TestPluginProxyRoutes(t *testing.T) {
require.NoError(t, err)
proxy.HandleRequest()
for {
if requestHandled || ctx.Resp.Written() {
break
}
for !requestHandled && !ctx.Resp.Written() {
}
require.Equal(t, tc.expectedStatus, ctx.Resp.Status())
@@ -561,10 +559,8 @@ func TestPluginProxyRoutesAccessControl(t *testing.T) {
require.NoError(t, err)
proxy.HandleRequest()
for {
if requestHandled || ctx.Resp.Written() {
break
}
for !requestHandled && !ctx.Resp.Written() {
}
require.Equal(t, tc.expectedStatus, ctx.Resp.Status())