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

merge upstream service changes

Browse Source
This commit is contained in:
Ryan McKinley
2025-07-01 17:00:04 -07:00
parent 97a089ef05
commit a44fdee0ef
7 changed files with 86 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/datasources/service/datasource_test.go
+47 -5
View File
@@ -12,13 +12,13 @@ import (
"time"
"github.com/google/uuid"
"github.com/grafana/grafana-plugin-sdk-go/backend"
sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"gopkg.in/ini.v1"
"github.com/grafana/grafana-plugin-sdk-go/backend"
sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/httpclient"
@@ -40,7 +40,6 @@ import (
secretsmng "github.com/grafana/grafana/pkg/services/secrets/manager"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tests/testsuite"
// testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource"
)
func TestMain(m *testing.M) {
@@ -53,9 +52,9 @@ type dataSourceMockRetriever struct {
func (d *dataSourceMockRetriever) GetDataSource(ctx context.Context, query *datasources.GetDataSourceQuery) (*datasources.DataSource, error) {
for _, dataSource := range d.res {
idMatch := query.ID != 0 && query.ID == dataSource.ID
idMatch := query.ID != 0 && query.ID == dataSource.ID // nolint:staticcheck
uidMatch := query.UID != "" && query.UID == dataSource.UID
nameMatch := query.Name != "" && query.Name == dataSource.Name
nameMatch := query.Name != "" && query.Name == dataSource.Name // nolint:staticcheck
if idMatch || nameMatch || uidMatch {
return dataSource, nil
}
@@ -420,6 +419,27 @@ func TestIntegrationService_UpdateDataSource(t *testing.T) {
require.NoError(t, err)
})
t.Run("should update with UID", func(t *testing.T) {
dsService := initDSService(t)
ds, err := dsService.AddDataSource(context.Background(), &datasources.AddDataSourceCommand{
OrgID: 1,
Name: "test-datasource",
URL: "http://before",
})
require.NoError(t, err)
cmd := &datasources.UpdateDataSourceCommand{
UID: ds.UID,
OrgID: ds.OrgID,
URL: "http://after",
}
after, err := dsService.UpdateDataSource(context.Background(), cmd)
require.NoError(t, err)
require.Equal(t, "http://after", after.URL)
})
t.Run("should return error if datasource with same name exist", func(t *testing.T) {
dsService := initDSService(t)
@@ -759,6 +779,28 @@ func TestIntegrationService_UpdateDataSource(t *testing.T) {
require.False(t, ok)
require.Nil(t, updatedRules)
})
t.Run("Should update with UID", func(t *testing.T) {
dsService := initDSService(t)
ds, err := dsService.AddDataSource(context.Background(), &datasources.AddDataSourceCommand{
OrgID: 1,
Name: "test-datasource",
Type: "test",
URL: "http://before",
})
require.NoError(t, err)
updateCmd := &datasources.UpdateDataSourceCommand{
UID: ds.UID,
OrgID: ds.OrgID,
URL: "http://after",
}
updatedDS, err := dsService.UpdateDataSource(context.Background(), updateCmd)
require.NoError(t, err)
require.Equal(t, "http://after", updatedDS.URL)
})
}
func TestIntegrationService_DeleteDataSource(t *testing.T) {