Merge remote-tracking branch 'origin/main' into grafana-git-ui-sync

pkg/tests/apis/folder/folders_test.go

@@ -1131,8 +1131,8 @@ func TestFoldersGetAPIEndpointK8S(t *testing.T) {
 			},
 			expectedCode: http.StatusOK,
 			expectedOutput: []dtos.FolderSearchHit{
-				dtos.FolderSearchHit{UID: "foo", Title: "Folder 1"},
-				dtos.FolderSearchHit{UID: "qux", Title: "Folder 3"},
+				{UID: "foo", Title: "Folder 1"},
+				{UID: "qux", Title: "Folder 3"},
 			},
 			permissions: folderReadAndCreatePermission,
 		},
@@ -1146,7 +1146,7 @@ func TestFoldersGetAPIEndpointK8S(t *testing.T) {
 			params:       "?parentUid=foo",
 			expectedCode: http.StatusOK,
 			expectedOutput: []dtos.FolderSearchHit{
-				dtos.FolderSearchHit{UID: "bar", Title: "Folder 2", ParentUID: "foo"},
+				{UID: "bar", Title: "Folder 2", ParentUID: "foo"},
 			},
 			permissions: folderReadAndCreatePermission,
 		},

pkg/tests/apis/scopes/scopes_test.go

@@ -28,9 +28,9 @@ func TestIntegrationScopes(t *testing.T) {
 
 	ctx := context.Background()
 	helper := apis.NewK8sTestHelper(t, testinfra.GrafanaOpts{
-		AppModeProduction: false, // required for experimental APIs
+		AppModeProduction: true,
 		EnableFeatureToggles: []string{
-			featuremgmt.FlagGrafanaAPIServerWithExperimentalAPIs, // Required to start the example service
+			featuremgmt.FlagScopeApi, // Required to register the API
 		},
 	})