remove awkward name httpMonitorScanAndAlertFailuresWithApp()

Author: joonas-fi

cmd/alertmanager/httpmonitors.go

@@ -81,8 +81,12 @@ func httpMonitorEntry() *cobra.Command {
 		Short: "Runs all enabled monitors and raises alerts if appropriate",
 		Args:  cobra.NoArgs,
 		Run: func(cmd *cobra.Command, args []string) {
-			exitIfError(httpMonitorScanAndAlertFailures(
-				ossignal.InterruptOrTerminateBackgroundCtx(nil)))
+			ctx := ossignal.InterruptOrTerminateBackgroundCtx(nil)
+
+			app, err := getApp(ctx)
+			exitIfError(err)
+
+			exitIfError(httpMonitorScanAndAlertFailures(ctx, app))
 		},
 	})
 

cmd/alertmanager/httpmonitorscanner.go

@@ -19,16 +19,7 @@ type monitorFailure struct {
 	monitor amstate.HttpMonitor
 }
 
-func httpMonitorScanAndAlertFailures(ctx context.Context) error {
-	app, err := getApp(ctx)
-	if err != nil {
-		return err
-	}
-
-	return httpMonitorScanAndAlertFailuresWithApp(ctx, app)
-}
-
-func httpMonitorScanAndAlertFailuresWithApp(ctx context.Context, app *amstate.App) error {
+func httpMonitorScanAndAlertFailures(ctx context.Context, app *amstate.App) error {
 	startOfScan := time.Now()
 
 	failures := scanMonitors(

cmd/alertmanager/scheduled.go

@@ -28,7 +28,7 @@ func handleCloudwatchScheduledEvent(ctx context.Context, now time.Time) error {
 		return err
 	}
 
-	if err := httpMonitorScanAndAlertFailuresWithApp(ctx, app); err != nil {
+	if err := httpMonitorScanAndAlertFailures(ctx, app); err != nil {
 		return err
 	}