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: rename Id to ID in alert notification models (#62868)

Browse Source
This commit is contained in:
idafurjes
2023-02-03 15:46:55 +01:00
committed by GitHub
parent 2e98f5063b
commit 00d954320f
18 changed files with 240 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/services/alerting/service_test.go
View File

@@ -72,8 +72,8 @@ func TestService(t *testing.T) {
// Delete the created alert notification
delCmd := models.DeleteAlertNotificationCommand{
Id: an.Id,
OrgId: an.OrgId,
ID: an.ID,
OrgID: an.OrgID,
}
err = s.DeleteAlertNotification(context.Background(), &delCmd)
require.NoError(t, err)
@@ -90,14 +90,14 @@ func TestService(t *testing.T) {
require.NoError(t, err)
// Try to update it with an invalid type.
updateCmd := models.UpdateAlertNotificationCommand{Id: n.Id, Settings: simplejson.New(), SecureSettings: ss, Type: "invalid"}
updateCmd := models.UpdateAlertNotificationCommand{ID: n.ID, Settings: simplejson.New(), SecureSettings: ss, Type: "invalid"}
_, err = s.UpdateAlertNotification(ctx, &updateCmd)
require.Error(t, err)
// Delete the created alert notification.
delCmd := models.DeleteAlertNotificationCommand{
Id: n.Id,
OrgId: n.OrgId,
ID: n.ID,
OrgID: n.OrgID,
}
err = s.DeleteAlertNotification(context.Background(), &delCmd)
require.NoError(t, err)
@@ -114,7 +114,7 @@ func TestService(t *testing.T) {
require.NoError(t, err)
// Update test notification.
updateCmd := models.UpdateAlertNotificationCommand{Id: n.Id, Settings: simplejson.New(), SecureSettings: ss, Type: nType}
updateCmd := models.UpdateAlertNotificationCommand{ID: n.ID, Settings: simplejson.New(), SecureSettings: ss, Type: nType}
n2, err := s.UpdateAlertNotification(ctx, &updateCmd)
require.NoError(t, err)
@@ -124,8 +124,8 @@ func TestService(t *testing.T) {
// Delete the created alert notification.
delCmd := models.DeleteAlertNotificationCommand{
Id: n.Id,
OrgId: n.OrgId,
ID: n.ID,
OrgID: n.OrgID,
}
err = s.DeleteAlertNotification(context.Background(), &delCmd)
require.NoError(t, err)
@@ -134,7 +134,7 @@ func TestService(t *testing.T) {
t.Run("create alert notification should reject an invalid command", func(t *testing.T) {
uid := strings.Repeat("A", 41)
_, err := s.CreateAlertNotificationCommand(context.Background(), &models.CreateAlertNotificationCommand{Uid: uid})
_, err := s.CreateAlertNotificationCommand(context.Background(), &models.CreateAlertNotificationCommand{UID: uid})
require.ErrorIs(t, err, ValidationError{Reason: "Invalid UID: Must be 40 characters or less"})
})
@@ -144,10 +144,10 @@ func TestService(t *testing.T) {
uid := strings.Repeat("A", 41)
expectedErr := ValidationError{Reason: "Invalid UID: Must be 40 characters or less"}
_, err := s.UpdateAlertNotification(ctx, &models.UpdateAlertNotificationCommand{Uid: uid})
_, err := s.UpdateAlertNotification(ctx, &models.UpdateAlertNotificationCommand{UID: uid})
require.ErrorIs(t, err, expectedErr)
_, err = s.UpdateAlertNotificationWithUid(ctx, &models.UpdateAlertNotificationWithUidCommand{NewUid: uid})
_, err = s.UpdateAlertNotificationWithUid(ctx, &models.UpdateAlertNotificationWithUidCommand{NewUID: uid})
require.ErrorIs(t, err, expectedErr)
})
}