Store a target's settings as columns (closes #543)

A target's settings move from the per-type JSON string in targets.config to columns: url, headers, timeout_seconds, forward_query, archive_expiry and archive_rotation. A column a type does not use stays empty. headers holds the header map as JSON text through GORM's JSON serializer, and archive_expiry holds a time.Duration, 0 meaning never. The forms check each setting once, with the same refusals and messages, and the edit form is filled from the columns, so the per-type config structs, their parsers and the "could not be read" branches are gone. A delivery task carries the six settings in place of the JSON string; tests check that each copy into a task, and back out of one, keeps all six. Model: opus-5-5
2026-10-15 23:02:39 +02:00
parent ded39aa158
commit 8406c77949
71 changed files with 1665 additions and 2168 deletions
@@ -8,6 +8,7 @@ import (
 	"log/slog"
 	"net/http"
 	"net/http/httptest"
+	"strconv"
 	"sync"
 	"testing"
 	"time"
@@ -354,7 +355,7 @@ func TestHandleIndex_Authenticated(t *testing.T) {
 	)
 }

-func TestBuildSlackTargetConfig_AcceptsPublicURL(t *testing.T) {
+func TestSetSlackTargetSettings_AcceptsPublicURL(t *testing.T) {
 	t.Parallel()

 	var h *handlers.Handlers
@@ -364,16 +365,17 @@ func TestBuildSlackTargetConfig_AcceptsPublicURL(t *testing.T) {

 	t.Cleanup(app.RequireStop)

-	cfg, errMsg, err := h.BuildSlackTargetConfigForTest(
-		t.Context(), "http://93.184.216.34/services/T00/B00/xxx",
-	)
+	const hookURL = "http://93.184.216.34/services/T00/B00/xxx"
+
+	var target database.Target
+
+	errMsg := h.SetSlackTargetSettingsForTest(t.Context(), &target, hookURL)

-	require.NoError(t, err)
 	assert.Empty(t, errMsg)
-	assert.Contains(t, cfg, "webhookUrl")
+	assert.Equal(t, hookURL, target.URL)
 }

-func TestBuildSlackTargetConfig_RejectsReservedURL(t *testing.T) {
+func TestSetSlackTargetSettings_RejectsReservedURL(t *testing.T) {
 	t.Parallel()

 	var h *handlers.Handlers
@@ -383,13 +385,14 @@ func TestBuildSlackTargetConfig_RejectsReservedURL(t *testing.T) {

 	t.Cleanup(app.RequireStop)

-	cfg, errMsg, err := h.BuildSlackTargetConfigForTest(
-		t.Context(), "http://169.254.169.254/latest/meta-data/",
+	var target database.Target
+
+	errMsg := h.SetSlackTargetSettingsForTest(
+		t.Context(), &target, "http://169.254.169.254/latest/meta-data/",
 	)

-	require.NoError(t, err)
 	assert.Contains(t, errMsg, "Invalid target URL")
-	assert.Empty(t, cfg)
+	assert.Empty(t, target.URL)
 }

 func TestRenderTemplate(t *testing.T) {
@@ -483,72 +486,100 @@ func TestRenderTemplateMidRenderErrorSendsNoPartialBody(t *testing.T) {
 	)
 }

-func TestBuildDatabaseTargetConfig_Valid(t *testing.T) {
+func TestSetDatabaseTargetSettings_Valid(t *testing.T) {
 	t.Parallel()

-	// Empty expiry and rotation: the keep-forever, one-file default,
-	// empty config.
-	cfg, errMsg, err := handlers.BuildDatabaseTargetConfigForTest("", "")
-	require.NoError(t, err)
-	assert.Empty(t, errMsg)
-	assert.Empty(t, cfg)
+	cases := []struct {
+		expiry, rotation string
+		wantExpiry       time.Duration
+		wantRotation     string
+	}{
+		// Empty expiry and rotation: the keep-forever, one-file
+		// default.
+		{"", "", 0, rotationNone},
+		{expiryNever, "", 0, rotationNone},
+		{" 36h ", "", 36 * time.Hour, rotationNone},
+		{"", rotationDaily, 0, rotationDaily},
+		{"90m", rotationHourly, 90 * time.Minute, rotationHourly},
+	}

-	// Explicit never is stored as config.
-	cfg, errMsg, err = handlers.BuildDatabaseTargetConfigForTest("never", "")
-	require.NoError(t, err)
-	assert.Empty(t, errMsg)
-	assert.JSONEq(t, `{"expiry":"never"}`, cfg)
+	for _, tc := range cases {
+		var target database.Target

-	// A positive duration is stored as config.
-	cfg, errMsg, err = handlers.BuildDatabaseTargetConfigForTest("720h", "")
-	require.NoError(t, err)
-	assert.Empty(t, errMsg)
-	assert.JSONEq(t, `{"expiry":"720h"}`, cfg)
+		errMsg := handlers.SetDatabaseTargetSettingsForTest(
+			&target, tc.expiry, tc.rotation,
+		)

-	// A rotation is stored as config, with or without an expiry.
-	cfg, errMsg, err = handlers.BuildDatabaseTargetConfigForTest("", "daily")
-	require.NoError(t, err)
-	assert.Empty(t, errMsg)
-	assert.JSONEq(t, `{"rotation":"daily"}`, cfg)
-
-	cfg, errMsg, err = handlers.BuildDatabaseTargetConfigForTest(
-		"720h", "hourly",
-	)
-	require.NoError(t, err)
-	assert.Empty(t, errMsg)
-	assert.JSONEq(t, `{"expiry":"720h","rotation":"hourly"}`, cfg)
+		assert.Empty(t, errMsg, tc)
+		assert.Equal(t, tc.wantExpiry, target.ArchiveExpiry, tc)
+		assert.Equal(t, tc.wantRotation, target.ArchiveRotation, tc)
+	}
 }

-func TestBuildDatabaseTargetConfig_RejectsBadExpiry(
+// TestSetDatabaseTargetSettings_RejectsBadExpiry pins each refusal's
+// whole message, as the form shows it.
+func TestSetDatabaseTargetSettings_RejectsBadExpiry(
 	t *testing.T,
 ) {
 	t.Parallel()

-	for _, bad := range []string{"nonsense", "7d", "-5h"} {
-		cfg, errMsg, err := handlers.BuildDatabaseTargetConfigForTest(bad, "")
+	cases := map[string]string{
+		"nonsense": `Invalid archive expiry: expiry must be "never" or ` +
+			`a Go duration such as "720h": time: invalid duration ` +
+			`"nonsense"`,
+		"7d": `Invalid archive expiry: expiry must be "never" or a Go ` +
+			`duration such as "720h": time: unknown unit "d" in ` +
+			`duration "7d"`,
+		"-5h": `Invalid archive expiry: expiry must be a positive ` +
+			`duration or "never": "-5h"`,
+	}

-		require.NoError(t, err)
-		assert.Contains(
-			t, errMsg, "Invalid archive expiry",
-			"expiry %q should be refused", bad,
+	for bad, want := range cases {
+		var target database.Target
+
+		errMsg := handlers.SetDatabaseTargetSettingsForTest(
+			&target, bad, "",
 		)
-		assert.Empty(t, cfg)
+
+		assert.Equal(t, want, errMsg, "expiry %q", bad)
 	}
 }

-func TestBuildDatabaseTargetConfig_RejectsBadRotation(
+func TestSetDatabaseTargetSettings_RejectsBadRotation(
 	t *testing.T,
 ) {
 	t.Parallel()

 	for _, bad := range []string{"weekly", "Daily", " none"} {
-		cfg, errMsg, err := handlers.BuildDatabaseTargetConfigForTest("", bad)
+		var target database.Target

-		require.NoError(t, err)
-		assert.Contains(
-			t, errMsg, "Invalid archive rotation",
-			"rotation %q should be refused", bad,
+		errMsg := handlers.SetDatabaseTargetSettingsForTest(
+			&target, "", bad,
+		)
+
+		assert.Equal(
+			t,
+			"Invalid archive rotation: rotation must be none, "+
+				"monthly, daily or hourly: "+strconv.Quote(bad),
+			errMsg,
 		)
-		assert.Empty(t, cfg)
+	}
+}
+
+// TestFormatArchiveExpiry covers the expiries the expiry choices do
+// not: TestArchiveExpiryChoices shows the edit form starting on each
+// choice. An expiry in whole hours is written in hours, and any other
+// as Go writes it, which the form accepts back unchanged.
+func TestFormatArchiveExpiry(t *testing.T) {
+	t.Parallel()
+
+	cases := map[time.Duration]string{
+		0:                expiryNever,
+		36 * time.Hour:   "36h",
+		90 * time.Minute: "1h30m0s",
+	}
+
+	for expiry, want := range cases {
+		assert.Equal(t, want, handlers.FormatArchiveExpiryForTest(expiry))
 	}
 }