Datasource: Fixes storing of secureJSONData when creating/updating datasource (#45290)

Fixes an issue introduced by #44987 where bus dispatch was replaced by calling sqlstore 
directly instead of the datasource service.

Fixes #45273

pkg/services/datasources/datasources.go

@@ -0,0 +1,62 @@
+package datasources
+
+import (
+	"context"
+	"net/http"
+
+	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana/pkg/infra/httpclient"
+	"github.com/grafana/grafana/pkg/models"
+)
+
+// DataSourceService interface for interacting with datasources.
+type DataSourceService interface {
+	// GetDataSource gets a datasource.
+	GetDataSource(ctx context.Context, query *models.GetDataSourceQuery) error
+
+	// GetDataSources gets datasources.
+	GetDataSources(ctx context.Context, query *models.GetDataSourcesQuery) error
+
+	// GetDataSourcesByType gets datasources by type.
+	GetDataSourcesByType(ctx context.Context, query *models.GetDataSourcesByTypeQuery) error
+
+	// AddDataSource adds a new datasource.
+	AddDataSource(ctx context.Context, cmd *models.AddDataSourceCommand) error
+
+	// DeleteDataSource deletes an existing datasource.
+	DeleteDataSource(ctx context.Context, cmd *models.DeleteDataSourceCommand) error
+
+	// UpdateDataSource updates an existing datasource.
+	UpdateDataSource(ctx context.Context, cmd *models.UpdateDataSourceCommand) error
+
+	// GetDefaultDataSource gets the default datasource.
+	GetDefaultDataSource(ctx context.Context, query *models.GetDefaultDataSourceQuery) error
+
+	// GetHTTPTransport gets a datasource specific HTTP transport.
+	GetHTTPTransport(ds *models.DataSource, provider httpclient.Provider, customMiddlewares ...sdkhttpclient.Middleware) (http.RoundTripper, error)
+
+	// DecryptedValues decrypts the encrypted secureJSONData of the provided datasource and
+	// returns the decrypted values.
+	DecryptedValues(ds *models.DataSource) map[string]string
+
+	// DecryptedValue decrypts the encrypted datasource secureJSONData identified by key
+	// and returns the decryped value.
+	DecryptedValue(ds *models.DataSource, key string) (string, bool)
+
+	// DecryptedBasicAuthPassword decrypts the encrypted datasource basic authentication
+	// password and returns the decryped value.
+	DecryptedBasicAuthPassword(ds *models.DataSource) string
+
+	// DecryptedPassword decrypts the encrypted datasource password and returns the
+	// decryped value.
+	DecryptedPassword(ds *models.DataSource) string
+}
+
+// CacheService interface for retrieving a cached datasource.
+type CacheService interface {
+	// GetDatasource gets a datasource identified by datasource numeric identifier.
+	GetDatasource(ctx context.Context, datasourceID int64, user *models.SignedInUser, skipCache bool) (*models.DataSource, error)
+
+	// GetDatasourceByUID gets a datasource identified by datasource unique identifier (UID).
+	GetDatasourceByUID(ctx context.Context, datasourceUID string, user *models.SignedInUser, skipCache bool) (*models.DataSource, error)
+}

pkg/services/datasources/log.go

@@ -1,9 +0,0 @@
-package datasources
-
-import (
-	"github.com/grafana/grafana/pkg/infra/log"
-)
-
-var (
-	plog = log.New("datasources")
-)

pkg/services/datasources/service/cache_service.go

@@ -1,4 +1,4 @@
-package datasources
+package service
 
 import (
 	"context"
@@ -6,23 +6,21 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/localcache"
+	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 )
 
 func ProvideCacheService(cacheService *localcache.CacheService, sqlStore *sqlstore.SQLStore) *CacheServiceImpl {
 	return &CacheServiceImpl{
+		logger:       log.New("datasources"),
 		CacheService: cacheService,
 		SQLStore:     sqlStore,
 	}
 }
 
-type CacheService interface {
-	GetDatasource(ctx context.Context, datasourceID int64, user *models.SignedInUser, skipCache bool) (*models.DataSource, error)
-	GetDatasourceByUID(ctx context.Context, datasourceUID string, user *models.SignedInUser, skipCache bool) (*models.DataSource, error)
-}
-
 type CacheServiceImpl struct {
+	logger       log.Logger
 	CacheService *localcache.CacheService
 	SQLStore     *sqlstore.SQLStore
 }
@@ -44,7 +42,7 @@ func (dc *CacheServiceImpl) GetDatasource(
 		}
 	}
 
-	plog.Debug("Querying for data source via SQL store", "id", datasourceID, "orgId", user.OrgId)
+	dc.logger.Debug("Querying for data source via SQL store", "id", datasourceID, "orgId", user.OrgId)
 
 	query := &models.GetDataSourceQuery{Id: datasourceID, OrgId: user.OrgId}
 	err := dc.SQLStore.GetDataSource(ctx, query)
@@ -84,7 +82,7 @@ func (dc *CacheServiceImpl) GetDatasourceByUID(
 		}
 	}
 
-	plog.Debug("Querying for data source via SQL store", "uid", datasourceUID, "orgId", user.OrgId)
+	dc.logger.Debug("Querying for data source via SQL store", "uid", datasourceUID, "orgId", user.OrgId)
 	query := &models.GetDataSourceQuery{Uid: datasourceUID, OrgId: user.OrgId}
 	err := dc.SQLStore.GetDataSource(ctx, query)
 	if err != nil {

pkg/services/datasources/service/datasource_service.go

@@ -1,4 +1,4 @@
-package datasources
+package service
 
 import (
 	"context"
@@ -77,7 +77,9 @@ func ProvideService(bus bus.Bus, store *sqlstore.SQLStore, secretsService secret
 	return s
 }
 
+// DataSourceRetriever interface for retrieving a datasource.
 type DataSourceRetriever interface {
+	// GetDataSource gets a datasource.
 	GetDataSource(ctx context.Context, query *models.GetDataSourceQuery) error
 }
 

pkg/services/datasources/service/datasource_service_test.go

@@ -1,4 +1,4 @@
-package datasources
+package service
 
 import (
 	"context"