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

Correlations: improve error handling (#87810)

Browse Source 
Improve error handling
This commit is contained in:
Piotr Jamróz 2024-05-20 10:35:47 +02:00 committed by GitHub
parent e91136338a
commit d09f5abec9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/services/correlations/database.go
View File

@ -82,10 +82,16 @@ func (s CorrelationsService) deleteCorrelation(ctx context.Context, cmd DeleteCo
} }
deletedCount, err := session.Delete(&Correlation{UID: cmd.UID, SourceUID: cmd.SourceUID}) deletedCount, err := session.Delete(&Correlation{UID: cmd.UID, SourceUID: cmd.SourceUID})
if err != nil {
return err
}
if deletedCount == 0 { if deletedCount == 0 {
return ErrCorrelationNotFound return ErrCorrelationNotFound
} }
return err
return nil
}) })
} }
@ -142,10 +148,16 @@ func (s CorrelationsService) updateCorrelation(ctx context.Context, cmd UpdateCo
} }
updateCount, err := session.Where("uid = ? AND source_uid = ?", correlation.UID, correlation.SourceUID).Limit(1).Update(correlation) updateCount, err := session.Where("uid = ? AND source_uid = ?", correlation.UID, correlation.SourceUID).Limit(1).Update(correlation)
if err != nil {
return err
}
if updateCount == 0 { if updateCount == 0 {
return ErrCorrelationNotFound return ErrCorrelationNotFound
} }
return err
return nil
}) })
if err != nil { if err != nil {

2
pkg/tests/api/correlations/correlations_update_test.go
View File

@ -16,8 +16,6 @@ import (
) )
func TestIntegrationUpdateCorrelation(t *testing.T) { func TestIntegrationUpdateCorrelation(t *testing.T) {
// TODO: #82520 Possibly a flaky test
t.Skip()
if testing.Short() { if testing.Short() {
t.Skip("skipping integration test") t.Skip("skipping integration test")
} }