Fix linting

.golangci.toml

@@ -78,6 +78,7 @@ allow = [
   "github.com/grafana/grafana/pkg/services/apiserver/utils",
   "github.com/grafana/grafana/pkg/services/featuremgmt",
   "github.com/grafana/grafana/pkg/infra/kvstore",
+  "github.com/grafana/grafana/pkg/services/apiserver/options",
 ]
 deny = [
   { pkg = "github.com/grafana/grafana/pkg", desc = "apiserver is not allowed to import grafana core" }

pkg/apiserver/rest/dualwriter_test.go

@@ -6,32 +6,31 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/infra/kvstore"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )
 
 func TestSetDualWritingMode(t *testing.T) {
 	type testCase struct {
 		name         string
-		features     []any
 		stackID      string
+		desiredMode  DualWriterMode
 		expectedMode DualWriterMode
 	}
 	tests :=
 		// #TODO add test cases for kv store failures. Requires adding support in kvstore test_utils.go
 		[]testCase{
 			{
-				name:         "should return a mode 1 dual writer when no desired mode is set",
-				features:     []any{},
+				name:         "should return a mode 2 dual writer when mode 2 is set as the desired mode",
 				stackID:      "stack-1",
-				expectedMode: Mode1,
+				desiredMode:  Mode2,
+				expectedMode: Mode2,
 			},
 			{
-				name:         "should return a mode 2 dual writer when mode 2 is set as the desired mode",
-				features:     []any{featuremgmt.FlagDualWritePlaylistsMode2},
+				name:         "should return a mode 1 dual writer when mode 1 is set as the desired mode",
 				stackID:      "stack-1",
-				expectedMode: Mode2,
+				desiredMode:  Mode1,
+				expectedMode: Mode1,
 			},
 		}
 
@@ -43,12 +42,11 @@ func TestSetDualWritingMode(t *testing.T) {
 		ls := legacyStoreMock{m, l}
 		us := storageMock{m, s}
 
-		f := featuremgmt.WithFeatures(tt.features...)
 		kvStore := kvstore.WithNamespace(kvstore.NewFakeKVStore(), 0, "storage.dualwriting."+tt.stackID)
 
 		key := "playlist"
 
-		dw, err := SetDualWritingMode(context.Background(), kvStore, f, key, ls, us)
+		dw, err := SetDualWritingMode(context.Background(), kvStore, ls, us, key, tt.desiredMode)
 		assert.NoError(t, err)
 		assert.Equal(t, tt.expectedMode, dw.Mode())
 

pkg/cmd/grafana/apiserver/server.go

@@ -162,7 +162,8 @@ func (o *APIServerOptions) RunAPIServer(config *genericapiserver.RecommendedConf
 	}
 
 	// Install the API Group+version
-	err = builder.InstallAPIs(grafanaAPIServer.Scheme, grafanaAPIServer.Codecs, server, config.RESTOptionsGetter, o.builders, true)
+	// #TODO figure out how to configure storage type in o.Options.StorageOptions
+	err = builder.InstallAPIs(grafanaAPIServer.Scheme, grafanaAPIServer.Codecs, server, config.RESTOptionsGetter, o.builders, o.Options.StorageOptions)
 	if err != nil {
 		return err
 	}

pkg/services/apiserver/aggregator/aggregator.go

@@ -47,6 +47,7 @@ import (
 	"k8s.io/kube-aggregator/pkg/controllers/autoregister"
 
 	"github.com/grafana/grafana/pkg/apiserver/builder"
+	grafanarest "github.com/grafana/grafana/pkg/apiserver/rest"
 	servicev0alpha1applyconfiguration "github.com/grafana/grafana/pkg/generated/applyconfiguration/service/v0alpha1"
 	serviceclientset "github.com/grafana/grafana/pkg/generated/clientset/versioned"
 	informersv0alpha1 "github.com/grafana/grafana/pkg/generated/informers/externalversions"
@@ -284,7 +285,7 @@ func CreateAggregatorServer(config *Config, delegateAPIServer genericapiserver.D
 	})
 
 	for _, b := range config.Builders {
-		serviceAPIGroupInfo, err := b.GetAPIGroupInfo(aggregatorscheme.Scheme, aggregatorscheme.Codecs, aggregatorConfig.GenericConfig.RESTOptionsGetter, false)
+		serviceAPIGroupInfo, err := b.GetAPIGroupInfo(aggregatorscheme.Scheme, aggregatorscheme.Codecs, aggregatorConfig.GenericConfig.RESTOptionsGetter, grafanarest.Mode0)
 		if err != nil {
 			return nil, err
 		}

pkg/services/apiserver/standalone/options/options.go

@@ -16,6 +16,7 @@ type Options struct {
 	TracingOptions     *TracingOptions
 	MetricsOptions     *MetricsOptions
 	ServerRunOptions   *genericoptions.ServerRunOptions
+	StorageOptions     *options.StorageOptions
 }
 
 func New(logger log.Logger, codec runtime.Codec) *Options {
@@ -26,6 +27,7 @@ func New(logger log.Logger, codec runtime.Codec) *Options {
 		TracingOptions:     NewTracingOptions(logger),
 		MetricsOptions:     NewMetrcicsOptions(logger),
 		ServerRunOptions:   genericoptions.NewServerRunOptions(),
+		StorageOptions:     options.NewStorageOptions(),
 	}
 }