IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Replace go-multierror with errors package (#66432)

Browse Source 
* code refactor and type assertions added to tests

* no-lint rule added for specific line
This commit is contained in:
SatVeer Singh
2023-06-19 14:59:45 +05:30
committed by GitHub
parent a75752b085
commit 1bfa3a0f1e
8 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/services/ngalert/state/cache_test.go
View File

@@ -9,7 +9,6 @@ import (
"time"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/hashicorp/go-multierror"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -67,14 +66,15 @@ func Test_expand(t *testing.T) {
require.NotNil(t, err)
require.Equal(t, original, results)
// TODO: Please update this test in issue https://github.com/grafana/grafana/issues/63686
var multierr *multierror.Error
require.True(t, errors.As(err, &multierr))
require.Equal(t, multierr.Len(), 2)
//nolint:errorlint
multierr, is := err.(interface{ Unwrap() []error })
require.True(t, is)
unwrappedErrors := multierr.Unwrap()
require.Equal(t, len(unwrappedErrors), 2)
errsStr := []string{
multierr.Errors[0].Error(),
multierr.Errors[1].Error(),
unwrappedErrors[0].Error(),
unwrappedErrors[1].Error(),
}
firstErrStr := "failed to expand template '{{- $labels := .Labels -}}{{- $values := .Values -}}{{- $value := .Value -}}Instance {{ $labels. }} has been down for more than 5 minutes': error parsing template __alert_test: template: __alert_test:1: unexpected <.> in operand"
@@ -83,7 +83,7 @@ func Test_expand(t *testing.T) {
require.Contains(t, errsStr, firstErrStr)
require.Contains(t, errsStr, secondErrStr)
for _, err := range multierr.Errors {
for _, err := range unwrappedErrors {
var expandErr template.ExpandError
require.True(t, errors.As(err, &expandErr))
}
@@ -103,10 +103,11 @@ func Test_expand(t *testing.T) {
require.NotNil(t, err)
require.Equal(t, expected, results)
// TODO: Please update this test in issue https://github.com/grafana/grafana/issues/63686
var multierr *multierror.Error
require.True(t, errors.As(err, &multierr))
require.Equal(t, multierr.Len(), 1)
//nolint:errorlint
multierr, is := err.(interface{ Unwrap() []error })
require.True(t, is)
unwrappedErrors := multierr.Unwrap()
require.Equal(t, len(unwrappedErrors), 1)
// assert each error matches the expected error
var expandErr template.ExpandError