ingestAlerts(): improve awkward API

Author: joonas-fi

cmd/alertmanager/httpmonitorscanner.go

@@ -48,8 +48,7 @@ func httpMonitorScanAndAlertFailuresWithApp(ctx context.Context, app *amstate.Ap
 	}
 
 	// ok with len(alerts) == 0
-	_, err := ingestAlerts(ctx, alerts, app)
-	return err
+	return ingestAlerts(ctx, alerts, app)
 }
 
 // scans HTTP monitors and returns the ones that failed

cmd/alertmanager/ingest.go

@@ -32,13 +32,17 @@ func handleSnsIngest(ctx context.Context, event events.SNSEvent) error {
 		})
 	}
 
-	_, err = ingestAlerts(ctx, candidateAlerts, app)
-	return err
+	return ingestAlerts(ctx, candidateAlerts, app)
 }
 
 // this is somewhat of a hack to pass candidate-phase alerts as the same struct as we get
 // from the actual persisted State
-func ingestAlerts(ctx context.Context, candidateAlerts []amstate.Alert, app *amstate.App) (bool, error) {
+func ingestAlerts(ctx context.Context, candidateAlerts []amstate.Alert, app *amstate.App) error {
+	_, err := ingestAlertsAndReturnCreatedFlag(ctx, candidateAlerts, app)
+	return err
+}
+
+func ingestAlertsAndReturnCreatedFlag(ctx context.Context, candidateAlerts []amstate.Alert, app *amstate.App) (bool, error) {
 	ingestedAny := false
 
 	maxActiveAlerts, err := getMaxFiringAlerts()

cmd/alertmanager/restapi.go

@@ -40,7 +40,7 @@ func handleRestCall(ctx context.Context, req events.APIGatewayProxyRequest) (*ev
 		}
 		alert.Id = amstate.NewAlertId()
 
-		created, err := ingestAlerts(ctx, []amstate.Alert{alert}, app)
+		created, err := ingestAlertsAndReturnCreatedFlag(ctx, []amstate.Alert{alert}, app)
 		if err != nil {
 			return apigatewayutils.InternalServerError(err.Error()), nil
 		}

cmd/alertmanager/scheduled.go

@@ -101,8 +101,7 @@ func alertForDeadExpiredMansSwitches(ctx context.Context, app *amstate.App, now
 	}
 
 	// ok with len(alerts) == 0
-	_, err := ingestAlerts(ctx, candidateAlerts, app)
-	return err
+	return ingestAlerts(ctx, candidateAlerts, app)
 }
 
 var plusDayAtStaticTimeRe = regexp.MustCompile(`^\+([0-9]+)d@([0-9]{2}):([0-9]{2})$`)