API: Add by UID routes for data sources (#29884)
- also add Get by UID+OrgID to datasource cache - Refactor backend commands for Delete and Get to be unified
This commit is contained in:
@@ -12,6 +12,7 @@ import (
|
||||
|
||||
type CacheService interface {
|
||||
GetDatasource(datasourceID int64, user *models.SignedInUser, skipCache bool) (*models.DataSource, error)
|
||||
GetDatasourceByUID(datasourceUID string, user *models.SignedInUser, skipCache bool) (*models.DataSource, error)
|
||||
}
|
||||
|
||||
type CacheServiceImpl struct {
|
||||
@@ -36,7 +37,7 @@ func (dc *CacheServiceImpl) GetDatasource(
|
||||
user *models.SignedInUser,
|
||||
skipCache bool,
|
||||
) (*models.DataSource, error) {
|
||||
cacheKey := fmt.Sprintf("ds-%d", datasourceID)
|
||||
cacheKey := idKey(datasourceID)
|
||||
|
||||
if !skipCache {
|
||||
if cached, found := dc.CacheService.Get(cacheKey); found {
|
||||
@@ -48,11 +49,55 @@ func (dc *CacheServiceImpl) GetDatasource(
|
||||
}
|
||||
|
||||
plog.Debug("Querying for data source via SQL store", "id", datasourceID, "orgId", user.OrgId)
|
||||
ds, err := dc.SQLStore.GetDataSourceByID(datasourceID, user.OrgId)
|
||||
ds, err := dc.SQLStore.GetDataSource("", datasourceID, "", user.OrgId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if ds.Uid != "" {
|
||||
dc.CacheService.Set(uidKey(ds.OrgId, ds.Uid), ds, time.Second*5)
|
||||
}
|
||||
dc.CacheService.Set(cacheKey, ds, time.Second*5)
|
||||
return ds, nil
|
||||
}
|
||||
|
||||
func (dc *CacheServiceImpl) GetDatasourceByUID(
|
||||
datasourceUID string,
|
||||
user *models.SignedInUser,
|
||||
skipCache bool,
|
||||
) (*models.DataSource, error) {
|
||||
if datasourceUID == "" {
|
||||
return nil, fmt.Errorf("can not get data source by uid, uid is empty")
|
||||
}
|
||||
if user.OrgId == 0 {
|
||||
return nil, fmt.Errorf("can not get data source by uid, orgId is missing")
|
||||
}
|
||||
uidCacheKey := uidKey(user.OrgId, datasourceUID)
|
||||
|
||||
if !skipCache {
|
||||
if cached, found := dc.CacheService.Get(uidCacheKey); found {
|
||||
ds := cached.(*models.DataSource)
|
||||
if ds.OrgId == user.OrgId {
|
||||
return ds, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
plog.Debug("Querying for data source via SQL store", "uid", datasourceUID, "orgId", user.OrgId)
|
||||
ds, err := dc.SQLStore.GetDataSource(datasourceUID, 0, "", user.OrgId)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
dc.CacheService.Set(uidCacheKey, ds, time.Second*5)
|
||||
dc.CacheService.Set(idKey(ds.Id), ds, time.Second*5)
|
||||
return ds, nil
|
||||
}
|
||||
|
||||
func idKey(id int64) string {
|
||||
return fmt.Sprintf("ds-%d", id)
|
||||
}
|
||||
|
||||
func uidKey(orgID int64, uid string) string {
|
||||
return fmt.Sprintf("ds-orgid-uid-%d-%s", orgID, uid)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user