minor lint fixes

pkg/registry/apis/dashboard/legacy/sql_dashboards.go

@@ -115,7 +115,7 @@ func (a *dashboardSqlAccess) getRows(ctx context.Context, query *DashboardQuery)
 		// }
 	}
 
-	sqlcmd := selector
+	var sqlcmd string
 	args := []any{query.OrgID}
 
 	limit := query.Limit

pkg/services/apiserver/options/storage.go

@@ -49,7 +49,7 @@ func (o *StorageOptions) Validate() []error {
 	case StorageTypeFile, StorageTypeEtcd, StorageTypeLegacy, StorageTypeUnified, StorageTypeUnifiedGrpc, StorageTypeUnifiedNext, StorageTypeUnifiedNextGrpc:
 		// no-op
 	default:
-		errs = append(errs, fmt.Errorf("--grafana-apiserver-storage-type must be one of %s, %s, %s, %s, %s, %s", StorageTypeFile, StorageTypeEtcd, StorageTypeLegacy, StorageTypeUnified, StorageTypeUnifiedGrpc, StorageTypeUnifiedNext, StorageTypeUnifiedNextGrpc))
+		errs = append(errs, fmt.Errorf("--grafana-apiserver-storage-type must be one of %s, %s, %s, %s, %s, %s, %s", StorageTypeFile, StorageTypeEtcd, StorageTypeLegacy, StorageTypeUnified, StorageTypeUnifiedGrpc, StorageTypeUnifiedNext, StorageTypeUnifiedNextGrpc))
 	}
 
 	if _, _, err := net.SplitHostPort(o.Address); err != nil {

pkg/tests/apis/dashboard/dashboards_test.go

@@ -1,6 +1,7 @@
 package dashboards
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -47,58 +48,59 @@ func TestIntegrationDashboardsApp(t *testing.T) {
 
 	t.Run("Check discovery client", func(t *testing.T) {
 		disco := helper.GetGroupVersionInfoJSON("dashboard.grafana.app")
-		//fmt.Printf("%s", string(disco))
+		fmt.Printf("%s", string(disco))
 
 		require.JSONEq(t, `[
-			{
-				"freshness": "Current",
-				"resources": [
-				{
-					"resource": "dashboards",
-					"responseKind": {
-					"group": "",
-					"kind": "Dashboard",
-					"version": ""
-					},
-					"scope": "Namespaced",
-					"singularResource": "dashboard",
-					"subresources": [
-					{
-						"responseKind": {
-						"group": "",
-						"kind": "DashboardWithAccessInfo",
-						"version": ""
-						},
-						"subresource": "dto",
-						"verbs": [
-						"get"
-						]
-					},
-					{
-						"responseKind": {
-						"group": "",
-						"kind": "DashboardVersionList",
-						"version": ""
-						},
-						"subresource": "versions",
-						"verbs": [
-						"get"
-						]
-					}
-					],
-					"verbs": [
-					"create",
-					"delete",
-					"deletecollection",
-					"get",
-					"list",
-					"patch",
-					"update"
-					]
-				}
-				],
-				"version": "v0alpha1"
-			}
-			]`, disco)
+  {
+    "freshness": "Current",
+    "resources": [
+      {
+        "resource": "dashboards",
+        "responseKind": {
+          "group": "",
+          "kind": "Dashboard",
+          "version": ""
+        },
+        "scope": "Namespaced",
+        "singularResource": "dashboard",
+        "subresources": [
+          {
+            "responseKind": {
+              "group": "",
+              "kind": "DashboardWithAccessInfo",
+              "version": ""
+            },
+            "subresource": "dto",
+            "verbs": [
+              "get"
+            ]
+          },
+          {
+            "responseKind": {
+              "group": "",
+              "kind": "PartialObjectMetadataList",
+              "version": ""
+            },
+            "subresource": "history",
+            "verbs": [
+              "get"
+            ]
+          }
+        ],
+        "verbs": [
+          "create",
+          "delete",
+          "deletecollection",
+          "get",
+          "list",
+          "patch",
+          "update",
+          "watch"
+        ]
+      }
+    ],
+    "version": "v0alpha1"
+  }
+]`, disco)
 	})
 }