public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preferences: Support Create+Update+Delete over apiserver (#111715)

Browse Source
This commit is contained in:
Ryan McKinley
2025-10-02 21:58:08 +03:00
committed by GitHub
parent 5a5aac1d6b
commit 0af6efb096
20 changed files with 969 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/preferences/legacy/sql.go
+23 -5
View File
@@ -49,7 +49,7 @@ func NewLegacySQL(db legacysql.LegacyDatabaseProvider) *LegacySQL {
}
// NOTE: this does not support paging -- lets check if that will be a problem in cloud
func (s *LegacySQL) GetStars(ctx context.Context, orgId int64, user string) ([]dashboardStars, int64, error) {
func (s *LegacySQL) getDashboardStars(ctx context.Context, orgId int64, user string) ([]dashboardStars, int64, error) {
var max sql.NullString
sql, err := s.db(ctx)
if err != nil {
@@ -120,7 +120,10 @@ func (s *LegacySQL) GetStars(ctx context.Context, orgId int64, user string) ([]d
return nil, 0, fmt.Errorf("unable to get RV %w", err)
}
if max.Valid && max.String != "" {
fmt.Printf("max RV: %s\n", max.String)
t, _ := time.Parse(time.RFC3339, max.String)
if !t.IsZero() {
updated = t
}
} else {
updated = s.startup
}
@@ -206,7 +209,10 @@ func (s *LegacySQL) listPreferences(ctx context.Context,
return nil, 0, fmt.Errorf("unable to get RV %w", err)
}
if max.Valid && max.String != "" {
fmt.Printf("max RV: %s\n", max.String)
t, _ := time.Parse(time.RFC3339, max.String)
if !t.IsZero() {
rv.Time = t
}
} else {
rv.Time = s.startup
}
@@ -229,7 +235,7 @@ func (s *LegacySQL) ListPreferences(ctx context.Context, ns string, user identit
found, rv, err := s.listPreferences(ctx, ns, info.OrgID,
func(req *preferencesQuery) (bool, error) {
if user != nil {
req.UserUID = user.GetRawIdentifier()
req.UserUID = user.GetIdentifier()
teams, err = s.GetTeams(ctx, &identity.StaticRequester{
OrgID: info.OrgID,
UserUID: req.UserUID,
@@ -243,7 +249,7 @@ func (s *LegacySQL) ListPreferences(ctx context.Context, ns string, user identit
return true
}
if p.UserUID.String != "" {
return user.GetRawIdentifier() == p.UserUID.String
return user.GetIdentifier() == p.UserUID.String
}
if p.TeamUID.String != "" {
return slices.Contains(teams, p.TeamUID.String)
@@ -293,3 +299,15 @@ func (s *LegacySQL) GetTeams(ctx context.Context, id authlib.AuthInfo, admin boo
err = sess.Select(ctx, &teams, q, req.GetArgs()...)
return teams, err
}
func (s *LegacySQL) getLegacyTeamID(ctx context.Context, orgId int64, team string) (int64, error) {
sql, err := s.db(ctx)
if err != nil {
return 0, err
}
var id int64
sess := sql.DB.GetSqlxSession()
err = sess.Select(ctx, &id, "SELECT id FROM team WHERE org_id=? AND uid=?", orgId, team)
return id, err
}