Dashboards: Fix lint issue (#104497)

pkg/registry/apis/dashboard/register.go

@@ -28,7 +28,6 @@ import (
 	dashboardv2alpha1 "github.com/grafana/grafana/pkg/apis/dashboard/v2alpha1"
 	grafanaregistry "github.com/grafana/grafana/pkg/apiserver/registry/generic"
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/apiserver/builder"
@@ -51,8 +50,7 @@ var (
 
 // This is used just so wire has something unique to return
 type DashboardsAPIBuilder struct {
-	dashboardService dashboards.DashboardService
+	features featuremgmt.FeatureToggles
-	features         featuremgmt.FeatureToggles
 
 	accessControl                accesscontrol.AccessControl
 	legacy                       *DashboardStorage
@@ -61,7 +59,6 @@ type DashboardsAPIBuilder struct {
 	scheme                       *runtime.Scheme
 	search                       *SearchHandler
 
-	log log.Logger
 	reg prometheus.Registerer
 }
 
@@ -69,7 +66,6 @@ func RegisterAPIService(
 	cfg *setting.Cfg,
 	features featuremgmt.FeatureToggles,
 	apiregistration builder.APIRegistrar,
-	dashboardService dashboards.DashboardService,
 	provisioningDashboardService dashboards.DashboardProvisioningService,
 	accessControl accesscontrol.AccessControl,
 	provisioning provisioning.ProvisioningService,

pkg/tests/apis/dashboard/dashboards_test.go

@@ -28,6 +28,7 @@ func TestMain(m *testing.M) {
 }
 
 func runDashboardTest(t *testing.T, helper *apis.K8sTestHelper, gvr schema.GroupVersionResource) {
+	t.Skip("dashboard apis are currently disabled")
 	t.Run("simple crud+list", func(t *testing.T) {
 		ctx := context.Background()
 		client := helper.GetResourceClient(apis.ResourceClientArgs{
@@ -109,6 +110,7 @@ func runDashboardTest(t *testing.T, helper *apis.K8sTestHelper, gvr schema.Group
 }
 
 func TestIntegrationDashboardsAppV0Alpha1(t *testing.T) {
+	t.Skip("dashboard apis are currently disabled")
 	gvr := schema.GroupVersionResource{
 		Group:    "dashboard.grafana.app",
 		Version:  "v0alpha1",
@@ -253,6 +255,7 @@ func TestIntegrationDashboardsAppV1Alpha1(t *testing.T) {
 }
 
 func TestIntegrationLegacySupport(t *testing.T) {
+	t.Skip("dashboard apis are currently disabled")
 	ctx := context.Background()
 	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
 		EnableFeatureToggles: []string{

pkg/tests/apis/folder/folders_test.go

@@ -46,6 +46,7 @@ func TestIntegrationFoldersApp(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	t.Skip("api is currently disabled")
 	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
 		AppModeProduction: true,
 		EnableFeatureToggles: []string{
@@ -492,6 +493,7 @@ func TestIntegrationFolderCreatePermissions(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	t.Skip("api is currently disabled")
 	t.Skip("not working yet")
 
 	folderWithoutParentInput := "{ \"uid\": \"uid\", \"title\": \"Folder\"}"
@@ -617,6 +619,7 @@ func TestIntegrationFolderGetPermissions(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	t.Skip("api is currently disabled")
 	t.Skip("not yet working")
 
 	type testCase struct {
@@ -768,6 +771,7 @@ func TestFoldersCreateAPIEndpointK8S(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	t.Skip("api is currently disabled")
 
 	folderWithoutParentInput := "{ \"uid\": \"uid\", \"title\": \"Folder\"}"
 	folderWithTitleEmpty := "{ \"title\": \"\"}"
@@ -929,6 +933,7 @@ func TestFoldersGetAPIEndpointK8S(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}
+	t.Skip("api is currently disabled")
 
 	type testCase struct {
 		description         string

pkg/tests/apis/openapi_test.go

@@ -28,8 +28,7 @@ func TestIntegrationOpenAPIs(t *testing.T) {
 	h := NewK8sTestHelper(t, testinfra.GrafanaOpts{
 		AppModeProduction: true,
 		EnableFeatureToggles: []string{
-			featuremgmt.FlagKubernetesClientDashboardsFolders, // Will be default on by G12
+			featuremgmt.FlagQueryService, // Query Library
-			featuremgmt.FlagQueryService,                      // Query Library
 			featuremgmt.FlagProvisioning,
 			featuremgmt.FlagInvestigationsBackend,
 		},
@@ -60,12 +59,6 @@ func TestIntegrationOpenAPIs(t *testing.T) {
 	dir := "openapi_snapshots"
 
 	var groups = []schema.GroupVersion{{
-		Group:   "dashboard.grafana.app",
-		Version: "v0alpha1",
-	}, {
-		Group:   "folder.grafana.app",
-		Version: "v0alpha1",
-	}, {
 		Group:   "iam.grafana.app",
 		Version: "v0alpha1",
 	}, {

pkg/tests/apis/provisioning/provisioning_test.go

@@ -25,6 +25,7 @@ func TestMain(m *testing.M) {
 }
 
 func TestIntegrationProvisioning(t *testing.T) {
+	t.Skip("dashboard and folder apis are currently disabled")
 	if testing.Short() {
 		t.Skip("skipping integration test")
 	}