update Event Horizon, gokit, Go & buildkit-golang, build boilerplate

- gokit `logex` -> `log/slog`

- gokit bump needed lots of small changes

- go fix

- fix lint nags (mainly initialisms)

Author: joonas-fi

.config/turbobob.json

@@ -0,0 +1,21 @@
+{
+	"for_description_of_this_file_see": "https://github.com/function61/turbobob",
+	"version_major": 1,
+	"project_name": "lambda-alertmanager",
+	"builders": [
+		{
+			"name": "default",
+			"uses": "docker://fn61/buildkit-golang:20260604_1344_ff654e98",
+			"mount_source": "",
+			"mount_destination": "/workspace",
+			"workdir": "/workspace",
+			"commands": {
+				"build": ["build-go-project.sh", "--directory=cmd/alertmanager/", "--binary-basename=alertmanager", "--aws-lambda-zip"],
+				"dev": ["bash"]
+			}
+		}
+	],
+	"os_arches": {
+		"linux-amd64": true
+	}
+}

.github/workflows/build.yml

@@ -2,17 +2,13 @@ name: Build
 
 on: [push]
 
+permissions:
+  contents: read
+  # push container images to GHCR
+  packages: write
+
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Download Turbo Bob
-      run: curl --fail --location --output bob https://dl.bintray.com/function61/dl/turbobob/20200220_1142_9c1ea959/bob_linux-amd64 && chmod +x bob
-    - name: Build with Turbo Bob
-      run: CI_REVISION_ID="$GITHUB_SHA" ./bob build --publish-artefacts
-      # unfortunately there doesn't seem to be a way to "expose all secrets", so you must
-      # list here each secret to pass on to the build
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        EVENTHORIZON: ${{ secrets.EVENTHORIZON }}
+  reusable-build:
+    # this basically just runs `$ bob build` (for details see https://github.com/function61/turbobob)
+    uses: function61/turbobob-action/.github/workflows/build.yml@main
+

bin/build.sh

@@ -7,8 +7,7 @@ import (
 	"time"
 
 	"github.com/function61/eventhorizon/pkg/ehevent"
-	"github.com/function61/gokit/ossignal"
-	"github.com/function61/gokit/stringutils"
+	"github.com/function61/gokit/strings/stringutils"
 	"github.com/function61/lambda-alertmanager/pkg/amdomain"
 	"github.com/function61/lambda-alertmanager/pkg/amstate"
 	"github.com/scylladb/termtables"
@@ -25,32 +24,29 @@ func alertEntry() *cobra.Command {
 		Use:   "mk [subject] [details]",
 		Short: "Raise an alert",
 		Args:  cobra.ExactArgs(2),
-		Run: func(cmd *cobra.Command, args []string) {
-			exitIfError(alertRaise(
-				ossignal.InterruptOrTerminateBackgroundCtx(nil),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return alertRaise(
+				cmd.Context(),
 				args[0],
-				args[1]))
+				args[1])
 		},
 	})
 
 	cmd.AddCommand(&cobra.Command{
 		Use:   "ls",
 		Short: "List active alerts",
 		Args:  cobra.NoArgs,
-		Run: func(cmd *cobra.Command, args []string) {
-			exitIfError(alertList(
-				ossignal.InterruptOrTerminateBackgroundCtx(nil)))
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			return alertList(cmd.Context())
 		},
 	})
 
 	cmd.AddCommand(&cobra.Command{
 		Use:   "ack [id]",
 		Short: "Acknowledge an alert",
 		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			exitIfError(alertAck(
-				ossignal.InterruptOrTerminateBackgroundCtx(nil),
-				args[0]))
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return alertAck(cmd.Context(), args[0])
 		},
 	})
 
@@ -64,7 +60,7 @@ func alertRaise(ctx context.Context, subject string, details string) error {
 	}
 
 	raised := amdomain.NewAlertRaised(
-		amstate.NewAlertId(),
+		amstate.NewAlertID(),
 		subject,
 		details,
 		ehevent.MetaSystemUser(time.Now()))
@@ -89,7 +85,7 @@ func alertList(ctx context.Context) error {
 
 	for _, alert := range app.State.ActiveAlerts() {
 		view.AddRow(
-			alert.Id,
+			alert.ID,
 			alert.Timestamp.Format(time.RFC3339),
 			alert.Subject,
 			stringutils.Truncate(removeLinebreaks(alert.Details), 50))
@@ -100,19 +96,19 @@ func alertList(ctx context.Context) error {
 	return nil
 }
 
-func alertAck(ctx context.Context, alertId string) error {
+func alertAck(ctx context.Context, alertID string) error {
 	app, err := getApp(ctx)
 	if err != nil {
 		return err
 	}
 
 	acked := amdomain.NewAlertAcknowledged(
-		alertId,
+		alertID,
 		ehevent.MetaSystemUser(time.Now()))
 
 	return app.Reader.TransactWrite(ctx, func() error {
-		if !amstate.HasAlertWithId(alertId, app.State.ActiveAlerts()) {
-			return fmt.Errorf("no alert: %s", alertId)
+		if !amstate.HasAlertWithID(alertID, app.State.ActiveAlerts()) {
+			return fmt.Errorf("no alert: %s", alertID)
 		}
 
 		return app.AppendAfter(ctx, app.State.Version(), acked)

cmd/alertmanager/alerts.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/function61/eventhorizon/pkg/ehevent"
-	"github.com/function61/gokit/ossignal"
 	"github.com/function61/lambda-alertmanager/pkg/amdomain"
 	"github.com/function61/lambda-alertmanager/pkg/amstate"
 	"github.com/scylladb/termtables"
@@ -25,10 +24,8 @@ func deadMansSwitchEntry() *cobra.Command {
 		Use:   "ls",
 		Short: "List dead man´s switches",
 		Args:  cobra.NoArgs,
-		Run: func(cmd *cobra.Command, args []string) {
-			exitIfError(deadmansswitchList(
-				ossignal.InterruptOrTerminateBackgroundCtx(nil),
-				expired))
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			return deadmansswitchList(cmd.Context(), expired)
 		},
 	}
 
@@ -40,33 +37,33 @@ func deadMansSwitchEntry() *cobra.Command {
 		Use:   "rm [id]",
 		Short: "Remove a switch",
 		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			exitIfError(deadmansswitchRemove(
-				ossignal.InterruptOrTerminateBackgroundCtx(nil),
-				args[0]))
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return deadmansswitchRemove(cmd.Context(), args[0])
 		},
 	})
 
 	cmd.AddCommand(&cobra.Command{
 		Use:   "checkin [subject] [ttl]",
 		Short: "Make a checkin",
 		Args:  cobra.ExactArgs(2),
-		Run: func(cmd *cobra.Command, args []string) {
-			ctx := ossignal.InterruptOrTerminateBackgroundCtx(nil)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			ttl, err := parseTTLSpec(args[1], time.Now())
+			if err != nil {
+				return err
+			}
 
-			ttl, err := parseTtlSpec(args[1], time.Now())
-			exitIfError(err)
-
-			app, err := getApp(ctx)
-			exitIfError(err)
+			app, err := getApp(cmd.Context())
+			if err != nil {
+				return err
+			}
 
 			_, err = deadmansswitchCheckin(
-				ctx,
+				cmd.Context(),
 				args[0],
 				ttl,
 				app,
 				time.Now())
-			exitIfError(err)
+			return err
 		},
 	})
 
@@ -88,7 +85,7 @@ func deadmansswitchList(ctx context.Context, expired bool) error {
 	view.AddHeaders("Subject", "TTL")
 
 	for _, dms := range dmss {
-		view.AddRow(dms.Subject, dms.Ttl.Format(time.RFC3339))
+		view.AddRow(dms.Subject, dms.TTL.Format(time.RFC3339))
 	}
 
 	fmt.Println(view.Render())
@@ -142,7 +139,7 @@ func deadmansswitchCheckin(
 
 		if alert := amstate.FindAlertWithSubject(subject, app.State.ActiveAlerts()); alert != nil {
 			events = append(events, amdomain.NewAlertAcknowledged(
-				alert.Id,
+				alert.ID,
 				ehevent.MetaSystemUser(now)))
 
 			alertAcked = true

cmd/alertmanager/deadmansswitches.go

@@ -10,7 +10,7 @@ import (
 	"github.com/function61/eventhorizon/pkg/ehevent"
 	"github.com/function61/eventhorizon/pkg/ehreader"
 	"github.com/function61/eventhorizon/pkg/ehreader/ehreadertest"
-	"github.com/function61/gokit/assert"
+	"github.com/function61/gokit/testing/assert"
 	"github.com/function61/lambda-alertmanager/pkg/amdomain"
 	"github.com/function61/lambda-alertmanager/pkg/amstate"
 )
@@ -45,11 +45,11 @@ func TestDeadmansswitchCheckin(t *testing.T) {
 		app,
 		t0)
 	assert.Ok(t, err)
-	assert.Assert(t, !alertAcked)
+	assert.Equal(t, alertAcked, false)
 
 	dumper := newEventDumper(testStreamName, eventLog, amdomain.Types)
 
-	assert.EqualString(t, dumper.Dump(), `
+	assert.Equal(t, dumper.Dump(), `
 2019-09-07T12:00:00.000Z UnnoticedAlertsNotified    {"AlertIds":["dummyid"]}
 2019-09-07T12:00:00.000Z DeadMansSwitchCreated    {"Subject":"My test switch","Ttl":"2019-09-07T13:00:00Z"}
 2019-09-07T12:00:00.000Z DeadMansSwitchCheckin    {"Subject":"My test switch","Ttl":"2019-09-07T13:00:00Z"}`)
@@ -63,9 +63,9 @@ func TestDeadmansswitchCheckin(t *testing.T) {
 		app,
 		t0.Add(30*time.Minute))
 	assert.Ok(t, err)
-	assert.Assert(t, !alertAcked)
+	assert.Equal(t, alertAcked, false)
 
-	assert.EqualString(t, dumper.Dump(), `
+	assert.Equal(t, dumper.Dump(), `
 2019-09-07T12:00:00.000Z UnnoticedAlertsNotified    {"AlertIds":["dummyid"]}
 2019-09-07T12:00:00.000Z DeadMansSwitchCreated    {"Subject":"My test switch","Ttl":"2019-09-07T13:00:00Z"}
 2019-09-07T12:00:00.000Z DeadMansSwitchCheckin    {"Subject":"My test switch","Ttl":"2019-09-07T13:00:00Z"}