Give the target type choice a width the stylesheet defines

The type select used w-40, which the committed static/css/tailwind.css
has no rule for, so it took the full width and pushed Next and Cancel
onto the line below. It now uses w-32, as the old type select did, so
the type choice, Next and Cancel sit on one row.

Model: opus-5-5

README.md

@@ -79,8 +79,7 @@ directory, read once at startup before anything else looks at the
 environment.
 
 The file is optional and having none is the normal case for a
-deployment. An empty file is the same as none: it has nothing in it to
+deployment. A file that is there but cannot be parsed aborts startup
-apply. A file that is there but cannot be parsed aborts startup
 with a message naming it, because a single malformed line makes none
 of the file apply: every variable in it silently reverts to its
 default, which is exactly the failure [Invalid values abort
@@ -565,13 +564,11 @@ its Argon2id hash. There is no second account and no forgot-password
 flow, so the banner and the reset command below are the only two ways
 in.
 
-A start that finds no `webhooker.db` in `DATA_DIR`, or a zero-length
+A start that finds no `webhooker.db` in `DATA_DIR` also logs
-one (which SQLite opens as an empty database), also logs
 `created a new, empty database` at `WARN`, with the file's path,
 shortly before the banner. On a deployment that has run before, that
-line means `webhooker.db` was lost: either the file was missing, most
+line means `DATA_DIR` was empty, most often because its volume is not
-often because the volume holding `DATA_DIR` is not mounted, or it was
+mounted.
-zero-length, as a truncated copy leaves it.
 
 #### Recovering a lost admin password
 
@@ -615,8 +612,7 @@ What it will not do:
   the old password, so a reset underneath it would report a change the
   service does not honour.
 - **Create anything.** A `DATA_DIR` that does not exist, or that holds
-  no `webhooker.db` or a zero-length one, is an error naming the path
+  no `webhooker.db`, is an error rather than a new empty deployment —
-  rather than a new empty deployment —
   a mistyped path must not be built out and then reported as a success.
 - **Create an account.** A username that does not exist is an error.
   `resetpw` changes an existing account's password and nothing else.
@@ -997,16 +993,6 @@ its sidecars; a killed or crashed instance leaves them, and they must be
 carried with the `.db`. An archive the service has not opened since a
 crash keeps that crash's sidecars, even across a later clean stop.
 
-A missing sidecar is therefore normal, and SQLite makes new ones, so a
-`-wal` lost from a copy cannot be reported: the transactions it held
-are simply gone. SQLite reads a `-wal` up to its first damaged frame,
-as after a crash, and rebuilds a damaged `-shm`. A sidecar with the
-wrong mode is set back to `0600` when its database is opened. A
-directory in place of either is refused then, with an error naming it:
-for `webhooker.db` the server and `webhooker resetpw` stop, and an event
-or archive database fails as a damaged one does (see
-[Database Architecture](#database-architecture)).
-
 Configuration is **not** in `DATA_DIR` — it comes from the environment
 and from a `.env` file read out of the process working directory. Back
 that up with your deployment config, separately.
@@ -1090,19 +1076,13 @@ with any `-wal`/`-shm` beside it, or wait until there are none.
 1. Stop the service.
 
 2. Restore the **whole set together**: `webhooker.db` *and* every
-   `events-*.db` *and* every `archive-*.db`. A restore that leaves out
+   `events-*.db` *and* every `archive-*.db`. A partial restore fails
-   `webhooker.db` or an `events-*.db` is reported, not refused; one
+   quietly rather than loudly. Every database is opened `mode=rwc`, so a
-   that leaves out an `archive-*.db` or a `-wal` (step 3) is not
+   missing `events-{uuid}.db` is **created empty** on first access
-   reported at all. Every database is opened `mode=rwc`, so a
+   instead of erroring — the webhook comes back with its configuration
-   missing `events-{uuid}.db` is **created empty**: the webhook comes
+   intact and its entire event history silently gone. Event databases
-   back with its configuration intact and its entire event history
+   restored without `webhooker.db` are simply orphaned; nothing
-   gone. The first start after the restore logs
+   references their UUIDs.
-   `created a new, empty database` at `WARN` for each such file, with
-   its path, as it does for a missing `webhooker.db`. A missing
-   `archive-*.db` is recreated at its target's next delivery without a
-   warning, since moving one away is a supported workflow. Event
-   databases restored without `webhooker.db` are simply orphaned;
-   nothing references their UUIDs.
 
 3. Carry any `*.db-wal` and `*.db-shm` files that are in the backup.
    They are part of the database, and dropping a `-wal` silently
@@ -1351,10 +1331,7 @@ only a choice of type with Next and Cancel, Next shows only that type's fields
 and saving adds the target; a refused target comes back with its form open, the
 values entered and the reason, and after Cancel the next Add starts with an
 empty form and no reason; the Copy button beside an entrypoint URL reads
-"Copied" once clicked; an entrypoint's Edit button shows its edit form in place
+"Copied" once clicked; an event expands and collapses, and so do a delivery's
-of its description and hides until the form closes, Cancel hides the form and
-drops what was typed, as does leaving the page and going back to it, and Save
-changes the description; an event expands and collapses, and so do a delivery's
 attempts inside it; and at phone width the menu button opens and closes the
 mobile menu. It also fails if the browser reports a console warning or error, an
 uncaught exception, or anything the policy refused. `make check` and the image
@@ -1971,19 +1948,10 @@ encryption key is generated and stored, and an `admin` user is created.
   the deliveries per target, kept through retention
 
 Per-webhook databases are created automatically when a webhook is
-created. They are managed by the `WebhookDBManager` component, which
+created (and lazily on first access for webhooks that predate this
+feature). They are managed by the `WebhookDBManager` component, which
 handles connection pooling, lazy opening, migrations, and cleanup.
 
-A per-webhook database that is missing or zero-length later means its
-webhook's events and pending deliveries are gone. The next time it is
-opened, an empty one is created in its place, so the webhook keeps
-receiving, and `created a new, empty database` is logged at `WARN` with
-the file's path. Every webhook's database is opened when the service
-starts, so this appears at the latest at the first start after the
-file was lost. A file there that SQLite cannot open fails that
-webhook alone, with an `ERROR` naming the webhook on every access and a
-500 to its senders, so one damaged file does not stop the others.
-
 This separation provides:
 
 - **Isolation** — a high-volume webhook won't cause lock contention or
@@ -2048,9 +2016,7 @@ After each write the archive handle is closed
 and reopened, debounced to at most once per second, so an operator can
 move the archive file away for offline archiving without stopping the
 service; a moved or removed archive file is recreated automatically on
-the next write. A zero-length archive file is written to as a new
+the next write. An optional `expiry` in the target's config JSON (e.g.
-archive: SQLite opens it as an empty database, so it holds nothing to
-lose. An optional `expiry` in the target's config JSON (e.g.
 `{"expiry":"720h"}`) is validated when the target is created — the
 default (unset or the literal `never`) keeps rows forever — and rows
 older than the expiry are pruned each time the archive is (re)opened. An
@@ -2966,7 +2932,6 @@ returns to the page that was asked for.
 | `POST` | `/hook/{id}/deliveries/{deliveryID}/replay` | Replay a finished delivery: creates a new delivery for the same event against the target's current configuration (30 per minute per bucket, then `429`) |
 | `POST` | `/hook/{id}/events/{eventID}/resubmit` | Resubmit a stored event: creates a new event copying it and fans that out to every currently active target (30 per minute per bucket, then `429`) |
 | `POST` | `/hook/{id}/entrypoints` | Add entrypoint to webhook |
-| `POST` | `/hook/{id}/entrypoints/{entrypointID}/edit` | Change an entrypoint's description; its URL stays the same |
 | `POST` | `/hook/{id}/entrypoints/{entrypointID}/delete` | Delete an entrypoint |
 | `POST` | `/hook/{id}/entrypoints/{entrypointID}/toggle` | Enable or disable an entrypoint |
 | `POST` | `/hook/{id}/targets`     | Add target to webhook |

internal/database/bootstrap_banner_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"log/slog"
-	"os"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -120,26 +119,3 @@ func TestNewDatabase_IsLoggedWithItsPath(t *testing.T) {
 		t, second, created, "an existing database is not new",
 	)
 }
-
-// TestZeroLengthDatabase_IsLoggedAsNew covers what
-// https://git.eeqj.de/sneak/webhooker/issues/290 found: SQLite opens a
-// zero-length file as an empty database, so a start on one is a first
-// start, and it must say so exactly as a start with no file does.
-func TestZeroLengthDatabase_IsLoggedAsNew(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	path := filepath.Join(dir, database.MainDBFileName)
-	require.NoError(t, os.WriteFile(path, nil, database.SQLiteFilePerm))
-
-	var out bytes.Buffer
-
-	db, err := database.Open(dir, slog.New(slog.NewTextHandler(&out, nil)))
-	require.NoError(t, err)
-	require.NoError(t, db.Close())
-
-	assert.Contains(
-		t, out.String(),
-		`level=WARN msg="created a new, empty database" path=`+path,
-	)
-}

internal/database/database.go

@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"log/slog"
 	"os"
 	"path/filepath"
@@ -202,7 +203,8 @@ func (d *Database) connectTo(dataDir string) error {
 	// Checked before opening, which creates the file. A DATA_DIR that
 	// is unexpectedly empty -- its volume not mounted, say -- looks
 	// exactly like a first start, so a new database is a warning.
-	created := missingOrEmpty(dbPath)
+	_, statErr := os.Stat(dbPath)
+	created := errors.Is(statErr, fs.ErrNotExist)
 
 	// Opened through OpenSQLite so this handle carries the same WAL
 	// journaling, busy timeout, immediate-transaction locking, and pool
@@ -211,15 +213,13 @@ func (d *Database) connectTo(dataDir string) error {
 	if err != nil {
 		d.log.Error(
 			"failed to open database",
-			"path", dbPath,
 			"error", err,
 		)
 
 		return err
 	}
 
-	// Then use it with GORM. Its errors are SQLite's alone and name no
+	// Then use it with GORM
-	// file, so the path is added to them here.
 	db, err := gorm.Open(sqlite.Dialector{
 		Conn: sqlDB,
 	}, &gorm.Config{
@@ -229,11 +229,10 @@ func (d *Database) connectTo(dataDir string) error {
 	if err != nil {
 		d.log.Error(
 			"failed to connect to database",
-			"path", dbPath,
 			"error", err,
 		)
 
-		return fmt.Errorf("connecting to %s: %w", dbPath, err)
+		return err
 	}
 
 	d.db = db
@@ -244,12 +243,8 @@ func (d *Database) connectTo(dataDir string) error {
 		d.log.Info("connected to database", "path", dbPath)
 	}
 
-	err = d.migrate()
+	// Run migrations
-	if err != nil {
+	return d.migrate()
-		return fmt.Errorf("migrating %s: %w", dbPath, err)
-	}
-
-	return nil
 }
 
 func (d *Database) migrate() error {

internal/database/database_test.go

@@ -1,15 +1,9 @@
 package database_test
 
 import (
-	"bytes"
 	"context"
-	"log/slog"
-	"os"
-	"path/filepath"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"go.uber.org/fx/fxtest"
 	"sneak.berlin/go/webhooker/internal/config"
 	"sneak.berlin/go/webhooker/internal/database"
@@ -106,22 +100,3 @@ func TestDatabaseConnection(t *testing.T) {
 		)
 	}
 }
-
-// TestOpen_UnreadableDatabaseIsNamed pins
-// https://git.eeqj.de/sneak/webhooker/issues/459: when SQLite cannot
-// read webhooker.db, the error that stops the server and `webhooker
-// resetpw` names the file, not only SQLite's own message.
-func TestOpen_UnreadableDatabaseIsNamed(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	path := filepath.Join(dir, database.MainDBFileName)
-	require.NoError(t, os.WriteFile(
-		path, bytes.Repeat([]byte("junk"), 1024), database.SQLiteFilePerm,
-	))
-
-	_, err := database.Open(dir, slog.New(slog.DiscardHandler))
-	require.Error(t, err)
-	assert.Contains(t, err.Error(), path)
-	assert.Contains(t, err.Error(), "file is not a database")
-}

internal/database/retention.go

@@ -184,8 +184,8 @@ func (r *RetentionReaper) sweep(ctx context.Context) {
 
 		wh := webhooks[i]
 
-		// A missing database has nothing to reap. Restart recovery
+		// Nothing to reap if the per-webhook database has never
-		// reports a lost one (see WebhookDBManager.GetDB).
+		// been created.
 		if !r.dbManager.DBExists(wh.ID) {
 			continue
 		}

internal/database/sqlite_mode_test.go

@@ -182,29 +182,6 @@ func TestOpenSQLiteTightensFilesLeftWorldReadable(t *testing.T) {
 	requireDatabaseSetOwnerOnly(t, path)
 }
 
-// TestOpenSQLiteRefusesADirectorySidecar covers a directory in place
-// of -wal or -shm. Beside a -shm directory SQLite opens the database
-// read-only without a word, and every write then fails naming no file,
-// so the open must stop instead, naming the directory.
-func TestOpenSQLiteRefusesADirectorySidecar(t *testing.T) {
-	t.Parallel()
-
-	for _, suffix := range []string{"-wal", "-shm"} {
-		t.Run(suffix, func(t *testing.T) {
-			t.Parallel()
-
-			path := filepath.Join(t.TempDir(), database.MainDBFileName)
-			require.NoError(t, os.Mkdir(path+suffix, 0o700))
-
-			_, err := database.OpenSQLite(
-				path, database.SQLiteModeCreate,
-			)
-			require.Error(t, err)
-			assert.Contains(t, err.Error(), path+suffix)
-		})
-	}
-}
-
 // TestOpenSQLiteExistingModeDoesNotCreateTheFile guards the mechanism
 // the fix uses: OpenSQLite now creates the database file itself, and
 // must not do so for a caller that asked for an existing database. An

internal/database/sqlite_open.go

@@ -7,7 +7,6 @@ import (
 	"io/fs"
 	"net/url"
 	"os"
-	"syscall"
 	"time"
 
 	_ "modernc.org/sqlite" // Pure Go SQLite driver
@@ -94,8 +93,7 @@ const (
 const SQLiteFilePerm fs.FileMode = 0o600
 
 // reserveSQLiteFile puts path at SQLiteFilePerm before the driver ever
-// touches it, and tightens any sidecar already on disk. A directory in
+// touches it, and tightens any sidecar already on disk.
-// place of any of them is an error naming it.
 //
 // The mode has to be settled here rather than by a chmod after opening,
 // because SQLite picks it: robust_open substitutes
@@ -145,15 +143,7 @@ func reserveSQLiteFile(path string, create bool) error {
 	for _, p := range append(
 		[]string{path}, sqliteSidecarPaths(path)...,
 	) {
-		// Chmod accepts a directory, and SQLite opens a database whose
+		err := os.Chmod(p, SQLiteFilePerm)
-		// -shm is one read-only, without a word: every write then
-		// fails naming no file.
-		info, err := os.Stat(p)
-		if err == nil && info.IsDir() {
-			return fmt.Errorf("securing %s: %w", p, syscall.EISDIR)
-		}
-
-		err = os.Chmod(p, SQLiteFilePerm)
 		if err != nil && !errors.Is(err, fs.ErrNotExist) {
 			return fmt.Errorf("securing %s: %w", p, err)
 		}
@@ -162,20 +152,6 @@ func reserveSQLiteFile(path string, create bool) error {
 	return nil
 }
 
-// missingOrEmpty reports whether opening path in SQLiteModeCreate
-// would start a new, empty database: the file is not there, or it is
-// zero-length, which SQLite opens as an empty database. A file left at
-// zero length by an interrupted first start or a truncated copy holds
-// as little as a missing one, and must be reported the same way.
-func missingOrEmpty(path string) bool {
-	info, err := os.Stat(path)
-	if errors.Is(err, fs.ErrNotExist) {
-		return true
-	}
-
-	return err == nil && info.Size() == 0
-}
-
 // sqliteSidecarPaths returns the files SQLite maintains beside a
 // database under WAL. They carry the same rows as the database itself,
 // so a fix that tightens only the main file has fixed nothing.

internal/database/webhook_db_manager.go

@@ -98,37 +98,34 @@ func NewWebhookDBManager(
 	return m, nil
 }
 
-// GetDB returns the database connection for a webhook, opening it on
+// GetDB returns the database connection for a webhook,
-// first use.
+// creating the database file lazily if it doesn't exist.
-//
-// The file is made by CreateDB when the webhook is created. One that is
-// missing or zero-length here means the webhook's events and pending
-// deliveries are gone: an empty database is created in its place so
-// the webhook keeps receiving, and that is logged as a warning naming
-// the file, as a new main database is.
 func (m *WebhookDBManager) GetDB(
 	webhookID string,
 ) (*gorm.DB, error) {
-	return m.getDB(webhookID, false)
+	// Fast path: already open
-}
+	if val, ok := m.dbs.Load(webhookID); ok {
+		return asGormDB(val, webhookID)
+	}
 
-// GetDBIf is GetDB, done only when check reports true. check runs under
+	// Slow path: open the database under the lock, looking in the
-// the lock DeleteDB holds while it removes the files, so a caller can
+	// cache again first. A caller that raced another one here then
-// confirm the webhook still exists and open its database with no delete
+	// waits for its handle instead of opening a second one.
-// in between. The handle is nil when check reports false. check must
-// not call the manager.
-func (m *WebhookDBManager) GetDBIf(
-	webhookID string, check func() (bool, error),
-) (*gorm.DB, error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
-	ok, err := check()
+	if val, ok := m.dbs.Load(webhookID); ok {
-	if err != nil || !ok {
+		return asGormDB(val, webhookID)
+	}
+
+	db, err := m.openDB(webhookID)
+	if err != nil {
 		return nil, err
 	}
 
-	return m.getDBLocked(webhookID, false)
+	m.dbs.Store(webhookID, db)
+
+	return db, nil
 }
 
 // asGormDB returns a value read from the cache as the database
@@ -146,12 +143,12 @@ func asGormDB(val any, webhookID string) (*gorm.DB, error) {
 	return db, nil
 }
 
-// CreateDB creates a new webhook's database file and runs
+// CreateDB explicitly creates a new per-webhook database file
-// migrations.
+// and runs migrations.
 func (m *WebhookDBManager) CreateDB(
 	webhookID string,
 ) error {
-	_, err := m.getDB(webhookID, true)
+	_, err := m.GetDB(webhookID)
 
 	return err
 }
@@ -269,54 +266,6 @@ func (m *WebhookDBManager) DBPath(
 	return m.dbPath(webhookID)
 }
 
-// getDB is GetDB, and CreateDB when isNew is true: the webhook has just
-// been created, so a missing file is expected rather than lost.
-func (m *WebhookDBManager) getDB(
-	webhookID string, isNew bool,
-) (*gorm.DB, error) {
-	// Fast path: already open
-	if val, ok := m.dbs.Load(webhookID); ok {
-		return asGormDB(val, webhookID)
-	}
-
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	return m.getDBLocked(webhookID, isNew)
-}
-
-// getDBLocked is getDB's slow path, run with m.mu held. It looks in the
-// cache again first: a caller that raced another one to the lock then
-// gets its handle instead of opening a second one.
-func (m *WebhookDBManager) getDBLocked(
-	webhookID string, isNew bool,
-) (*gorm.DB, error) {
-	if val, ok := m.dbs.Load(webhookID); ok {
-		return asGormDB(val, webhookID)
-	}
-
-	// Checked before opening, which creates the file. See GetDB.
-	path := m.dbPath(webhookID)
-	replaced := !isNew && missingOrEmpty(path)
-
-	db, err := m.openDB(webhookID)
-	if err != nil {
-		return nil, err
-	}
-
-	if replaced {
-		m.log.Warn(
-			"created a new, empty database",
-			"webhook_id", webhookID,
-			"path", path,
-		)
-	}
-
-	m.dbs.Store(webhookID, db)
-
-	return db, nil
-}
-
 func (m *WebhookDBManager) dbPath(
 	webhookID string,
 ) string {

internal/database/webhook_db_manager_test.go

@@ -289,75 +289,6 @@ func TestWebhookDBManager_LazyCreation(t *testing.T) {
 	assert.True(t, mgr.DBExists(webhookID))
 }
 
-// A webhook's database is made by CreateDB along with the webhook. One
-// that GetDB finds missing or zero-length has lost the webhook's events
-// and pending deliveries, so the empty database made in its place is
-// logged as a warning naming the file
-// (https://git.eeqj.de/sneak/webhooker/issues/290). CreateDB, and
-// reopening a database that is there, log no such warning.
-func TestWebhookDBManager_LostDatabaseIsLogged(t *testing.T) {
-	t.Parallel()
-
-	const created = `level=WARN msg="created a new, empty database"`
-
-	open := func(
-		t *testing.T, prepare func(*database.WebhookDBManager, string),
-	) (string, string) {
-		t.Helper()
-
-		var logs bytes.Buffer
-
-		mgr := database.NewTestWebhookDBManagerWithLogger(
-			t.TempDir(),
-			slog.New(slog.NewTextHandler(&logs, nil)),
-		)
-
-		webhookID := uuid.New().String()
-		prepare(mgr, webhookID)
-
-		_, err := mgr.GetDB(webhookID)
-		require.NoError(t, err)
-		require.NoError(t, mgr.CloseAll())
-
-		return logs.String(),
-			" webhook_id=" + webhookID + " path=" + mgr.DBPath(webhookID)
-	}
-
-	t.Run("missing", func(t *testing.T) {
-		t.Parallel()
-
-		logs, fields := open(
-			t, func(*database.WebhookDBManager, string) {},
-		)
-		assert.Contains(t, logs, created+fields)
-	})
-
-	t.Run("zero-length", func(t *testing.T) {
-		t.Parallel()
-
-		logs, fields := open(
-			t, func(mgr *database.WebhookDBManager, webhookID string) {
-				require.NoError(t, os.WriteFile(
-					mgr.DBPath(webhookID), nil, database.SQLiteFilePerm,
-				))
-			},
-		)
-		assert.Contains(t, logs, created+fields)
-	})
-
-	t.Run("created with the webhook, then reopened", func(t *testing.T) {
-		t.Parallel()
-
-		logs, _ := open(
-			t, func(mgr *database.WebhookDBManager, webhookID string) {
-				require.NoError(t, mgr.CreateDB(webhookID))
-				require.NoError(t, mgr.CloseAll())
-			},
-		)
-		assert.NotContains(t, logs, created)
-	})
-}
-
 func TestWebhookDBManager_DeliveryWorkflow(t *testing.T) {
 	t.Parallel()
 

internal/delivery/engine.go

@@ -699,9 +699,10 @@ func (e *Engine) recoverInFlight(ctx context.Context) {
 		default:
 		}
 
-		// Opened even when its file is missing, so that a lost
+		if !e.dbManager.DBExists(webhookID) {
-		// database is reported at start, not when the webhook next
+			continue
-		// receives an event, which for a quiet webhook may be never.
+		}
+
 		e.recoverWebhookDeliveries(ctx, webhookID)
 	}
 }
@@ -709,24 +710,7 @@ func (e *Engine) recoverInFlight(ctx context.Context) {
 func (e *Engine) recoverWebhookDeliveries(
 	ctx context.Context, webhookID string,
 ) {
-	// The web interface is already serving, so the webhook may have
+	webhookDB, err := e.dbManager.GetDB(webhookID)
-	// been deleted since the list was read. Opening its database then
-	// would create the file again after the delete removed it.
-	stillExists := func() (bool, error) {
-		var count int64
-
-		err := e.database.DB().
-			Model(&database.Webhook{}).
-			Where("id = ?", webhookID).
-			Count(&count).Error
-		if err != nil {
-			return false, fmt.Errorf("confirming webhook exists: %w", err)
-		}
-
-		return count > 0, nil
-	}
-
-	webhookDB, err := e.dbManager.GetDBIf(webhookID, stillExists)
 	if err != nil {
 		e.log.Error(
 			"failed to get webhook database for recovery",
@@ -737,10 +721,6 @@ func (e *Engine) recoverWebhookDeliveries(
 		return
 	}
 
-	if webhookDB == nil {
-		return
-	}
-
 	e.recoverPendingDeliveries(
 		ctx, webhookDB, webhookID,
 	)

internal/delivery/engine_integration_test.go

@@ -1,7 +1,6 @@
 package delivery_test
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -1137,85 +1136,6 @@ func TestRecoverInFlight_WithPendingDeliveries(
 	}
 }
 
-// TestRecoverInFlight_ReportsAMissingWebhookDatabase covers a webhook
-// whose database file is gone, after a partial restore say. Restart
-// recovery opens every webhook's database, so the empty one made in its
-// place is reported at start, naming the file
-// (https://git.eeqj.de/sneak/webhooker/issues/290).
-func TestRecoverInFlight_ReportsAMissingWebhookDatabase(t *testing.T) {
-	t.Parallel()
-
-	mainDB := iMainDB(t)
-	webhookID := uuid.New().String()
-	iCreateWebhook(t, mainDB, webhookID, "lost-database")
-
-	var logs bytes.Buffer
-
-	dbMgr := database.NewTestWebhookDBManagerWithLogger(
-		t.TempDir(), slog.New(slog.NewTextHandler(&logs, nil)),
-	)
-	t.Cleanup(func() { _ = dbMgr.CloseAll() })
-
-	engine := delivery.NewTestEngineWithDB(
-		database.NewTestDatabase(mainDB), dbMgr,
-		slog.New(slog.DiscardHandler),
-		&http.Client{Timeout: 5 * time.Second}, 1,
-	)
-
-	engine.ExportRecoverInFlight(context.Background())
-
-	assert.Contains(
-		t, logs.String(),
-		`level=WARN msg="created a new, empty database" webhook_id=`+
-			webhookID+" path="+dbMgr.DBPath(webhookID),
-	)
-}
-
-// TestRecoverInFlight_SkipsAWebhookDeletedAfterTheListIsRead covers a
-// webhook deleted from the web interface while restart recovery runs.
-// Its database file is gone, and recovery must not create it again.
-func TestRecoverInFlight_SkipsAWebhookDeletedAfterTheListIsRead(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	mainDB := iMainDB(t)
-	webhookID := uuid.New().String()
-	iCreateWebhook(t, mainDB, webhookID, "deleted-during-recovery")
-
-	// The first query to return is recovery's read of the list of
-	// webhooks. Deleting the webhook right after it puts the delete
-	// between that read and the opening of the webhook's database.
-	deleted := false
-
-	require.NoError(t, mainDB.Callback().Query().After("gorm:query").
-		Register("delete-after-list", func(*gorm.DB) {
-			if deleted {
-				return
-			}
-
-			deleted = true
-
-			require.NoError(t, mainDB.Delete(
-				&database.Webhook{}, "id = ?", webhookID,
-			).Error)
-		}))
-
-	dbMgr := database.NewTestWebhookDBManager(t.TempDir())
-	t.Cleanup(func() { _ = dbMgr.CloseAll() })
-
-	engine := delivery.NewTestEngineWithDB(
-		database.NewTestDatabase(mainDB), dbMgr,
-		slog.New(slog.DiscardHandler),
-		&http.Client{Timeout: 5 * time.Second}, 1,
-	)
-
-	engine.ExportRecoverInFlight(context.Background())
-
-	require.True(t, deleted)
-	assert.False(t, dbMgr.DBExists(webhookID))
-}
-
 // --- HTTP Config with custom headers ---
 
 func TestDeliverHTTP_CustomTargetHeaders(t *testing.T) {

internal/delivery/terminal_state_test.go

@@ -573,8 +573,6 @@ func TestRecoverPending_TargetDeleted(t *testing.T) {
 
 	s := newISetup(t)
 
-	iCreateWebhook(t, s.MainDB, s.WebhookID, "pending-recovery")
-
 	deliveryID := tSeedDeletedTarget(
 		t, s, "gone-while-pending", "http://example.com/hook",
 		database.DeliveryStatusPending,
@@ -614,8 +612,6 @@ func TestRecoverPending_TargetDeleted_LeavesAnOwnedDeliveryAlone(
 
 	s := newISetup(t)
 
-	iCreateWebhook(t, s.MainDB, s.WebhookID, "owned-recovery")
-
 	deliveryID := tSeedDeletedTarget(
 		t, s, "gone-but-owned", "http://example.com/hook",
 		database.DeliveryStatusPending,

internal/handlers/entrypoint_toggle_test.go

@@ -1,95 +0,0 @@
-package handlers_test
-
-import (
-	"context"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strings"
-	"testing"
-
-	"github.com/go-chi/chi"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gorm.io/gorm"
-	"sneak.berlin/go/webhooker/internal/database"
-)
-
-// TestHandleEntrypointToggle_DoesNotUndoAnEdit proves that a toggle
-// which loaded the entrypoint before an edit of its description was
-// saved does not write the old description back over the edit. The
-// edit is submitted from a callback on the toggle's own read of the
-// entrypoint, so it is saved after that read and before the toggle
-// writes.
-func TestHandleEntrypointToggle_DoesNotUndoAnEdit(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 30)
-	ep := seedEntrypoint(t, env.db, wh.ID)
-	require.True(t, ep.Active)
-
-	router := chi.NewRouter()
-	router.Post(
-		"/hook/{sourceID}/entrypoints/{entrypointID}/edit",
-		env.handlers.HandleEntrypointEdit(),
-	)
-	router.Post(
-		"/hook/{sourceID}/entrypoints/{entrypointID}/toggle",
-		env.handlers.HandleEntrypointToggle(),
-	)
-
-	// post submits one of the entrypoint's forms as the test user and
-	// returns the response's status code.
-	post := func(action string, form url.Values) int {
-		req := httptest.NewRequestWithContext(
-			context.Background(), http.MethodPost,
-			"/hook/"+wh.ID+"/entrypoints/"+ep.ID+"/"+action,
-			strings.NewReader(form.Encode()),
-		)
-		req.Header.Set(
-			"Content-Type", "application/x-www-form-urlencoded",
-		)
-
-		for _, c := range env.cookies {
-			req.AddCookie(c)
-		}
-
-		w := httptest.NewRecorder()
-		router.ServeHTTP(w, req)
-
-		return w.Code
-	}
-
-	var (
-		edited   bool
-		editCode int
-	)
-
-	require.NoError(t, env.db.DB().Callback().Query().
-		After("gorm:query").
-		Register("test:edit_after_toggle_read", func(tx *gorm.DB) {
-			// Only the first read of an entrypoint, the toggle's,
-			// submits the edit.
-			if tx.Statement.Table != "entrypoints" || edited {
-				return
-			}
-
-			edited = true
-			editCode = post(
-				"edit", url.Values{"description": {"Billing sender"}},
-			)
-		}),
-	)
-
-	require.Equal(t, http.StatusSeeOther, post("toggle", nil))
-	require.Equal(t, http.StatusSeeOther, editCode)
-
-	var stored database.Entrypoint
-
-	require.NoError(
-		t, env.db.DB().First(&stored, "id = ?", ep.ID).Error,
-	)
-	assert.False(t, stored.Active)
-	assert.Equal(t, "Billing sender", stored.Description)
-}

internal/handlers/notice.go

@@ -20,7 +20,6 @@ const (
 	webhookSaved          noticeCode = "webhook-saved"
 	webhookDeleted        noticeCode = "webhook-deleted"
 	entrypointAdded       noticeCode = "entrypoint-added"
-	entrypointSaved       noticeCode = "entrypoint-saved"
 	entrypointDeleted     noticeCode = "entrypoint-deleted"
 	entrypointActivated   noticeCode = "entrypoint-activated"
 	entrypointDeactivated noticeCode = "entrypoint-deactivated"
@@ -49,7 +48,6 @@ func noticeFor(r *http.Request) *notice {
 		webhookSaved:          {Text: "Webhook saved."},
 		webhookDeleted:        {Text: "Webhook deleted."},
 		entrypointAdded:       {Text: "Entrypoint added."},
-		entrypointSaved:       {Text: "Entrypoint description saved."},
 		entrypointDeleted:     {Text: "Entrypoint deleted."},
 		entrypointActivated:   {Text: "Entrypoint activated."},
 		entrypointDeactivated: {Text: "Entrypoint deactivated."},

internal/handlers/source_delete_test.go

@@ -86,13 +86,12 @@ var errInjectedDelete = errors.New("injected delete failure")
 // save of an existing row.
 var errInjectedSave = errors.New("injected save failure")
 
-// seedEntrypoint inserts an active entrypoint for a webhook and
+// seedEntrypoint inserts an entrypoint for a webhook.
-// returns it.
 func seedEntrypoint(
 	t *testing.T,
 	db *database.Database,
 	webhookID string,
-) *database.Entrypoint {
+) {
 	t.Helper()
 
 	ep := &database.Entrypoint{
@@ -105,8 +104,6 @@ func seedEntrypoint(
 		t,
 		db.DB().Omit(clause.Associations).Create(ep).Error,
 	)
-
-	return ep
 }
 
 // countRows counts the live (not soft-deleted) rows of a model

internal/handlers/source_management.go

@@ -1406,70 +1406,6 @@ func (h *Handlers) HandleEntrypointCreate() http.HandlerFunc {
 	}
 }
 
-// HandleEntrypointEdit handles changing an entrypoint's description.
-// It writes only the description column, so the entrypoint keeps its
-// URL, and an activate or deactivate saved since the page was shown
-// is not undone.
-func (h *Handlers) HandleEntrypointEdit() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		userID, ok := h.getUserID(r)
-		if !ok {
-			http.Redirect(
-				w, r, "/pages/login", http.StatusSeeOther,
-			)
-
-			return
-		}
-
-		sourceID := chi.URLParam(r, "sourceID")
-		entrypointID := chi.URLParam(r, "entrypointID")
-
-		var webhook database.Webhook
-
-		err := h.db.DB().Where(
-			"id = ? AND user_id = ?", sourceID, userID,
-		).First(&webhook).Error
-		if err != nil {
-			h.renderError(w, r, http.StatusNotFound)
-
-			return
-		}
-
-		// The body size cap is enforced by the MaxBodySize
-		// middleware, which runs before CSRF parses the form.
-		err = r.ParseForm()
-		if err != nil {
-			h.renderError(w, r, http.StatusBadRequest)
-
-			return
-		}
-
-		result := h.db.DB().Model(&database.Entrypoint{}).Where(
-			"id = ? AND webhook_id = ?", entrypointID, webhook.ID,
-		).Update("description", r.PostFormValue("description"))
-		if result.Error != nil {
-			h.serverError(
-				w, r, "failed to edit entrypoint", result.Error,
-			)
-
-			return
-		}
-
-		// The id came from the URL and may name another webhook's
-		// entrypoint, which this webhook does not have.
-		if result.RowsAffected == 0 {
-			h.renderError(w, r, http.StatusNotFound)
-
-			return
-		}
-
-		http.Redirect(
-			w, r, withNotice("/hook/"+webhook.ID, entrypointSaved),
-			http.StatusSeeOther,
-		)
-	}
-}
-
 // HandleTargetCreate handles adding a new target to a webhook.
 func (h *Handlers) HandleTargetCreate() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
@@ -1925,13 +1861,9 @@ func (h *Handlers) HandleEntrypointToggle() http.HandlerFunc {
 				return false, err
 			}
 
-			// Only the active column: saving the whole row would
+			ep.Active = !ep.Active
-			// write back the description read above over an edit
-			// saved since.
-			active := !ep.Active
 
-			return active, h.db.DB().Model(&ep).
+			return ep.Active, h.db.DB().Save(&ep).Error
-				Update("active", active).Error
 		},
 		"failed to toggle entrypoint",
 		entrypointActivated, entrypointDeactivated,

internal/resetpw/resetpw.go

@@ -308,7 +308,7 @@ func checkDataDir(dir string) error {
 
 	dbPath := filepath.Join(dir, database.MainDBFileName)
 
-	dbInfo, err := os.Stat(dbPath)
+	_, err = os.Stat(dbPath)
 
 	switch {
 	case errors.Is(err, fs.ErrNotExist):
@@ -319,15 +319,6 @@ func checkDataDir(dir string) error {
 		)
 	case err != nil:
 		return fmt.Errorf("checking %s: %w", dbPath, err)
-	case dbInfo.Size() == 0:
-		// SQLite opens a zero-length file as an empty database, so
-		// it holds no deployment either, and opening it would write
-		// an empty schema into it.
-		return fmt.Errorf(
-			"%w: %s is zero-length. The admin account is created by "+
-				"the first server start",
-			ErrNoDatabase, dbPath,
-		)
 	}
 
 	return nil

internal/resetpw/resetpw_test.go

@@ -377,33 +377,6 @@ func TestMissingDatabaseCreatesNothing(t *testing.T) {
 	)
 }
 
-// TestZeroLengthDatabaseCreatesNothing covers a webhooker.db left at
-// zero length, as a truncated copy leaves it. SQLite would open it as
-// an empty database, so it is refused like a missing one and left as
-// it is.
-func TestZeroLengthDatabaseCreatesNothing(t *testing.T) {
-	dir := t.TempDir()
-	t.Setenv("DATA_DIR", dir)
-
-	dbPath := filepath.Join(dir, database.MainDBFileName)
-	require.NoError(
-		t, os.WriteFile(dbPath, nil, database.SQLiteFilePerm),
-	)
-
-	code, _, stderr := run(t, newPassword+"\n", operatorUser)
-
-	require.Equal(t, exitFailure, code)
-	assert.Contains(t, stderr, dbPath)
-
-	entries, err := os.ReadDir(dir)
-	require.NoError(t, err)
-	assert.Len(t, entries, 1, "nothing may be created beside it")
-
-	info, err := os.Stat(dbPath)
-	require.NoError(t, err)
-	assert.Zero(t, info.Size(), "nothing may be written into it")
-}
-
 // TestUnknownUserFails states the decision: resetpw changes an
 // existing account's password and never creates an account. A typo in
 // the username must say so rather than quietly adding a second user.

internal/server/alpine_browser_test.go

@@ -115,7 +115,6 @@ func TestAlpineRunsUnderTheSecurityPolicy(t *testing.T) {
 
 	checkRefusedTarget(ctx, t, page)
 	checkCopy(ctx, t, page)
-	checkEntrypointEdit(ctx, t, page, page+"/events")
 	checkEventLog(ctx, t, page+"/events", event.ID, target.Name)
 	checkMobileMenu(ctx, t, page)
 
@@ -472,93 +471,6 @@ func checkCopy(ctx context.Context, t *testing.T, url string) {
 		`clicking Copy does not show "Copied"`)
 }
 
-// checkEntrypointEdit loads a webhook page whose entrypoint has no
-// description, and checks that Edit shows the edit form in place of
-// the description and hides until the form closes, so the form always
-// opens on the saved description; that Cancel hides it and drops what
-// was typed; that after typing, opening the page at elsewhere and going
-// back, Edit again opens the form on the saved description; and that
-// Save changes the description the page shows.
-func checkEntrypointEdit(
-	ctx context.Context, t *testing.T, url, elsewhere string,
-) {
-	t.Helper()
-
-	// Cancel and Save are found inside the edit form, since the add
-	// target form has buttons of the same names.
-	const (
-		editForm    = `form[action$="/edit"]`
-		input       = editForm + ` input[name="description"]`
-		cancelEdit  = `//form[contains(@action, "/edit")]/button[text()="Cancel"]`
-		saveEdit    = `//form[contains(@action, "/edit")]/button[text()="Save"]`
-		description = `//span[text()="Entrypoint"]`
-		edit        = `//button[text()="Edit"]`
-	)
-
-	require.NoError(t, chromedp.Run(ctx, loadPage(url)))
-
-	assert.True(t, hidden(ctx, editForm),
-		"the edit form shows before Edit is clicked")
-
-	click(ctx, t, edit)
-	assert.True(t, shown(ctx, editForm),
-		"clicking Edit does not show the edit form")
-	assert.True(t, hidden(ctx, description),
-		"the description stays shown beside the edit form")
-	assert.True(t, hidden(ctx, edit),
-		"Edit stays shown while the edit form is open")
-
-	require.NoError(t, chromedp.Run(
-		ctx, chromedp.SendKeys(input, "draft", chromedp.ByQuery),
-	))
-	click(ctx, t, cancelEdit)
-	assert.True(t, hidden(ctx, editForm),
-		"clicking Cancel does not hide the edit form")
-	assert.True(t, shown(ctx, description),
-		"clicking Cancel does not show the description again")
-	assert.True(t, shown(ctx, edit),
-		"clicking Cancel does not show Edit again")
-
-	var typed string
-
-	click(ctx, t, edit)
-	require.NoError(t, chromedp.Run(
-		ctx, chromedp.Value(input, &typed, chromedp.ByQuery),
-	))
-	assert.Empty(t, typed, "Cancel keeps what was typed")
-
-	var loaded string
-
-	require.NoError(t, chromedp.Run(
-		ctx,
-		chromedp.SendKeys(input, "draft", chromedp.ByQuery),
-		loadPage(elsewhere),
-		chromedp.NavigateBack(),
-		chromedp.WaitNotPresent("[x-cloak]", chromedp.ByQuery),
-		chromedp.Evaluate(
-			`performance.getEntriesByType("navigation")[0].type`, &loaded,
-		),
-	))
-	require.Equal(
-		t, "back_forward", loaded,
-		"going back, the browser did not load the page again",
-	)
-
-	click(ctx, t, edit)
-	require.NoError(t, chromedp.Run(
-		ctx, chromedp.Value(input, &typed, chromedp.ByQuery),
-	))
-	assert.Empty(t, typed, "going back puts what was typed back in the form")
-
-	require.NoError(t, chromedp.Run(
-		ctx, chromedp.SendKeys(input, "Billing sender", chromedp.ByQuery),
-	))
-	click(ctx, t, saveEdit)
-
-	assert.True(t, shown(ctx, `//span[text()="Billing sender"]`),
-		"saving the edit form does not change the description")
-}
-
 // checkEventLog loads the event log and checks that clicking an event's
 // row expands it, that in there clicking its delivery shows the
 // delivery's attempts and clicking again hides them, and that clicking

internal/server/routes.go

@@ -289,10 +289,6 @@ func (s *Server) setupSourceRoutes() {
 			"/entrypoints",
 			s.h.HandleEntrypointCreate(),
 		)
-		r.Post(
-			"/entrypoints/{entrypointID}/edit",
-			s.h.HandleEntrypointEdit(),
-		)
 		r.Post(
 			"/entrypoints/{entrypointID}/delete",
 			s.h.HandleEntrypointDelete(),

internal/server/routes_test.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/fx"
@@ -399,44 +398,6 @@ func (e *testEnv) seedTarget(
 	return tgt
 }
 
-// seedEntrypoint creates an active entrypoint for a webhook.
-func (e *testEnv) seedEntrypoint(
-	t *testing.T,
-	webhookID string,
-) *database.Entrypoint {
-	t.Helper()
-
-	ep := &database.Entrypoint{
-		WebhookID:   webhookID,
-		Path:        uuid.New().String(),
-		Description: "Default entrypoint",
-		Active:      true,
-	}
-
-	require.NoError(
-		t,
-		e.db.DB().Omit(clause.Associations).Create(ep).Error,
-	)
-
-	return ep
-}
-
-// storedEntrypoint reloads an entrypoint row.
-func (e *testEnv) storedEntrypoint(
-	t *testing.T,
-	entrypointID string,
-) database.Entrypoint {
-	t.Helper()
-
-	var ep database.Entrypoint
-
-	require.NoError(
-		t, e.db.DB().First(&ep, "id = ?", entrypointID).Error,
-	)
-
-	return ep
-}
-
 // seedFailedDelivery records a terminally failed delivery of an event
 // to a target in the webhook's own database.
 func (e *testEnv) seedFailedDelivery(
@@ -1126,119 +1087,6 @@ func TestHook_EntrypointActions(t *testing.T) {
 	assert.Zero(t, left, "the delete should remove the entrypoint")
 }
 
-// TestHook_EntrypointEdit changes an entrypoint's description with the
-// edit form on the webhook page, then empties it. The entrypoint keeps
-// its URL, and with no description it shows as "Entrypoint". Without
-// the CSRF token, or without a session, the edit is refused.
-func TestHook_EntrypointEdit(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-
-	userID, _ := env.seedUser(t, "epeditor", "somepassword")
-	cookies := env.authCookies(t, userID, "epeditor")
-	wh := env.seedWebhook(t, userID)
-	ep := env.seedEntrypoint(t, wh.ID)
-	page := "/hook/" + wh.ID
-
-	token, cookies := env.csrfFrom(t, page, cookies)
-	action := env.urlFrom(
-		t, page, `action="(/hook/[^/"]+/entrypoints/[^/"]+/edit)"`,
-		cookies,
-	)
-
-	assert.Equal(
-		t, http.StatusForbidden,
-		env.post(action, entrypointEditForm("", "no token"), cookies).Code,
-		"an edit without a CSRF token must be refused",
-	)
-
-	// The request without a session carries a valid CSRF token from
-	// the login page, so only the session check can refuse it.
-	anonToken, anon := env.csrfFrom(t, "/pages/login", nil)
-	refused := env.post(
-		action, entrypointEditForm(anonToken, "no session"), anon,
-	)
-	assert.Equal(t, http.StatusSeeOther, refused.Code)
-	assert.Equal(
-		t, "/pages/login", refused.Header().Get("Location"),
-		"an edit without a session must be refused",
-	)
-
-	assert.Equal(
-		t, ep.Description, env.storedEntrypoint(t, ep.ID).Description,
-		"a refused edit must not change the description",
-	)
-
-	// edit submits the form with description and requires the
-	// redirect back to the webhook page with the notice.
-	edit := func(description string) {
-		t.Helper()
-
-		w := env.post(
-			action, entrypointEditForm(token, description), cookies,
-		)
-		env.requireNotice(t, w, page, "entrypoint-saved",
-			"Entrypoint description saved.", cookies)
-	}
-
-	edit("Billing sender")
-
-	stored := env.storedEntrypoint(t, ep.ID)
-	assert.Equal(t, "Billing sender", stored.Description)
-	assert.Equal(t, ep.Path, stored.Path,
-		"the edit must keep the entrypoint's URL")
-
-	body := env.get(page, cookies).Body.String()
-	assert.Contains(t, body, ">Billing sender</span>")
-	assert.Contains(t, body, "/h/"+ep.Path+"</code>")
-
-	edit("")
-
-	assert.Empty(t, env.storedEntrypoint(t, ep.ID).Description)
-	assert.Contains(t, env.get(page, cookies).Body.String(),
-		">Entrypoint</span>", "no description shows as Entrypoint")
-}
-
-// TestHook_EntrypointEdit_OtherUser404s has another logged-in user, with
-// a CSRF token of their own, try to edit an entrypoint: through the
-// owner's webhook, and through a webhook of their own. Both are 404s
-// and the description stays as it was.
-func TestHook_EntrypointEdit_OtherUser404s(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-
-	ownerID, _ := env.seedUser(t, "epowner", "somepassword")
-	wh := env.seedWebhook(t, ownerID)
-	ep := env.seedEntrypoint(t, wh.ID)
-
-	otherID, _ := env.seedUser(t, "epother", "somepassword")
-	other := env.authCookies(t, otherID, "epother")
-	theirs := env.seedWebhook(t, otherID)
-	token, other := env.csrfFrom(t, "/hook/"+theirs.ID, other)
-
-	for _, webhookID := range []string{wh.ID, theirs.ID} {
-		path := "/hook/" + webhookID + "/entrypoints/" + ep.ID + "/edit"
-
-		w := env.post(path, entrypointEditForm(token, "not theirs"), other)
-		assert.Equal(t, http.StatusNotFound, w.Code, path)
-	}
-
-	assert.Equal(
-		t, ep.Description, env.storedEntrypoint(t, ep.ID).Description,
-		"another user must not change the description",
-	)
-}
-
-// entrypointEditForm fills in the webhook page's entrypoint edit form.
-func entrypointEditForm(token, description string) url.Values {
-	return url.Values{
-		"csrf_token":  {token},
-		"description": {description},
-	}
-}
-
 // TestHook_TargetActions adds a target with the form on the webhook
 // page, follows its Edit link to the target edit form and submits
 // it, then deactivates, activates and deletes it, every URL and token

static/js/app.js

@@ -70,8 +70,7 @@ document.addEventListener("alpine:init", function () {
     "use strict";
 
     // Something a click shows and hides: the mobile menu, an add form,
-    // an entrypoint's edit form, an event in the event log, a delivery's
+    // an event in the event log, a delivery's attempts.
-    // attempts.
     window.Alpine.data("collapsible", function () {
         return {
             open: false,

templates/source_detail.html

@@ -54,29 +54,15 @@
 
             <div class="divide-y divide-gray-100">
                 {{range .Entrypoints}}
-                <div class="p-4" x-data="collapsible">
+                <div class="p-4">
                     <div class="flex flex-wrap items-center justify-between gap-2 mb-1">
-                        <span x-show="closed" class="text-sm font-medium text-gray-900">{{if .Description}}{{.Description}}{{else}}Entrypoint{{end}}</span>
+                        <span class="text-sm font-medium text-gray-900">{{if .Description}}{{.Description}}{{else}}Entrypoint{{end}}</span>
-                        <!-- Edit shows this form in place of the
-                             description and hides until it closes, and
-                             Cancel resets what was typed. With
-                             autocomplete="off", going back to the page
-                             does not put unsaved text back either, so
-                             the form always opens on the saved
-                             description. -->
-                        <form x-show="open" x-cloak method="POST" action="/hook/{{$.Webhook.ID}}/entrypoints/{{.ID}}/edit" class="flex w-full gap-2">
-                            <input type="hidden" name="csrf_token" value="{{$.CSRFToken}}">
-                            <input type="text" name="description" value="{{.Description}}" autocomplete="off" placeholder="Description (optional)" class="input text-sm flex-1">
-                            <button type="submit" class="btn-primary text-sm">Save</button>
-                            <button type="reset" @click="toggle" class="btn-secondary text-sm">Cancel</button>
-                        </form>
                         <div class="flex flex-wrap items-center gap-2">
                             {{if .Active}}
                             <span class="badge-success">Active</span>
                             {{else}}
                             <span class="badge-error">Inactive</span>
                             {{end}}
-                            <button type="button" x-show="closed" @click="toggle" class="btn-small" title="Edit">Edit</button>
                             <form method="POST" action="/hook/{{$.Webhook.ID}}/entrypoints/{{.ID}}/toggle" class="inline">
                                 <input type="hidden" name="csrf_token" value="{{$.CSRFToken}}">
                                 <button type="submit" class="btn-small" title="{{if .Active}}Deactivate{{else}}Activate{{end}}">
@@ -133,13 +119,11 @@
                  and the hidden type field submitted with them, exist
                  only while that type is chosen. A refused submission
                  comes back open on its type, with the values entered;
-                 Cancel empties the form. The type choice's p-2, narrower
+                 Cancel empties the form. -->
-                 than an input's own padding, keeps it, Next and Cancel on
-                 one row on a 360px-wide phone. -->
             <form method="POST" action="/hook/{{.Webhook.ID}}/targets" x-ref="form">
                 <input type="hidden" name="csrf_token" value="{{.CSRFToken}}">
                 <div x-show="choosing" x-cloak class="p-4 bg-gray-50 border-b border-gray-200 flex flex-wrap gap-2">
-                    <select x-ref="type" aria-label="Target type" class="input text-sm p-2 flex-1">
+                    <select x-ref="type" aria-label="Target type" class="input text-sm w-32">
                         <option value="http">HTTP</option>
                         <option value="slack">Slack</option>
                         <option value="database">Database</option>