From 218cd04667927aabb58b0c52bf61104d3c3d6e7e Mon Sep 17 00:00:00 2001 From: Matt Jacobson Date: Mon, 18 Dec 2023 13:20:46 -0500 Subject: [PATCH] Fix linting --- pkg/services/ngalert/migration/cond_trans.go | 2 +- pkg/services/ngalert/migration/models.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/services/ngalert/migration/cond_trans.go b/pkg/services/ngalert/migration/cond_trans.go index 91ed305d7c13..0f5af5613250 100644 --- a/pkg/services/ngalert/migration/cond_trans.go +++ b/pkg/services/ngalert/migration/cond_trans.go @@ -66,7 +66,7 @@ type evaluator struct { } //nolint:gocyclo -func transConditions(ctx context.Context, l log.Logger, set dashAlertSettings, orgID int64, store migrationStore.Store) (*condition, error) { +func transConditions(ctx context.Context, l log.Logger, set dashAlertSettings, orgID int64, store migrationStore.Store) (*condition, error) { // TODO: needs a significant refactor to reduce complexity. usr := getMigrationUser(orgID) diff --git a/pkg/services/ngalert/migration/models.go b/pkg/services/ngalert/migration/models.go index 2b52a5382839..4bb05b2561df 100644 --- a/pkg/services/ngalert/migration/models.go +++ b/pkg/services/ngalert/migration/models.go @@ -25,7 +25,7 @@ type OrgMigration struct { orgID int64 silences []*pb.MeshSilence titleDeduplicatorForFolder func(folderUID string) *migmodels.Deduplicator - channelCache *ChannelCache + channelCache *ChannelCache // Migrated folder for a dashboard based on permissions. Parent Folder ID -> unique dashboard permission -> custom folder. permissionsMap map[int64]map[permissionHash]*folder.Folder @@ -54,7 +54,7 @@ func (ms *migrationService) newOrgMigration(orgID int64) *OrgMigration { } return titlededuplicatorPerFolder[folderUID] }, - channelCache: &ChannelCache{cache: make(map[any]*legacymodels.AlertNotification)}, + channelCache: &ChannelCache{cache: make(map[any]*legacymodels.AlertNotification)}, permissionsMap: make(map[int64]map[permissionHash]*folder.Folder), folderCache: make(map[int64]*folder.Folder),