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

pkg/api/folder_test.go

@@ -539,6 +539,7 @@ func (m mockClientConfigProvider) DirectlyServeHTTP(w http.ResponseWriter, r *ht
 
 func TestUpdateFolderLegacyAndUnifiedStorage(t *testing.T) {
 	testuser := &user.User{ID: 99, UID: "fdxsqt7t5ryf4a", Login: "testuser"}
+	testSignedInUser := &user.SignedInUser{UserID: 99, UserUID: "fdxsqt7t5ryf4a", Login: "testuser"}
 
 	legacyFolder := folder.Folder{
 		UID:          "ady4yobv315a8e",
@@ -723,7 +724,8 @@ func TestUpdateFolderLegacyAndUnifiedStorage(t *testing.T) {
 						ExpectedResult: model.HitList{},
 					}
 					hs.userService = &usertest.FakeUserService{
-						ExpectedUser: testuser,
+						ExpectedUser:         testuser,
+						ExpectedSignedInUser: testSignedInUser,
 					}
 					hs.Features = featuremgmt.WithFeatures(
 						featuresArr...,