Chore: get user from appcontext rather than store utility (#59926)

user from appcontext

pkg/services/export/commit_helper.go

@@ -13,8 +13,8 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	jsoniter "github.com/json-iterator/go"
 
+	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/db"
-	"github.com/grafana/grafana/pkg/services/store"
 	"github.com/grafana/grafana/pkg/services/user"
 )
 
@@ -77,7 +77,7 @@ func (ch *commitHelper) initOrg(ctx context.Context, sql db.DB, orgID int64) err
 			OrgID:  orgID, // gets filled in from each row
 			UserID: 0,
 		}
-		ch.ctx = store.ContextWithUser(context.Background(), rowUser)
+		ch.ctx = appcontext.WithUser(context.Background(), rowUser)
 		return err
 	})
 }

pkg/services/export/entity_store.go

@@ -6,13 +6,13 @@ import (
 	"sync"
 	"time"
 
+	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
 	"github.com/grafana/grafana/pkg/services/playlist"
 	"github.com/grafana/grafana/pkg/services/sqlstore/session"
-	"github.com/grafana/grafana/pkg/services/store"
 	"github.com/grafana/grafana/pkg/services/store/entity"
 	"github.com/grafana/grafana/pkg/services/store/kind/snapshot"
 	"github.com/grafana/grafana/pkg/services/user"
@@ -101,7 +101,7 @@ func (e *entityStoreJob) start(ctx context.Context) {
 		OrgID:  0, // gets filled in from each row
 		UserID: 0,
 	}
-	ctx = store.ContextWithUser(ctx, rowUser)
+	ctx = appcontext.WithUser(ctx, rowUser)
 
 	what := models.StandardKindDashboard
 	e.status.Count[what] = 0

pkg/services/export/service.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/infra/appcontext"
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
@@ -20,7 +21,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/live"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/playlist"
-	"github.com/grafana/grafana/pkg/services/store"
 	"github.com/grafana/grafana/pkg/services/store/entity"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -225,7 +225,7 @@ func (ex *StandardExport) HandleRequestExport(c *models.ReqContext) response.Res
 		return response.Error(http.StatusLocked, "export already running", nil)
 	}
 
-	ctx := store.ContextWithUser(context.Background(), c.SignedInUser)
+	ctx := appcontext.WithUser(context.Background(), c.SignedInUser)
 	var job Job
 	broadcast := func(s ExportStatus) {
 		ex.broadcastStatus(c.OrgID, s)