Compare commits
5
Commits
5f01f5628f
...
next
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a8d226942e | ||
|
|
6df1fc7875 | ||
|
|
54b643044f | ||
|
|
55ccb28270 | ||
|
|
766f33a956 |
+13
-8
@@ -111,11 +111,16 @@ RUN --network=none golangci-lint run --config .golangci.yml --build-tags browser
|
|||||||
# Nothing is wanted from js-lint; the copy is what makes this phase run it.
|
# Nothing is wanted from js-lint; the copy is what makes this phase run it.
|
||||||
COPY --from=js-lint /src/yarn.lock /dev/null
|
COPY --from=js-lint /src/yarn.lock /dev/null
|
||||||
|
|
||||||
# Test phase. -race needs cgo and so a C compiler, which the Debian Go image
|
# Test phase. The tests run with cgo off and so without Go's race detector,
|
||||||
# ships and the alpine one does not. `make test` (script/test) builds this
|
# which needs cgo on Linux; sneak ruled the race detector out in
|
||||||
# stage alone; the build stage below depends on it.
|
# https://git.eeqj.de/sneak/webhooker/issues/538#issuecomment-153273.
|
||||||
|
# `make test` (script/test) builds this stage alone; the build stage below
|
||||||
|
# depends on it.
|
||||||
#
|
#
|
||||||
# golang:1.26.1-bookworm (Debian-based), 2026-03-17
|
# golang:1.26.1-bookworm (Debian-based), 2026-03-17: the builder stage's
|
||||||
|
# image, which that stage needs for its git and make. Its test step runs
|
||||||
|
# under the image's bash, and the tests in internal/versionscript use its
|
||||||
|
# git, make and sh, and skip when they are missing.
|
||||||
FROM golang:1.26.1-bookworm@sha256:4465644228bc2857a954b092167e12aa59c006a3492282a6c820bf4755fd64a4 AS test
|
FROM golang:1.26.1-bookworm@sha256:4465644228bc2857a954b092167e12aa59c006a3492282a6c820bf4755fd64a4 AS test
|
||||||
|
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
@@ -131,8 +136,8 @@ RUN script/assets
|
|||||||
# -timeout applies to each package on its own, so 90s has only to clear the
|
# -timeout applies to each package on its own, so 90s has only to clear the
|
||||||
# slowest one. -p 4 -parallel 8 keep the run under 2 GB of memory: at most
|
# slowest one. -p 4 -parallel 8 keep the run under 2 GB of memory: at most
|
||||||
# four test binaries build or run at once, each with at most eight parallel
|
# four test binaries build or run at once, each with at most eight parallel
|
||||||
# tests. Under -race every test binary and every link costs a few hundred MB,
|
# tests. The defaults are one per core, so without these the memory the run
|
||||||
# so the defaults (one per core) add up to several GB on a many-core host.
|
# needs grows with the host's core count.
|
||||||
#
|
#
|
||||||
# The first run has no -v: go test then prints one result line per package,
|
# The first run has no -v: go test then prints one result line per package,
|
||||||
# with its coverage, and for a package that fails, everything its tests
|
# with its coverage, and for a package that fails, everything its tests
|
||||||
@@ -154,12 +159,12 @@ RUN script/assets
|
|||||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||||
RUN --mount=type=tmpfs,target=/tmp/tests,size=512m \
|
RUN --mount=type=tmpfs,target=/tmp/tests,size=512m \
|
||||||
export TMPDIR=/tmp/tests GOTMPDIR=/tmp; \
|
export TMPDIR=/tmp/tests GOTMPDIR=/tmp; \
|
||||||
go test -race -cover -p 4 -parallel 8 -timeout 90s ./... 2>&1 | tee /tmp/go-test.log && exit 0; \
|
CGO_ENABLED=0 go test -cover -p 4 -parallel 8 -timeout 90s ./... 2>&1 | tee /tmp/go-test.log && exit 0; \
|
||||||
tests="$(awk '/^--- FAIL: / { print $3 }' /tmp/go-test.log | paste -s -d '|' -)"; \
|
tests="$(awk '/^--- FAIL: / { print $3 }' /tmp/go-test.log | paste -s -d '|' -)"; \
|
||||||
packages="$(awk '/^FAIL\t/ { print $2 }' /tmp/go-test.log)"; \
|
packages="$(awk '/^FAIL\t/ { print $2 }' /tmp/go-test.log)"; \
|
||||||
if [ -n "$tests" ]; then \
|
if [ -n "$tests" ]; then \
|
||||||
echo "--- Rerunning the failed tests with -v for details ---"; \
|
echo "--- Rerunning the failed tests with -v for details ---"; \
|
||||||
go test -race -v -p 4 -parallel 8 -timeout 90s -run "^($tests)\$" $packages; \
|
CGO_ENABLED=0 go test -v -p 4 -parallel 8 -timeout 90s -run "^($tests)\$" $packages; \
|
||||||
fi; \
|
fi; \
|
||||||
exit 1
|
exit 1
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -15,9 +15,9 @@ RUN go mod download
|
|||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# The test binary embeds the templates and static files, so the browser
|
# The test binary embeds the templates and static files, so the browser
|
||||||
# stage needs nothing else. -p 4 keeps the compile's memory down, as in
|
# stage needs nothing else. It is built with cgo off and -p 4 keeps the
|
||||||
# the test phase of Dockerfile.
|
# compile's memory down, both as in the test phase of Dockerfile.
|
||||||
RUN make assets && go test -c -p 4 -tags browser -o /browser.test ./internal/server
|
RUN make assets && CGO_ENABLED=0 go test -c -p 4 -tags browser -o /browser.test ./internal/server
|
||||||
|
|
||||||
# chromedp/headless-shell:151.0.7922.109 (Debian trixie), 2026-08-11. The
|
# chromedp/headless-shell:151.0.7922.109 (Debian trixie), 2026-08-11. The
|
||||||
# browser is on PATH as headless-shell, where the test's browser library
|
# browser is on PATH as headless-shell, where the test's browser library
|
||||||
|
|||||||
@@ -1,72 +1,77 @@
|
|||||||
# Workflow
|
# Workflow
|
||||||
|
|
||||||
One issue per unit of work, one branch and one PR per issue:
|
One issue per unit of work, and one branch and one PR per issue:
|
||||||
|
|
||||||
- ensure a tracked issue exists with a definition of done
|
- make sure a tracked issue exists with a definition of done
|
||||||
- branch from `next` (never from `main`)
|
- branch from `next`, never from `main`
|
||||||
- do the work; open a PR based on `next` (never on `main`)
|
- do the work and push the branch
|
||||||
- pass an independent review, then the manager squash-merges into `next`
|
- open a PR with base `next`, never `main`
|
||||||
- push; nothing stays local-only
|
- pass an independent review
|
||||||
|
- the repository manager squash-merges it into `next`
|
||||||
|
|
||||||
`next` is the branch for the next milestone and must stay green and mergeable to
|
The repository manager is the role that merges each issue's PR into `next`.
|
||||||
`main` without notice. One `next` -> `main` PR accumulates the milestone;
|
Nothing stays local-only: every commit is pushed.
|
||||||
releases are cut from `main` separately.
|
|
||||||
|
|
||||||
The tracker (https://git.eeqj.de/sneak/webhooker/issues) is the record of what
|
`next` is the branch for the next milestone. It must stay green and mergeable
|
||||||
is done and what is under way. This file keeps no list of either.
|
into `main` at all times. A milestone's work reaches `main` through one PR from
|
||||||
|
`next`. The owner, @sneak, merges that PR. Cutting a release from `main` is a
|
||||||
|
separate step after that.
|
||||||
|
|
||||||
|
The tracker (https://git.eeqj.de/sneak/webhooker/issues) records what is done
|
||||||
|
and what is under way. This file keeps no list of either.
|
||||||
|
|
||||||
# Status
|
# Status
|
||||||
|
|
||||||
What is still open for 1.0.0 is in its milestone
|
What is still open for 1.0.0 is in its milestone
|
||||||
(https://git.eeqj.de/sneak/webhooker/milestone/9). `v1.0.0` is not tagged, and
|
(https://git.eeqj.de/sneak/webhooker/milestone/9). `v1.0.0` is not tagged. Only
|
||||||
only @sneak tags it.
|
@sneak tags it.
|
||||||
|
|
||||||
Delivery is at-least-once by design, not by accident: a send whose result row
|
Delivery is at least once by design. When webhooker cannot record the outcome of
|
||||||
does not land is attempted again, so a receiver can see a duplicate. That is
|
a delivery, it sends that delivery again. The target can then receive the same
|
||||||
deliberate — the alternative is a silent lost delivery — and the README says so
|
event twice. The alternative is a lost delivery that nothing reports. The README
|
||||||
under Rationale. It is not a defect to re-file.
|
says so. Such a duplicate is not a defect to re-file.
|
||||||
|
|
||||||
# Next Step
|
# Next Step
|
||||||
|
|
||||||
@sneak runs webhooker in limited production, then tags `v1.0.0`. Merging `next`
|
@sneak runs webhooker in limited production, then tags `v1.0.0`. Merging `next`
|
||||||
into `main` is a separate act from tagging and waits on neither of those: `next`
|
into `main` is a separate act. It waits on neither the production run nor the
|
||||||
is kept mergeable at all times, which is the point of the branch.
|
tag.
|
||||||
|
|
||||||
# Future Steps
|
# Future Steps
|
||||||
|
|
||||||
- Per-webhook rate limits, set in the web UI and enforced in the receiver
|
- Per-webhook rate limits, set in the web UI and enforced at the entrypoint.
|
||||||
handler, on top of the receiver's existing limits, which `RECEIVER_RATE_LIMIT`
|
Today `RECEIVER_RATE_LIMIT` is the only rate-limit setting. It is how many
|
||||||
sets for the whole server (see Rate Limiting in the README)
|
requests per minute one client address may send to one entrypoint. The same
|
||||||
- API key authentication for programmatic access (the `APIKey` model exists, but
|
address is also capped at ten times that across all entrypoints together.
|
||||||
nothing creates a key and no middleware checks one)
|
- API key authentication for programmatic access. The `APIKey` model and its
|
||||||
- REST API v1
|
`api_keys` table exist. Nothing creates a key and nothing checks one.
|
||||||
- CRUD for webhooks, entrypoints, targets
|
- REST API v1. `/api/v1` is mounted with no routes today.
|
||||||
|
- CRUD for webhooks, entrypoints and targets
|
||||||
- event viewing and filtering endpoints
|
- event viewing and filtering endpoints
|
||||||
- event redelivery endpoint
|
- event redelivery endpoint
|
||||||
- OpenAPI specification
|
- OpenAPI specification
|
||||||
- Analytics in the web UI: response times summarised per webhook or per target,
|
- Analytics in the web UI: response times summarised per webhook or per target,
|
||||||
and figures for all webhooks together. The webhook page already shows event,
|
and figures for all webhooks together. Today the webhook page shows event,
|
||||||
delivery and failure counts and failure percentages, the target list counts
|
delivery and failure counts and failure percentages. The target list counts
|
||||||
each target's deliveries, the event log and each event's page show every
|
each target's deliveries. The event log shows every attempt's duration.
|
||||||
attempt's duration, and `/metrics` carries server-wide counts and delivery
|
`/metrics` carries server-wide counts and delivery durations.
|
||||||
durations
|
- A remember-me option at login. Today every session survives a browser restart.
|
||||||
- A remember-me option at login. Every session already survives a browser
|
It lasts up to 7 days. It ends sooner after `SESSION_IDLE_TIMEOUT` (default 24
|
||||||
restart: it lasts up to 7 days, and ends sooner after `SESSION_IDLE_TIMEOUT`
|
hours) without use.
|
||||||
(default 24 hours) without activity
|
- Password reset over the web for a forgotten password. Today a signed-in user
|
||||||
- Password reset flow for a forgotten password over the web. The authenticated
|
can change their password. A lost password is reset from the command line with
|
||||||
password _change_ flow already landed, and a lost password is recoverable from
|
`webhooker resetpw` (https://git.eeqj.de/sneak/webhooker/issues/208).
|
||||||
the console with `webhooker resetpw`
|
|
||||||
(https://git.eeqj.de/sneak/webhooker/issues/208)
|
|
||||||
- Later, nice to have
|
- Later, nice to have
|
||||||
- email delivery target type
|
- email delivery target type
|
||||||
- SNS and S3 delivery targets
|
- SNS and S3 delivery targets
|
||||||
- data transformations (e.g. a configurable Slack message format; the Slack
|
- data transformations, such as a configurable Slack message format. The
|
||||||
target sends one fixed format today)
|
Slack target sends one fixed format today.
|
||||||
- JSONL file delivery with periodic S3 upload (the `database` target already
|
- JSONL file delivery with periodic S3 upload. Today an archive target
|
||||||
archives events to SQLite files, rotated hourly, daily or monthly if set,
|
writes events to SQLite files. An archive target can rotate those files
|
||||||
and the webhook page offers them as one gzipped JSON download)
|
hourly, daily or monthly. The webhook page offers them as one gzipped JSON
|
||||||
|
download.
|
||||||
- webhook event search, and filtering beyond the event log's failed and
|
- webhook event search, and filtering beyond the event log's failed and
|
||||||
pending views
|
pending views
|
||||||
- multi-user with role-based access control (each webhook already belongs to
|
- multi-user with role-based access control. Today each webhook belongs to
|
||||||
one account, but there is only the account made at first boot and no way
|
one account. Only the account made at first boot exists. There is no way
|
||||||
to add another)
|
to add another.
|
||||||
|
|||||||
@@ -303,7 +303,7 @@ func (r *racingWrites) wait() (bool, error) {
|
|||||||
// contending for the writer's mutex when the eviction takes it.
|
// contending for the writer's mutex when the eviction takes it.
|
||||||
// The write that wins the mutex after the eviction must abandon
|
// The write that wins the mutex after the eviction must abandon
|
||||||
// its work rather than reopen the archive, leaving the writer
|
// its work rather than reopen the archive, leaving the writer
|
||||||
// permanently handle-free. Run under -race.
|
// permanently handle-free.
|
||||||
func TestEvictWebhook_RacingWriteDoesNotReopenHandle(
|
func TestEvictWebhook_RacingWriteDoesNotReopenHandle(
|
||||||
t *testing.T,
|
t *testing.T,
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -959,9 +959,11 @@ func TestArchiveSweep_SkipsDeletedWebhookTargets(t *testing.T) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestArchiveSweep_ConcurrentWrites proves the sweep serialises
|
// TestArchiveSweep_ConcurrentWrites runs the sweep while writes to
|
||||||
// against writes through the target's writer mutex. Run under
|
// the same target are under way. The sweep serialises against them
|
||||||
// -race, an unsynchronised sweep would be caught here.
|
// through the target's writer mutex; the suite runs without Go's race
|
||||||
|
// detector, so a sweep that did not would fail this test only by
|
||||||
|
// panicking, hanging or leaving no archive file.
|
||||||
func TestArchiveSweep_ConcurrentWrites(t *testing.T) {
|
func TestArchiveSweep_ConcurrentWrites(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
|
|||||||
@@ -67,9 +67,10 @@ func DefaultPasswordConfig() *PasswordConfig {
|
|||||||
// testArgon2Memory is the Argon2id memory cost, in KiB, that a test
|
// testArgon2Memory is the Argon2id memory cost, in KiB, that a test
|
||||||
// binary hashes with: 1 MB instead of the shipped 64 MB. Every test
|
// binary hashes with: 1 MB instead of the shipped 64 MB. Every test
|
||||||
// that starts a database hashes the bootstrap admin password, dozens
|
// that starts a database hashes the bootstrap admin password, dozens
|
||||||
// of them run in parallel, and under the race detector each 64 MB hash
|
// of them run in parallel, and each 64 MB hash holds at least 64 MB
|
||||||
// holds about 150 MB. VerifyPassword reads the cost from the hash it
|
// while it runs (about 150 MB when the suite ran under the race
|
||||||
// checks, so verification follows.
|
// detector). VerifyPassword reads the cost from the hash it checks, so
|
||||||
|
// verification follows.
|
||||||
const testArgon2Memory = 1024
|
const testArgon2Memory = 1024
|
||||||
|
|
||||||
// hashAtShippedCostInTest makes a test binary hash at the shipped
|
// hashAtShippedCostInTest makes a test binary hash at the shipped
|
||||||
|
|||||||
@@ -21,8 +21,9 @@ const budget = 64
|
|||||||
|
|
||||||
// batchRunes is how many consecutive code points the charge test logs
|
// batchRunes is how many consecutive code points the charge test logs
|
||||||
// in one value from U+1000 up. Logging each of those on its own line
|
// in one value from U+1000 up. Logging each of those on its own line
|
||||||
// is too slow for the suite under the race detector; 4,096 at a time
|
// was too slow for the suite when it ran under the race detector;
|
||||||
// is 271 batches, each logged on two lines, so 542 lines per handler.
|
// 4,096 at a time is 271 batches, each logged on two lines, so 542
|
||||||
|
// lines per handler.
|
||||||
const batchRunes = 4096
|
const batchRunes = 4096
|
||||||
|
|
||||||
// newHandlers are the two handlers internal/logger can install. Time
|
// newHandlers are the two handlers internal/logger can install. Time
|
||||||
@@ -152,10 +153,10 @@ func TestEncodedBytes_ChargesAtLeastWhatTheHandlersEmit(t *testing.T) {
|
|||||||
batches = append(batches, batch.String())
|
batches = append(batches, batch.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
// What EncodedBytes charges for each batch. Under -race -cover this
|
// What EncodedBytes charges for each batch. When the suite ran
|
||||||
// takes longer than logging the batches, so it is worked out once,
|
// under -race -cover this took longer than logging the batches, so
|
||||||
// by whichever handler finishes logging first, while the other is
|
// it is worked out once, by whichever handler finishes logging
|
||||||
// still logging.
|
// first, while the other is still logging.
|
||||||
charged := sync.OnceValue(func() []int {
|
charged := sync.OnceValue(func() []int {
|
||||||
costs := make([]int, len(batches))
|
costs := make([]int, len(batches))
|
||||||
|
|
||||||
|
|||||||
@@ -10,14 +10,12 @@ import (
|
|||||||
"sneak.berlin/go/webhooker/internal/server"
|
"sneak.berlin/go/webhooker/internal/server"
|
||||||
)
|
)
|
||||||
|
|
||||||
// earlyStopIterations is how many start/stop cycles the race test
|
// earlyStopIterations is how many start/stop cycles the test below
|
||||||
// runs. The window it aims at is the gap between the OnStart hook
|
// runs. The window it aims at is the gap between the OnStart hook
|
||||||
// returning and the serving goroutine reaching its first field
|
// returning and the serving goroutine reaching its first field
|
||||||
// access, which is microseconds wide. The race detector reports an
|
// access, which is microseconds wide, so a single cycle can miss it
|
||||||
// unsynchronised pair whenever it observes one, but it has to observe
|
// purely on scheduling. Repetition makes hitting it reliable; the
|
||||||
// one, so a single cycle can miss purely on scheduling. Repetition
|
// collaborators are built once, so the cycles themselves are cheap.
|
||||||
// makes the observation reliable; the collaborators are built once,
|
|
||||||
// so the cycles themselves are cheap.
|
|
||||||
const earlyStopIterations = 25
|
const earlyStopIterations = 25
|
||||||
|
|
||||||
// TestEarlyShutdown_NoPanicAndNoRace stops the application
|
// TestEarlyShutdown_NoPanicAndNoRace stops the application
|
||||||
@@ -38,8 +36,9 @@ const earlyStopIterations = 25
|
|||||||
//
|
//
|
||||||
// httpServer is now built in New, on the constructing goroutine, so
|
// httpServer is now built in New, on the constructing goroutine, so
|
||||||
// it is written before any hook exists and can never be nil.
|
// it is written before any hook exists and can never be nil.
|
||||||
// sentryEnabled is atomic. This test is what catches either one
|
// sentryEnabled is atomic. This test catches the nil dereference
|
||||||
// coming back — under -race, which is how the suite runs.
|
// coming back, as a panic. The suite runs without Go's race
|
||||||
|
// detector, so the data race coming back would go unreported here.
|
||||||
func TestEarlyShutdown_NoPanicAndNoRace(t *testing.T) {
|
func TestEarlyShutdown_NoPanicAndNoRace(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user