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

Chore: Remove folderID from dashboardIdentity tests (#79195)

Browse Source
This commit is contained in:
Kat Yang
2023-12-13 10:50:46 +01:00
committed by GitHub
parent 1efd21c08a
commit 43356e28e7
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/provisioning/dashboards/file_reader.go
+4 -3
View File
@@ -484,9 +484,10 @@ type provisioningMetadata struct {
} }
type dashboardIdentity struct { type dashboardIdentity struct {
// Deprecated: use FolderUID instead // Deprecated: use folderUID instead
folderID int64 folderID int64
title string folderUID string
title string
} }
func (d *dashboardIdentity) Exists() bool { func (d *dashboardIdentity) Exists() bool {
pkg/services/provisioning/dashboards/validator_test.go
+8 -12
View File
@@ -39,11 +39,10 @@ func TestDuplicatesValidator(t *testing.T) {
fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Times(6) fakeService.On("SaveFolderForProvisionedDashboards", mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Times(6)
fakeService.On("GetProvisionedDashboardData", mock.Anything, mock.AnythingOfType("string")).Return([]*dashboards.DashboardProvisioning{}, nil).Times(4) fakeService.On("GetProvisionedDashboardData", mock.Anything, mock.AnythingOfType("string")).Return([]*dashboards.DashboardProvisioning{}, nil).Times(4)
fakeService.On("SaveProvisionedDashboard", mock.Anything, mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Times(5) fakeService.On("SaveProvisionedDashboard", mock.Anything, mock.Anything, mock.Anything).Return(&dashboards.Dashboard{}, nil).Times(5)
folderID, _, err := r.getOrCreateFolder(context.Background(), cfg, fakeService, folderName) _, folderUID, err := r.getOrCreateFolder(context.Background(), cfg, fakeService, folderName)
require.NoError(t, err) require.NoError(t, err)
// nolint:staticcheck identity := dashboardIdentity{folderUID: folderUID, title: "Grafana"}
identity := dashboardIdentity{folderID: folderID, title: "Grafana"}
cfg1 := &config{ cfg1 := &config{
Name: "first", Type: "file", OrgID: 1, Folder: folderName, Name: "first", Type: "file", OrgID: 1, Folder: folderName,
@@ -93,11 +92,10 @@ func TestDuplicatesValidator(t *testing.T) {
fakeStore := &fakeDashboardStore{} fakeStore := &fakeDashboardStore{}
r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore) r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
require.NoError(t, err) require.NoError(t, err)
folderID, _, err := r.getOrCreateFolder(context.Background(), cfg, fakeService, folderName) _, folderUID, err := r.getOrCreateFolder(context.Background(), cfg, fakeService, folderName)
require.NoError(t, err) require.NoError(t, err)
// nolint:staticcheck identity := dashboardIdentity{folderUID: folderUID, title: "Grafana"}
identity := dashboardIdentity{folderID: folderID, title: "Grafana"}
cfg1 := &config{ cfg1 := &config{
Name: "first", Type: "file", OrgID: 1, Folder: folderName, Name: "first", Type: "file", OrgID: 1, Folder: folderName,
@@ -196,11 +194,10 @@ func TestDuplicatesValidator(t *testing.T) {
r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore) r, err := NewDashboardFileReader(cfg, logger, nil, fakeStore)
require.NoError(t, err) require.NoError(t, err)
folderID, _, err := r.getOrCreateFolder(context.Background(), cfg, fakeService, cfg1.Folder) _, folderUID, err := r.getOrCreateFolder(context.Background(), cfg, fakeService, cfg1.Folder)
require.NoError(t, err) require.NoError(t, err)
// nolint:staticcheck identity := dashboardIdentity{folderUID: folderUID, title: "Grafana"}
identity := dashboardIdentity{folderID: folderID, title: "Grafana"}
require.Equal(t, uint8(2), duplicates[1].UIDs["Z-phNqGmz"].Sum) require.Equal(t, uint8(2), duplicates[1].UIDs["Z-phNqGmz"].Sum)
uidUsageReaders := keysToSlice(duplicates[1].UIDs["Z-phNqGmz"].InvolvedReaders) uidUsageReaders := keysToSlice(duplicates[1].UIDs["Z-phNqGmz"].InvolvedReaders)
@@ -214,11 +211,10 @@ func TestDuplicatesValidator(t *testing.T) {
r, err = NewDashboardFileReader(cfg3, logger, nil, fakeStore) r, err = NewDashboardFileReader(cfg3, logger, nil, fakeStore)
require.NoError(t, err) require.NoError(t, err)
folderID, _, err = r.getOrCreateFolder(context.Background(), cfg3, fakeService, cfg3.Folder) _, folderUID, err = r.getOrCreateFolder(context.Background(), cfg3, fakeService, cfg3.Folder)
require.NoError(t, err) require.NoError(t, err)
// nolint:staticcheck identity = dashboardIdentity{folderUID: folderUID, title: "Grafana"}
identity = dashboardIdentity{folderID: folderID, title: "Grafana"}
require.Equal(t, uint8(2), duplicates[2].UIDs["Z-phNqGmz"].Sum) require.Equal(t, uint8(2), duplicates[2].UIDs["Z-phNqGmz"].Sum)
uidUsageReaders = keysToSlice(duplicates[2].UIDs["Z-phNqGmz"].InvolvedReaders) uidUsageReaders = keysToSlice(duplicates[2].UIDs["Z-phNqGmz"].InvolvedReaders)