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

Alerting: Use google/uuid instead of gofrs/uuid (#51242)

Browse Source
This commit is contained in:
Emil Tullstedt 2022-06-28 11:57:24 +02:00 committed by GitHub
parent 5aab8b710b
commit 7d815a1db5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -41,7 +41,7 @@ require (
github.com/go-sql-driver/mysql v1.6.0 github.com/go-sql-driver/mysql v1.6.0
github.com/go-stack/stack v1.8.0 github.com/go-stack/stack v1.8.0
github.com/gobwas/glob v0.2.3 github.com/gobwas/glob v0.2.3
github.com/gofrs/uuid v4.0.0+incompatible github.com/gofrs/uuid v4.0.0+incompatible // indirect
github.com/gogo/protobuf v1.3.2 github.com/gogo/protobuf v1.3.2
github.com/golang/mock v1.6.0 github.com/golang/mock v1.6.0
github.com/golang/snappy v0.0.4 github.com/golang/snappy v0.0.4

4
pkg/services/ngalert/store/image.go
View File

@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/gofrs/uuid" "github.com/google/uuid"
"github.com/grafana/grafana/pkg/services/ngalert/models" "github.com/grafana/grafana/pkg/services/ngalert/models"
"github.com/grafana/grafana/pkg/services/sqlstore" "github.com/grafana/grafana/pkg/services/sqlstore"
@ -59,7 +59,7 @@ func (st DBstore) SaveImage(ctx context.Context, img *models.Image) error {
// rows? See issue https://github.com/grafana/grafana/issues/49366 // rows? See issue https://github.com/grafana/grafana/issues/49366
img.ExpiresAt = TimeNow().Add(1 * time.Minute).UTC() img.ExpiresAt = TimeNow().Add(1 * time.Minute).UTC()
if img.ID == 0 { // xorm will fill this field on Insert. if img.ID == 0 { // xorm will fill this field on Insert.
token, err := uuid.NewV4() token, err := uuid.NewRandom()
if err != nil { if err != nil {
return fmt.Errorf("failed to create token: %w", err) return fmt.Errorf("failed to create token: %w", err)
} }

4
pkg/services/ngalert/store/image_test.go
View File

@ -5,7 +5,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/gofrs/uuid" "github.com/google/uuid"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -29,7 +29,7 @@ func addID(img *models.Image, id int64) *models.Image {
} }
func addToken(img *models.Image) *models.Image { func addToken(img *models.Image) *models.Image {
token, err := uuid.NewV4() token, err := uuid.NewRandom()
if err != nil { if err != nil {
panic("wat") panic("wat")
} }

8
pkg/services/sqlstore/migrations/ualert/silences.go
View File

@ -11,7 +11,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/gofrs/uuid" "github.com/google/uuid"
"github.com/matttproud/golang_protobuf_extensions/pbutil" "github.com/matttproud/golang_protobuf_extensions/pbutil"
pb "github.com/prometheus/alertmanager/silence/silencepb" pb "github.com/prometheus/alertmanager/silence/silencepb"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
@ -31,7 +31,7 @@ func (m *migration) addSilence(da dashAlert, rule *alertRule) error {
return nil return nil
} }
uid, err := uuid.NewV4() uid, err := uuid.NewRandom()
if err != nil { if err != nil {
return errors.New("failed to create uuid for silence") return errors.New("failed to create uuid for silence")
} }
@ -68,7 +68,7 @@ func (m *migration) addErrorSilence(da dashAlert, rule *alertRule) error {
return nil return nil
} }
uid, err := uuid.NewV4() uid, err := uuid.NewRandom()
if err != nil { if err != nil {
return errors.New("failed to create uuid for silence") return errors.New("failed to create uuid for silence")
} }
@ -107,7 +107,7 @@ func (m *migration) addNoDataSilence(da dashAlert, rule *alertRule) error {
return nil return nil
} }
uid, err := uuid.NewV4() uid, err := uuid.NewRandom()
if err != nil { if err != nil {
return errors.New("failed to create uuid for silence") return errors.New("failed to create uuid for silence")
} }