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

Chore: Fix goimports grouping (#62429)

Browse Source 
* fix goimports ordering

* fix goimports order
This commit is contained in:
Serge Zaitsev
2023-01-30 09:57:50 +01:00
committed by GitHub
parent d6d4097567
commit 907e2a840e
65 changed files with 127 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/infra/filestorage/filter.go
+1
View File
@@ -4,6 +4,7 @@ import (
"strings"
"github.com/armon/go-radix"
"github.com/grafana/grafana/pkg/services/accesscontrol"
)
pkg/services/live/database/tests/storage_test.go
+2 -1
View File
@@ -4,8 +4,9 @@ import (
"encoding/json"
"testing"
"github.com/grafana/grafana/pkg/services/live/model"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/services/live/model"
)
func TestIntegrationLiveMessage(t *testing.T) {
pkg/services/live/features/broadcast.go
+2 -2
View File
@@ -3,11 +3,11 @@ package features
import (
"context"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/live/model"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana-plugin-sdk-go/backend"
)
var (
pkg/services/live/features/broadcast_mock.go
+1
View File
@@ -8,6 +8,7 @@ import (
reflect "reflect"
gomock "github.com/golang/mock/gomock"
model "github.com/grafana/grafana/pkg/services/live/model"
)
pkg/services/live/features/broadcast_test.go
+2 -1
View File
@@ -7,9 +7,10 @@ import (
"github.com/golang/mock/gomock"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/services/live/model"
"github.com/grafana/grafana/pkg/services/user"
"github.com/stretchr/testify/require"
)
func TestNewBroadcastRunner(t *testing.T) {
pkg/services/live/features/comment.go
+2 -2
View File
@@ -4,11 +4,11 @@ import (
"context"
"strings"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/services/comments/commentmodel"
"github.com/grafana/grafana/pkg/services/live/model"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana-plugin-sdk-go/backend"
)
// CommentHandler manages all the `grafana/comment/*` channels.
pkg/services/live/features/plugin.go
+3 -3
View File
@@ -3,13 +3,13 @@ package features
import (
"context"
"github.com/centrifugal/centrifuge"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/services/live/model"
"github.com/grafana/grafana/pkg/services/live/orgchannel"
"github.com/grafana/grafana/pkg/services/live/runstream"
"github.com/grafana/grafana/pkg/services/user"
"github.com/centrifugal/centrifuge"
"github.com/grafana/grafana-plugin-sdk-go/backend"
)
//go:generate mockgen -destination=plugin_mock.go -package=features github.com/grafana/grafana/pkg/services/live/features PluginContextGetter
pkg/services/live/features/plugin_mock.go
+1
View File
@@ -10,6 +10,7 @@ import (
gomock "github.com/golang/mock/gomock"
backend "github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/services/user"
)
pkg/services/live/live.go
+8 -8
View File
@@ -14,6 +14,14 @@ import (
"sync"
"time"
"github.com/centrifugal/centrifuge"
"github.com/go-redis/redis/v8"
"github.com/gobwas/glob"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/live"
jsoniter "github.com/json-iterator/go"
"golang.org/x/sync/errgroup"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/api/routing"
@@ -50,14 +58,6 @@ import (
"github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/util/errutil"
"github.com/grafana/grafana/pkg/web"
"github.com/centrifugal/centrifuge"
"github.com/go-redis/redis/v8"
"github.com/gobwas/glob"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/live"
jsoniter "github.com/json-iterator/go"
"golang.org/x/sync/errgroup"
)
var (
pkg/services/live/live_test.go
+2 -2
View File
@@ -7,9 +7,9 @@ import (
"testing"
"time"
"github.com/grafana/grafana/pkg/setting"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/setting"
)
func Test_runConcurrentlyIfNeeded_Concurrent(t *testing.T) {
pkg/services/live/liveplugin/plugin.go
+3 -3
View File
@@ -4,14 +4,14 @@ import (
"context"
"fmt"
"github.com/centrifugal/centrifuge"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/plugins/plugincontext"
"github.com/grafana/grafana/pkg/services/datasources"
"github.com/grafana/grafana/pkg/services/live/orgchannel"
"github.com/grafana/grafana/pkg/services/live/pipeline"
"github.com/grafana/grafana/pkg/services/user"
"github.com/centrifugal/centrifuge"
"github.com/grafana/grafana-plugin-sdk-go/backend"
)
type ChannelLocalPublisher struct {
pkg/services/live/managedstream/cache_memory_test.go
-1
View File
@@ -6,7 +6,6 @@ import (
"testing"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/stretchr/testify/require"
)
pkg/services/live/managedstream/cache_redis.go
+2 -2
View File
@@ -7,10 +7,10 @@ import (
"sync"
"time"
"github.com/grafana/grafana/pkg/services/live/orgchannel"
"github.com/go-redis/redis/v8"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/services/live/orgchannel"
)
// RedisFrameCache ...
pkg/services/live/managedstream/runner.go
+4 -4
View File
@@ -8,14 +8,14 @@ import (
"sync"
"time"
"github.com/grafana/grafana/pkg/services/live/model"
"github.com/grafana/grafana/pkg/services/live/orgchannel"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana-plugin-sdk-go/live"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/live/model"
"github.com/grafana/grafana/pkg/services/live/orgchannel"
"github.com/grafana/grafana/pkg/services/user"
)
var (
pkg/services/live/pipeline/config.go
+1
View File
@@ -2,6 +2,7 @@ package pipeline
import (
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/services/org"
)
pkg/services/live/pipeline/data_output_builtin.go
+2 -2
View File
@@ -4,10 +4,10 @@ import (
"context"
"errors"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/services/live/livecontext"
"github.com/grafana/grafana/pkg/services/live/model"
"github.com/grafana/grafana-plugin-sdk-go/backend"
)
type BuiltinDataOutput struct {
pkg/services/live/pipeline/data_output_local_subscribers.go
+2 -2
View File
@@ -4,9 +4,9 @@ import (
"context"
"fmt"
"github.com/grafana/grafana/pkg/services/live/orgchannel"
"github.com/centrifugal/centrifuge"
"github.com/grafana/grafana/pkg/services/live/orgchannel"
)
type LocalSubscribersDataOutput struct {
pkg/services/live/pipeline/devdata.go
+2 -2
View File
@@ -10,10 +10,10 @@ import (
"os"
"time"
"github.com/grafana/grafana/pkg/services/live/managedstream"
"github.com/centrifugal/centrifuge"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/services/live/managedstream"
)
type Data struct {
pkg/services/live/pipeline/frame_output_local_subscribers.go
+2 -2
View File
@@ -5,10 +5,10 @@ import (
"encoding/json"
"fmt"
"github.com/grafana/grafana/pkg/services/live/orgchannel"
"github.com/centrifugal/centrifuge"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/services/live/orgchannel"
)
type LocalSubscribersFrameOutput struct {
pkg/services/live/pipeline/frame_output_managed_stream.go
+2 -2
View File
@@ -3,9 +3,9 @@ package pipeline
import (
"context"
"github.com/grafana/grafana/pkg/services/live/managedstream"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/services/live/managedstream"
)
type ManagedStreamFrameOutput struct {
pkg/services/live/pipeline/frame_output_remote_write.go
+2 -1
View File
@@ -10,8 +10,9 @@ import (
"time"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/services/live/remotewrite"
"github.com/prometheus/prometheus/prompb"
"github.com/grafana/grafana/pkg/services/live/remotewrite"
)
const flushInterval = 15 * time.Second
pkg/services/live/pipeline/frame_output_remote_write_test.go
+1 -2
View File
@@ -4,9 +4,8 @@ import (
"testing"
"time"
"github.com/stretchr/testify/require"
"github.com/prometheus/prometheus/prompb"
"github.com/stretchr/testify/require"
)
func TestRemoteWriteFrameOutput_sample(t *testing.T) {
pkg/services/live/pipeline/frame_storage.go
+2 -2
View File
@@ -3,9 +3,9 @@ package pipeline
import (
"sync"
"github.com/grafana/grafana/pkg/services/live/orgchannel"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/services/live/orgchannel"
)
// FrameStorage keeps last channel frame in memory. Not usable in HA setup.
pkg/services/live/pipeline/pipeline.go
+3 -3
View File
@@ -6,9 +6,6 @@ import (
"fmt"
"os"
"github.com/grafana/grafana/pkg/services/live/model"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana-plugin-sdk-go/live"
@@ -19,6 +16,9 @@ import (
tracesdk "go.opentelemetry.io/otel/sdk/trace"
semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
"go.opentelemetry.io/otel/trace"
"github.com/grafana/grafana/pkg/services/live/model"
"github.com/grafana/grafana/pkg/services/user"
)
const (
pkg/services/live/pipeline/pipeline_test.go
-1
View File
@@ -7,7 +7,6 @@ import (
"testing"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/stretchr/testify/require"
)
pkg/services/live/pipeline/rule_builder_storage.go
+1
View File
@@ -5,6 +5,7 @@ import (
"fmt"
"github.com/centrifugal/centrifuge"
"github.com/grafana/grafana/pkg/services/live/managedstream"
"github.com/grafana/grafana/pkg/services/secrets"
)
pkg/services/live/pipeline/subscribe_builtin.go
+3 -3
View File
@@ -3,12 +3,12 @@ package pipeline
import (
"context"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/live"
"github.com/grafana/grafana/pkg/services/live/livecontext"
"github.com/grafana/grafana/pkg/services/live/model"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/live"
)
type BuiltinSubscriber struct {
pkg/services/live/pipeline/subscribe_managed_stream.go
+2 -2
View File
@@ -3,11 +3,11 @@ package pipeline
import (
"context"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/services/live/livecontext"
"github.com/grafana/grafana/pkg/services/live/managedstream"
"github.com/grafana/grafana/pkg/services/live/model"
"github.com/grafana/grafana-plugin-sdk-go/backend"
)
type ManagedStreamSubscriber struct {
pkg/services/live/pipeline/subscribe_multiple.go
+1
View File
@@ -4,6 +4,7 @@ import (
"context"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/services/live/model"
)
pkg/services/live/pushhttp/push.go
+2 -2
View File
@@ -6,14 +6,14 @@ import (
"io"
"net/http"
liveDto "github.com/grafana/grafana-plugin-sdk-go/live"
"github.com/grafana/grafana/pkg/infra/log"
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
"github.com/grafana/grafana/pkg/services/live"
"github.com/grafana/grafana/pkg/services/live/convert"
"github.com/grafana/grafana/pkg/services/live/pushurl"
"github.com/grafana/grafana/pkg/setting"
liveDto "github.com/grafana/grafana-plugin-sdk-go/live"
"github.com/grafana/grafana/pkg/web"
)
pkg/services/live/pushws/push_pipeline.go
+2 -2
View File
@@ -3,11 +3,11 @@ package pushws
import (
"net/http"
"github.com/gorilla/websocket"
"github.com/grafana/grafana/pkg/services/live/convert"
"github.com/grafana/grafana/pkg/services/live/livecontext"
"github.com/grafana/grafana/pkg/services/live/pipeline"
"github.com/gorilla/websocket"
)
// PipelinePushHandler handles WebSocket client connections that push data to Live Pipeline.
pkg/services/live/pushws/push_stream.go
+3 -3
View File
@@ -3,13 +3,13 @@ package pushws
import (
"net/http"
"github.com/gorilla/websocket"
liveDto "github.com/grafana/grafana-plugin-sdk-go/live"
"github.com/grafana/grafana/pkg/services/live/convert"
"github.com/grafana/grafana/pkg/services/live/livecontext"
"github.com/grafana/grafana/pkg/services/live/managedstream"
"github.com/grafana/grafana/pkg/services/live/pushurl"
"github.com/gorilla/websocket"
liveDto "github.com/grafana/grafana-plugin-sdk-go/live"
)
// Handler handles WebSocket client connections that push data to Live.
pkg/services/live/runstream/manager.go
+2 -2
View File
@@ -8,10 +8,10 @@ import (
"sync"
"time"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana-plugin-sdk-go/backend"
)
var (
pkg/services/live/runstream/manager_test.go
+2 -1
View File
@@ -8,8 +8,9 @@ import (
"github.com/golang/mock/gomock"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/services/user"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/services/user"
)
// wait until channel closed with timeout.
pkg/services/live/runstream/mock.go
+1
View File
@@ -10,6 +10,7 @@ import (
gomock "github.com/golang/mock/gomock"
backend "github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/services/user"
)
pkg/services/live/survey/survey.go
+1
View File
@@ -10,6 +10,7 @@ import (
"time"
"github.com/centrifugal/centrifuge"
"github.com/grafana/grafana/pkg/services/live/managedstream"
)
pkg/services/live/telemetry/telegraf/convert.go
+2 -1
View File
@@ -7,9 +7,10 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana-plugin-sdk-go/data/converters"
influx "github.com/influxdata/line-protocol"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/live/telemetry"
influx "github.com/influxdata/line-protocol"
)
var (
pkg/services/querylibrary/tests/common.go
+2 -1
View File
@@ -4,6 +4,8 @@ import (
"fmt"
"testing"
"github.com/stretchr/testify/require"
apikeygenprefix "github.com/grafana/grafana/pkg/components/apikeygenprefixed"
"github.com/grafana/grafana/pkg/server"
"github.com/grafana/grafana/pkg/services/featuremgmt"
@@ -12,7 +14,6 @@ import (
saTests "github.com/grafana/grafana/pkg/services/serviceaccounts/tests"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/tests/testinfra"
"github.com/stretchr/testify/require"
)
func createServiceAccountAdminToken(t *testing.T, name string, env *server.TestEnv) (string, *user.SignedInUser) {
pkg/services/searchV2/allowed_actions.go
+1
View File
@@ -9,6 +9,7 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/datasources"
pkg/services/searchV2/http.go
+2 -1
View File
@@ -7,11 +7,12 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/prometheus/client_golang/prometheus"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/middleware"
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
"github.com/prometheus/client_golang/prometheus"
)
type SearchHTTPService interface {
pkg/services/searchV2/index_test.go
+3 -4
View File
@@ -6,8 +6,11 @@ import (
"path/filepath"
"testing"
"github.com/blugelabs/bluge"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana-plugin-sdk-go/experimental"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/tracing"
@@ -15,10 +18,6 @@ import (
"github.com/grafana/grafana/pkg/services/store"
"github.com/grafana/grafana/pkg/services/store/entity"
"github.com/grafana/grafana/pkg/setting"
"github.com/blugelabs/bluge"
"github.com/grafana/grafana-plugin-sdk-go/experimental"
"github.com/stretchr/testify/require"
)
type testDashboardLoader struct {
pkg/services/searchV2/queries.go
+1
View File
@@ -6,6 +6,7 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/services/querylibrary"
"github.com/grafana/grafana/pkg/services/user"
)
pkg/services/searchV2/search_service_mock.go
-1
View File
@@ -6,7 +6,6 @@ import (
context "context"
backend "github.com/grafana/grafana-plugin-sdk-go/backend"
mock "github.com/stretchr/testify/mock"
user "github.com/grafana/grafana/pkg/services/user"
pkg/services/searchV2/service.go
+1 -2
View File
@@ -10,8 +10,6 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
"github.com/grafana/grafana/pkg/services/querylibrary"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/tracing"
@@ -19,6 +17,7 @@ import (
"github.com/grafana/grafana/pkg/services/accesscontrol"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/querylibrary"
"github.com/grafana/grafana/pkg/services/store"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/setting"
pkg/services/searchV2/service_bench_test.go
+2 -2
View File
@@ -6,6 +6,8 @@ import (
"testing"
"time"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/services/accesscontrol/actest"
@@ -18,8 +20,6 @@ import (
"github.com/grafana/grafana/pkg/services/store"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/setting"
"github.com/stretchr/testify/require"
)
// setupBenchEnv will set up a database with folderCount folders and dashboardsPerFolder dashboards per folder
pkg/services/searchV2/stub.go
+1
View File
@@ -5,6 +5,7 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/services/user"
)
pkg/services/searchV2/types.go
+2 -2
View File
@@ -3,10 +3,10 @@ package searchV2
import (
"context"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana-plugin-sdk-go/backend"
)
type FacetField struct {
pkg/services/searchV2/usage.go
+3 -2
View File
@@ -6,10 +6,11 @@ import (
"github.com/blugelabs/bluge"
"github.com/blugelabs/bluge/search"
"github.com/blugelabs/bluge/search/aggregations"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/tracing"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/tracing"
)
type usageGauge struct {
pkg/services/store/entity/entity.pb.go
+3 -2
View File
@@ -7,10 +7,11 @@
package entity
import (
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
sync "sync"
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
)
const (
pkg/services/store/entity/entity_grpc.pb.go
+1
View File
@@ -8,6 +8,7 @@ package entity
import (
context "context"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
pkg/services/store/entity/httpentitystore/service.go
+2 -3
View File
@@ -8,6 +8,8 @@ import (
"strconv"
"strings"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/middleware"
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
@@ -15,9 +17,6 @@ import (
"github.com/grafana/grafana/pkg/services/store/kind"
"github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/web"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/api/routing"
)
type HTTPEntityStore interface {
pkg/services/store/entity/tests/common.go
+4 -3
View File
@@ -4,6 +4,10 @@ import (
"context"
"testing"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
apikeygenprefix "github.com/grafana/grafana/pkg/components/apikeygenprefixed"
"github.com/grafana/grafana/pkg/infra/appcontext"
"github.com/grafana/grafana/pkg/server"
@@ -14,9 +18,6 @@ import (
"github.com/grafana/grafana/pkg/services/store/entity"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/tests/testinfra"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)
func createServiceAccountAdminToken(t *testing.T, env *server.TestEnv) (string, *user.SignedInUser) {
pkg/services/store/k8saccess/client.go
+3 -2
View File
@@ -4,11 +4,12 @@ import (
"net/http"
"net/url"
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
"github.com/grafana/grafana/pkg/web"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
"github.com/grafana/grafana/pkg/web"
)
type clientWrapper struct {
pkg/services/store/k8saccess/service.go
+4 -3
View File
@@ -4,12 +4,13 @@ import (
"os"
"path/filepath"
"github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/registry"
"github.com/grafana/grafana/pkg/services/featuremgmt"
)
type K8SAccess interface {
pkg/services/store/kind/playlist/summary_test.go
+2 -1
View File
@@ -5,8 +5,9 @@ import (
"encoding/json"
"testing"
"github.com/grafana/grafana/pkg/kinds/playlist"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/kinds/playlist"
)
func TestPlaylistSummary(t *testing.T) {
pkg/services/store/storage_disk.go
+2 -1
View File
@@ -5,8 +5,9 @@ import (
"strings"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/infra/filestorage"
"gocloud.dev/blob"
"github.com/grafana/grafana/pkg/infra/filestorage"
)
const rootStorageTypeDisk = "disk"
pkg/services/store/storage_git.go
+2 -2
View File
@@ -11,12 +11,12 @@ import (
"github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing/object"
"github.com/grafana/grafana-plugin-sdk-go/data"
"gocloud.dev/blob"
"github.com/grafana/grafana/pkg/infra/filestorage"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/setting"
"gocloud.dev/blob"
)
const rootStorageTypeGit = "git"
pkg/services/store/storage_sql.go
+2 -2
View File
@@ -5,10 +5,10 @@ import (
"fmt"
"strings"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/filestorage"
"github.com/grafana/grafana-plugin-sdk-go/data"
)
const rootStorageTypeSQL = "sql"
pkg/services/store/system_users_mock.go
+1 -1
View File
@@ -3,9 +3,9 @@
package store
import (
filestorage "github.com/grafana/grafana/pkg/infra/filestorage"
mock "github.com/stretchr/testify/mock"
filestorage "github.com/grafana/grafana/pkg/infra/filestorage"
user "github.com/grafana/grafana/pkg/services/user"
)
pkg/services/store/system_users_test.go
+2 -1
View File
@@ -3,9 +3,10 @@ package store
import (
"testing"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/infra/filestorage"
"github.com/grafana/grafana/pkg/services/user"
"github.com/stretchr/testify/require"
)
const admin SystemUserType = "storageAdmin"
pkg/services/store/tree.go
+1
View File
@@ -6,6 +6,7 @@ import (
"sync"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/infra/filestorage"
ac "github.com/grafana/grafana/pkg/services/accesscontrol"
)
pkg/services/store/types.go
+1
View File
@@ -5,6 +5,7 @@ import (
"encoding/json"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/infra/filestorage"
"github.com/grafana/grafana/pkg/services/user"
)
pkg/services/thumbs/crawler.go
+1 -1
View File
@@ -10,7 +10,6 @@ import (
"sync"
"time"
"github.com/grafana/grafana/pkg/setting"
"golang.org/x/sync/errgroup"
"github.com/grafana/grafana/pkg/infra/log"
@@ -18,6 +17,7 @@ import (
"github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/live"
"github.com/grafana/grafana/pkg/services/rendering"
"github.com/grafana/grafana/pkg/setting"
)
type simpleCrawler struct {
pkg/services/thumbs/datasources_lookup.go
+1
View File
@@ -7,6 +7,7 @@ import (
"fmt"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/searchV2"
"github.com/grafana/grafana/pkg/tsdb/grafanads"
pkg/services/thumbs/datasources_lookup_test.go
+3 -2
View File
@@ -7,10 +7,11 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/searchV2"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/searchV2"
)
var (