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

Fix datasource tests

Browse Source
This commit is contained in:
Guilherme Caulada
2022-04-05 13:37:07 -03:00
parent e81458c1df
commit d1e83a9399
3 changed files with 73 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/datasources/service/datasource_service.go
+6 -5
View File
@@ -401,7 +401,7 @@ func (s *Service) httpClientOptions(ctx context.Context, ds *models.DataSource)
Profile: ds.JsonData.Get("sigV4Profile").MustString(), Profile: ds.JsonData.Get("sigV4Profile").MustString(),
} }
if val, exists, err := s.DecryptedValue(ctx, ds, "sigV4AccessKey"); err != nil { if val, exists, err := s.DecryptedValue(ctx, ds, "sigV4AccessKey"); err == nil {
if exists { if exists {
opts.SigV4.AccessKey = val opts.SigV4.AccessKey = val
} }
@@ -409,7 +409,7 @@ func (s *Service) httpClientOptions(ctx context.Context, ds *models.DataSource)
return opts, err return opts, err
} }
if val, exists, err := s.DecryptedValue(ctx, ds, "sigV4SecretKey"); err != nil { if val, exists, err := s.DecryptedValue(ctx, ds, "sigV4SecretKey"); err == nil {
if exists { if exists {
opts.SigV4.SecretKey = val opts.SigV4.SecretKey = val
} }
@@ -439,7 +439,7 @@ func (s *Service) dsTLSOptions(ctx context.Context, ds *models.DataSource) (sdkh
if tlsClientAuth || tlsAuthWithCACert { if tlsClientAuth || tlsAuthWithCACert {
if tlsAuthWithCACert { if tlsAuthWithCACert {
if val, exists, err := s.DecryptedValue(ctx, ds, "tlsCACert"); err != nil { if val, exists, err := s.DecryptedValue(ctx, ds, "tlsCACert"); err == nil {
if exists && len(val) > 0 { if exists && len(val) > 0 {
opts.CACertificate = val opts.CACertificate = val
} }
@@ -449,14 +449,15 @@ func (s *Service) dsTLSOptions(ctx context.Context, ds *models.DataSource) (sdkh
} }
if tlsClientAuth { if tlsClientAuth {
if val, exists, err := s.DecryptedValue(ctx, ds, "tlsClientCert"); err != nil { if val, exists, err := s.DecryptedValue(ctx, ds, "tlsClientCert"); err == nil {
fmt.Print("\n\n\n\n", val, exists, err, "\n\n\n\n")
if exists && len(val) > 0 { if exists && len(val) > 0 {
opts.ClientCertificate = val opts.ClientCertificate = val
} }
} else { } else {
return opts, err return opts, err
} }
if val, exists, err := s.DecryptedValue(ctx, ds, "tlsClientKey"); err != nil { if val, exists, err := s.DecryptedValue(ctx, ds, "tlsClientKey"); err == nil {
if exists && len(val) > 0 { if exists && len(val) > 0 {
opts.ClientKey = val opts.ClientKey = val
} }
pkg/services/datasources/service/datasource_service_test.go
+64 -41
View File
@@ -2,6 +2,7 @@ package service
import ( import (
"context" "context"
encJson "encoding/json"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
@@ -18,7 +19,6 @@ import (
"github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/accesscontrol"
acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock" acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
"github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/secrets/fakes"
"github.com/grafana/grafana/pkg/services/secrets/kvstore" "github.com/grafana/grafana/pkg/services/secrets/kvstore"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@@ -195,12 +195,12 @@ func TestService_GetHttpTransport(t *testing.T) {
secretsStore := kvstore.SetupTestService(t) secretsStore := kvstore.SetupTestService(t)
dsService := ProvideService(bus.New(), nil, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock()) dsService := ProvideService(bus.New(), nil, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock())
rt1, err := dsService.GetHTTPTransport(&ds, provider) rt1, err := dsService.GetHTTPTransport(context.Background(), &ds, provider)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, rt1) require.NotNil(t, rt1)
tr1 := configuredTransport tr1 := configuredTransport
rt2, err := dsService.GetHTTPTransport(&ds, provider) rt2, err := dsService.GetHTTPTransport(context.Background(), &ds, provider)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, rt2) require.NotNil(t, rt2)
tr2 := configuredTransport tr2 := configuredTransport
@@ -236,7 +236,7 @@ func TestService_GetHttpTransport(t *testing.T) {
Updated: time.Now().Add(-2 * time.Minute), Updated: time.Now().Add(-2 * time.Minute),
} }
rt1, err := dsService.GetHTTPTransport(&ds, provider) rt1, err := dsService.GetHTTPTransport(context.Background(), &ds, provider)
require.NotNil(t, rt1) require.NotNil(t, rt1)
require.NoError(t, err) require.NoError(t, err)
@@ -250,7 +250,7 @@ func TestService_GetHttpTransport(t *testing.T) {
ds.SecureJsonData = map[string][]byte{} ds.SecureJsonData = map[string][]byte{}
ds.Updated = time.Now() ds.Updated = time.Now()
rt2, err := dsService.GetHTTPTransport(&ds, provider) rt2, err := dsService.GetHTTPTransport(context.Background(), &ds, provider)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, rt2) require.NotNil(t, rt2)
tr2 := configuredTransport tr2 := configuredTransport
@@ -277,16 +277,23 @@ func TestService_GetHttpTransport(t *testing.T) {
ds := models.DataSource{ ds := models.DataSource{
Id: 1, Id: 1,
OrgId: 1,
Name: "kubernetes",
Url: "http://k8s:8001", Url: "http://k8s:8001",
Type: "Kubernetes", Type: "Kubernetes",
JsonData: json, JsonData: json,
SecureJsonData: map[string][]byte{
"tlsClientCert": []byte(clientCert),
"tlsClientKey": []byte(clientKey),
},
} }
rt, err := dsService.GetHTTPTransport(&ds, provider) secureJsonData, err := encJson.Marshal(map[string]string{
"tlsClientCert": clientCert,
"tlsClientKey": clientKey,
})
require.NoError(t, err)
err = secretsStore.Set(context.Background(), ds.OrgId, ds.Name, secretType, string(secureJsonData))
require.NoError(t, err)
rt, err := dsService.GetHTTPTransport(context.Background(), &ds, provider)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, rt) require.NotNil(t, rt)
tr := configuredTransport tr := configuredTransport
@@ -314,15 +321,22 @@ func TestService_GetHttpTransport(t *testing.T) {
ds := models.DataSource{ ds := models.DataSource{
Id: 1, Id: 1,
OrgId: 1,
Name: "kubernetes",
Url: "http://k8s:8001", Url: "http://k8s:8001",
Type: "Kubernetes", Type: "Kubernetes",
JsonData: json, JsonData: json,
SecureJsonData: map[string][]byte{
"tlsCACert": []byte(caCert),
},
} }
rt, err := dsService.GetHTTPTransport(&ds, provider) secureJsonData, err := encJson.Marshal(map[string]string{
"tlsCACert": caCert,
})
require.NoError(t, err)
err = secretsStore.Set(context.Background(), ds.OrgId, ds.Name, secretType, string(secureJsonData))
require.NoError(t, err)
rt, err := dsService.GetHTTPTransport(context.Background(), &ds, provider)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, rt) require.NotNil(t, rt)
tr := configuredTransport tr := configuredTransport
@@ -353,12 +367,12 @@ func TestService_GetHttpTransport(t *testing.T) {
JsonData: json, JsonData: json,
} }
rt1, err := dsService.GetHTTPTransport(&ds, provider) rt1, err := dsService.GetHTTPTransport(context.Background(), &ds, provider)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, rt1) require.NotNil(t, rt1)
tr1 := configuredTransport tr1 := configuredTransport
rt2, err := dsService.GetHTTPTransport(&ds, provider) rt2, err := dsService.GetHTTPTransport(context.Background(), &ds, provider)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, rt2) require.NotNil(t, rt2)
tr2 := configuredTransport tr2 := configuredTransport
@@ -378,13 +392,22 @@ func TestService_GetHttpTransport(t *testing.T) {
dsService := ProvideService(bus.New(), nil, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock()) dsService := ProvideService(bus.New(), nil, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock())
ds := models.DataSource{ ds := models.DataSource{
Id: 1, Id: 1,
Url: "http://k8s:8001", OrgId: 1,
Type: "Kubernetes", Name: "kubernetes",
JsonData: json, Url: "http://k8s:8001",
SecureJsonData: map[string][]byte{"httpHeaderValue1": []byte(`Bearer xf5yhfkpsnmgo`)}, Type: "Kubernetes",
JsonData: json,
} }
secureJsonData, err := encJson.Marshal(map[string]string{
"httpHeaderValue1": "Bearer xf5yhfkpsnmgo",
})
require.NoError(t, err)
err = secretsStore.Set(context.Background(), ds.OrgId, ds.Name, secretType, string(secureJsonData))
require.NoError(t, err)
headers := dsService.getCustomHeaders(json, map[string]string{"httpHeaderValue1": "Bearer xf5yhfkpsnmgo"}) headers := dsService.getCustomHeaders(json, map[string]string{"httpHeaderValue1": "Bearer xf5yhfkpsnmgo"})
require.Equal(t, "Bearer xf5yhfkpsnmgo", headers["Authorization"]) require.Equal(t, "Bearer xf5yhfkpsnmgo", headers["Authorization"])
@@ -405,7 +428,7 @@ func TestService_GetHttpTransport(t *testing.T) {
// 2. Get HTTP transport from datasource which uses the test server as backend // 2. Get HTTP transport from datasource which uses the test server as backend
ds.Url = backend.URL ds.Url = backend.URL
rt, err := dsService.GetHTTPTransport(&ds, provider) rt, err := dsService.GetHTTPTransport(context.Background(), &ds, provider)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, rt) require.NotNil(t, rt)
@@ -440,7 +463,7 @@ func TestService_GetHttpTransport(t *testing.T) {
JsonData: json, JsonData: json,
} }
client, err := dsService.GetHTTPClient(&ds, provider) client, err := dsService.GetHTTPClient(context.Background(), &ds, provider)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, client) require.NotNil(t, client)
require.Equal(t, 19*time.Second, client.Timeout) require.Equal(t, 19*time.Second, client.Timeout)
@@ -471,7 +494,7 @@ func TestService_GetHttpTransport(t *testing.T) {
JsonData: json, JsonData: json,
} }
_, err = dsService.GetHTTPTransport(&ds, provider) _, err = dsService.GetHTTPTransport(context.Background(), &ds, provider)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, configuredOpts) require.NotNil(t, configuredOpts)
require.NotNil(t, configuredOpts.SigV4) require.NotNil(t, configuredOpts.SigV4)
@@ -539,9 +562,9 @@ func TestService_HTTPClientOptions(t *testing.T) {
}) })
secretsStore := kvstore.SetupTestService(t) secretsStore := kvstore.SetupTestService(t)
dsService := ProvideService(bus.New(), nil, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock()) dsService := ProvideService(bus.New(), nil, secretsStore, cfg, features, acmock.New(), acmock.NewPermissionsServicesMock())
opts, err := dsService.httpClientOptions(&ds) opts, err := dsService.httpClientOptions(context.Background(), &ds)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, opts.Middlewares) require.NotNil(t, opts.Middlewares)
@@ -556,9 +579,9 @@ func TestService_HTTPClientOptions(t *testing.T) {
}) })
secretsStore := kvstore.SetupTestService(t) secretsStore := kvstore.SetupTestService(t)
dsService := ProvideService(bus.New(), nil, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock()) dsService := ProvideService(bus.New(), nil, secretsStore, cfg, features, acmock.New(), acmock.NewPermissionsServicesMock())
opts, err := dsService.httpClientOptions(&ds) opts, err := dsService.httpClientOptions(context.Background(), &ds)
require.NoError(t, err) require.NoError(t, err)
if opts.Middlewares != nil { if opts.Middlewares != nil {
@@ -575,9 +598,9 @@ func TestService_HTTPClientOptions(t *testing.T) {
}) })
secretsStore := kvstore.SetupTestService(t) secretsStore := kvstore.SetupTestService(t)
dsService := ProvideService(bus.New(), nil, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock()) dsService := ProvideService(bus.New(), nil, secretsStore, cfg, features, acmock.New(), acmock.NewPermissionsServicesMock())
_, err := dsService.httpClientOptions(&ds) _, err := dsService.httpClientOptions(context.Background(), &ds)
assert.Error(t, err) assert.Error(t, err)
}) })
@@ -593,9 +616,9 @@ func TestService_HTTPClientOptions(t *testing.T) {
}) })
secretsStore := kvstore.SetupTestService(t) secretsStore := kvstore.SetupTestService(t)
dsService := ProvideService(bus.New(), nil, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock()) dsService := ProvideService(bus.New(), nil, secretsStore, cfg, features, acmock.New(), acmock.NewPermissionsServicesMock())
opts, err := dsService.httpClientOptions(ctx, &ds) opts, err := dsService.httpClientOptions(context.Background(), &ds)
require.NoError(t, err) require.NoError(t, err)
require.NotNil(t, opts.Middlewares) require.NotNil(t, opts.Middlewares)
@@ -610,10 +633,10 @@ func TestService_HTTPClientOptions(t *testing.T) {
"azureEndpointResourceId": "https://api.example.com/abd5c4ce-ca73-41e9-9cb2-bed39aa2adb5", "azureEndpointResourceId": "https://api.example.com/abd5c4ce-ca73-41e9-9cb2-bed39aa2adb5",
}) })
secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) secretsStore := kvstore.SetupTestService(t)
dsService := ProvideService(bus.New(), nil, secretsService, cfg, features, acmock.New(), acmock.NewPermissionsServicesMock()) dsService := ProvideService(bus.New(), nil, secretsStore, cfg, features, acmock.New(), acmock.NewPermissionsServicesMock())
opts, err := dsService.httpClientOptions(&ds) opts, err := dsService.httpClientOptions(context.Background(), &ds)
require.NoError(t, err) require.NoError(t, err)
if opts.Middlewares != nil { if opts.Middlewares != nil {
@@ -632,10 +655,10 @@ func TestService_HTTPClientOptions(t *testing.T) {
"azureEndpointResourceId": "invalid", "azureEndpointResourceId": "invalid",
}) })
secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) secretsStore := kvstore.SetupTestService(t)
dsService := ProvideService(bus.New(), nil, secretsService, cfg, features, acmock.New(), acmock.NewPermissionsServicesMock()) dsService := ProvideService(bus.New(), nil, secretsStore, cfg, features, acmock.New(), acmock.NewPermissionsServicesMock())
_, err := dsService.httpClientOptions(&ds) _, err := dsService.httpClientOptions(context.Background(), &ds)
assert.Error(t, err) assert.Error(t, err)
}) })
}) })
@@ -652,10 +675,10 @@ func TestService_HTTPClientOptions(t *testing.T) {
"azureEndpointResourceId": "https://api.example.com/abd5c4ce-ca73-41e9-9cb2-bed39aa2adb5", "azureEndpointResourceId": "https://api.example.com/abd5c4ce-ca73-41e9-9cb2-bed39aa2adb5",
}) })
secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) secretsStore := kvstore.SetupTestService(t)
dsService := ProvideService(bus.New(), nil, secretsService, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock()) dsService := ProvideService(bus.New(), nil, secretsStore, cfg, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock())
opts, err := dsService.httpClientOptions(&ds) opts, err := dsService.httpClientOptions(context.Background(), &ds)
require.NoError(t, err) require.NoError(t, err)
if opts.Middlewares != nil { if opts.Middlewares != nil {
pkg/services/secrets/kvstore/sql.go
+3 -2
View File
@@ -92,6 +92,7 @@ func (kv *secretsKVStoreSQL) Set(ctx context.Context, orgId int64, namespace str
kv.log.Debug("error encrypting secret value", "orgId", orgId, "type", typ, "namespace", namespace, "err", err) kv.log.Debug("error encrypting secret value", "orgId", orgId, "type", typ, "namespace", namespace, "err", err)
return err return err
} }
encodedValue := b64.EncodeToString(encryptedValue)
return kv.sqlStore.WithTransactionalDbSession(ctx, func(dbSession *sqlstore.DBSession) error { return kv.sqlStore.WithTransactionalDbSession(ctx, func(dbSession *sqlstore.DBSession) error {
item := Item{ item := Item{
OrgId: &orgId, OrgId: &orgId,
@@ -105,12 +106,12 @@ func (kv *secretsKVStoreSQL) Set(ctx context.Context, orgId int64, namespace str
return err return err
} }
if has && item.Value == value { if has && item.Value == encodedValue {
kv.log.Debug("secret value not changed", "orgId", orgId, "type", typ, "namespace", namespace) kv.log.Debug("secret value not changed", "orgId", orgId, "type", typ, "namespace", namespace)
return nil return nil
} }
item.Value = b64.EncodeToString(encryptedValue) item.Value = encodedValue
item.Updated = time.Now() item.Updated = time.Now()
if has { if has {