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

Chore: Use x/xerrors instead of pkg/errors (#16668)

Browse Source 
* Use xerrors instead of pkg/errors

* Add Wrap util func

* Move Wrap to errutil package
This commit is contained in:
Andrej Ocenas
2019-04-23 11:50:31 +02:00
committed by GitHub
parent 54c1bf0cc9
commit c429934a66
20 changed files with 718 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/dashboards/dashboard_service.go
+2 -2
View File
@@ -9,7 +9,7 @@ import (
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/guardian"
"github.com/grafana/grafana/pkg/util"
"github.com/pkg/errors"
"github.com/grafana/grafana/pkg/util/errutil"
)
// DashboardService service for operating on dashboards
@@ -261,7 +261,7 @@ func (dr *dashboardServiceImpl) deleteDashboard(dashboardId int64, orgId int64,
isDashboardProvisioned := &models.IsDashboardProvisionedQuery{DashboardId: dashboardId}
err := bus.Dispatch(isDashboardProvisioned)
if err != nil {
return errors.Wrap(err, "error while checking if dashboard is provisioned")
return errutil.Wrap("failed to check if dashboard is provisioned", err)
}
if isDashboardProvisioned.Result {
pkg/services/dashboards/dashboard_service_test.go
+2 -3
View File
@@ -6,9 +6,8 @@ import (
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/guardian"
"github.com/pkg/errors"
. "github.com/smartystreets/goconvey/convey"
"golang.org/x/xerrors"
)
func TestDashboardService(t *testing.T) {
@@ -116,7 +115,7 @@ func TestDashboardService(t *testing.T) {
})
bus.AddHandler("test", func(cmd *models.ValidateDashboardAlertsCommand) error {
return errors.New("Alert validation error")
return xerrors.New("Alert validation error")
})
dto.Dashboard = models.NewDashboard("Dash")