From e4738cbaf918c9aded28ed45eaae286c07c30fc7 Mon Sep 17 00:00:00 2001 From: Kat Yang <69819079+yangkb09@users.noreply.github.com> Date: Wed, 13 Dec 2023 06:03:23 -0500 Subject: [PATCH] Chore: Remove FolderID from Dashboard Import (#78832) * Chore: Remove FolderID from Dashboard Import * chore: regen specs * Remove OrgID from DashboardImportRequest and DashboardImportResponse * Remove OrdIDs from swagger and tests --------- Co-authored-by: Ida Furjesova --- .../service/dashboard_updater_test.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkg/services/plugindashboards/service/dashboard_updater_test.go b/pkg/services/plugindashboards/service/dashboard_updater_test.go index bc6133d5cc4..16170c7ae26 100644 --- a/pkg/services/plugindashboards/service/dashboard_updater_test.go +++ b/pkg/services/plugindashboards/service/dashboard_updater_test.go @@ -195,8 +195,7 @@ func TestDashboardUpdater(t *testing.T) { require.Equal(t, "updated.json", ctx.importDashboardArgs[0].Path) require.Equal(t, int64(2), ctx.importDashboardArgs[0].User.GetOrgID()) require.Equal(t, org.RoleAdmin, ctx.importDashboardArgs[0].User.GetOrgRole()) - // nolint:staticcheck - require.Equal(t, int64(0), ctx.importDashboardArgs[0].FolderId) + require.Equal(t, string(""), ctx.importDashboardArgs[0].FolderUid) require.True(t, ctx.importDashboardArgs[0].Overwrite) }) }) @@ -323,24 +322,21 @@ func TestDashboardUpdater(t *testing.T) { require.Equal(t, "dashboard1.json", ctx.importDashboardArgs[0].Path) require.Equal(t, int64(2), ctx.importDashboardArgs[0].User.GetOrgID()) require.Equal(t, org.RoleAdmin, ctx.importDashboardArgs[0].User.GetOrgRole()) - // nolint:staticcheck - require.Equal(t, int64(0), ctx.importDashboardArgs[0].FolderId) + require.Equal(t, string(""), ctx.importDashboardArgs[0].FolderUid) require.True(t, ctx.importDashboardArgs[0].Overwrite) require.Equal(t, "test", ctx.importDashboardArgs[1].PluginId) require.Equal(t, "dashboard2.json", ctx.importDashboardArgs[1].Path) require.Equal(t, int64(2), ctx.importDashboardArgs[1].User.GetOrgID()) require.Equal(t, org.RoleAdmin, ctx.importDashboardArgs[1].User.GetOrgRole()) - // nolint:staticcheck - require.Equal(t, int64(0), ctx.importDashboardArgs[1].FolderId) + require.Equal(t, string(""), ctx.importDashboardArgs[0].FolderUid) require.True(t, ctx.importDashboardArgs[1].Overwrite) require.Equal(t, "test", ctx.importDashboardArgs[2].PluginId) require.Equal(t, "dashboard3.json", ctx.importDashboardArgs[2].Path) require.Equal(t, int64(2), ctx.importDashboardArgs[2].User.GetOrgID()) require.Equal(t, org.RoleAdmin, ctx.importDashboardArgs[2].User.GetOrgRole()) - // nolint:staticcheck - require.Equal(t, int64(0), ctx.importDashboardArgs[2].FolderId) + require.Equal(t, string(""), ctx.importDashboardArgs[0].FolderUid) require.True(t, ctx.importDashboardArgs[2].Overwrite) }) }