From 60e7a4e746238b4244c6604c1a0d133dce4bec64 Mon Sep 17 00:00:00 2001 From: Santiago Date: Mon, 20 May 2024 16:37:39 +0200 Subject: [PATCH] Alerting/Chore: Remove unused parameters (#88045) Alerting/Chore: Remove unused parameters from redisPeer.receiveLoop() and ReceiverService.shouldDecrypt() --- pkg/services/ngalert/notifier/receiver_svc.go | 6 +++--- pkg/services/ngalert/notifier/redis_peer.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/services/ngalert/notifier/receiver_svc.go b/pkg/services/ngalert/notifier/receiver_svc.go index aa1f0fbc445..e897490525d 100644 --- a/pkg/services/ngalert/notifier/receiver_svc.go +++ b/pkg/services/ngalert/notifier/receiver_svc.go @@ -63,7 +63,7 @@ func NewReceiverService( } } -func (rs *ReceiverService) shouldDecrypt(ctx context.Context, user identity.Requester, name string, reqDecrypt bool) (bool, error) { +func (rs *ReceiverService) shouldDecrypt(ctx context.Context, user identity.Requester, reqDecrypt bool) (bool, error) { // TODO: migrate to new permission eval := accesscontrol.EvalAny( accesscontrol.EvalPermission(accesscontrol.ActionAlertingReceiversReadSecrets), @@ -108,7 +108,7 @@ func (rs *ReceiverService) GetReceiver(ctx context.Context, q models.GetReceiver receivers := cfg.AlertmanagerConfig.Receivers for _, r := range receivers { if r.Name == q.Name { - decrypt, err := rs.shouldDecrypt(ctx, user, q.Name, q.Decrypt) + decrypt, err := rs.shouldDecrypt(ctx, user, q.Decrypt) if err != nil { return definitions.GettableApiReceiver{}, err } @@ -157,7 +157,7 @@ func (rs *ReceiverService) GetReceivers(ctx context.Context, q models.GetReceive continue } - decrypt, err := rs.shouldDecrypt(ctx, user, r.Name, q.Decrypt) + decrypt, err := rs.shouldDecrypt(ctx, user, q.Decrypt) if err != nil { return nil, err } diff --git a/pkg/services/ngalert/notifier/redis_peer.go b/pkg/services/ngalert/notifier/redis_peer.go index f934effe045..b1ce249fe96 100644 --- a/pkg/services/ngalert/notifier/redis_peer.go +++ b/pkg/services/ngalert/notifier/redis_peer.go @@ -448,12 +448,12 @@ func (p *redisPeer) AddState(key string, state alertingCluster.State, _ promethe p.states[key] = state // As we also want to get the state from other nodes, we subscribe to the key. sub := p.redis.Subscribe(context.Background(), p.withPrefix(key)) - go p.receiveLoop(key, sub) + go p.receiveLoop(sub) p.subs[key] = sub return newRedisChannel(p, key, p.withPrefix(key), update) } -func (p *redisPeer) receiveLoop(name string, channel *redis.PubSub) { +func (p *redisPeer) receiveLoop(channel *redis.PubSub) { for { select { case <-p.shutdownc: