fix: issue with empty replyTo env

PeerDB-io · Mar 12, 2024 · ff46929 · ff46929
1 parent 396d281
commit ff46929
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/flow/alerting/alerting.go b/flow/alerting/alerting.go
@@ -52,10 +52,14 @@ func (a *Alerter) registerSendersFromPool(ctx context.Context) ([]AlertSenderCon
 
 			alertSenderConfigs = append(alertSenderConfigs, AlertSenderConfig{Id: id, Sender: newSlackAlertSender(&slackServiceConfig)})
 		case EMAIL:
+			var replyToAddresses []string
+			if envString := strings.TrimSpace(peerdbenv.PeerDBAlertingEmailSenderReplyToAddresses()); len(envString) != 0 {
+				replyToAddresses = strings.Split(envString, ",")
+			}
 			emailServiceConfig := EmailAlertSenderConfig{
 				sourceEmail:          peerdbenv.PeerDBAlertingEmailSenderSourceEmail(),
 				configurationSetName: peerdbenv.PeerDBAlertingEmailSenderConfigurationSet(),
-				replyToAddresses:     strings.Split(peerdbenv.PeerDBAlertingEmailSenderReplyToAddresses(), ","),
+				replyToAddresses:     replyToAddresses,
 			}
 			if emailServiceConfig.sourceEmail == "" {
 				return errors.New("missing sourceEmail for Email alerting service")

diff --git a/flow/alerting/email_alert_sender.go b/flow/alerting/email_alert_sender.go
@@ -83,15 +83,11 @@ func NewEmailAlertSenderWithNewClient(ctx context.Context, region *string, confi
 }
 
 func NewEmailAlertSender(client *ses.Client, config *EmailAlertSenderConfig) *EmailAlertSender {
-	replyToAddresses := config.replyToAddresses
-	if len(replyToAddresses) == 0 {
-		replyToAddresses = []string{config.sourceEmail}
-	}
 	return &EmailAlertSender{
 		client:                        client,
 		sourceEmail:                   config.sourceEmail,
 		configurationSetName:          config.configurationSetName,
-		replyToAddresses:              replyToAddresses,
+		replyToAddresses:              config.replyToAddresses,
 		slotLagMBAlertThreshold:       config.SlotLagMBAlertThreshold,
 		openConnectionsAlertThreshold: config.OpenConnectionsAlertThreshold,
 		emailAddresses:                config.EmailAddresses,