diff --git a/Justfile b/Justfile index d4fd456f0a..35b96a3404 100644 --- a/Justfile +++ b/Justfile @@ -274,7 +274,6 @@ test-integration *test: # Run integration test(s) integration-tests *test: #!/bin/bash - echo "$PATH" retry 3 /bin/bash -c "go test -fullpath -count 1 -v -tags integration -run '^({{test}})$' -p 1 $(find . -type f -name '*_test.go' -print0 | xargs -0 grep -r -l {{test}} | xargs grep -l '//go:build integration' | xargs -I {} dirname './{}' | tr '\n' ' ')" # Alias for infrastructure-tests diff --git a/backend/admin/testdata/go/dischema/go.mod b/backend/admin/testdata/go/dischema/go.mod index ff29629c23..4979c07abb 100644 --- a/backend/admin/testdata/go/dischema/go.mod +++ b/backend/admin/testdata/go/dischema/go.mod @@ -13,7 +13,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/backend/admin/testdata/go/dischema/go.sum b/backend/admin/testdata/go/dischema/go.sum index bb905de77d..29b6eb4e00 100644 --- a/backend/admin/testdata/go/dischema/go.sum +++ b/backend/admin/testdata/go/dischema/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/backend/admin/testdata/go/resetsub/go.mod b/backend/admin/testdata/go/resetsub/go.mod index 60508ef4d2..830ee1a40f 100644 --- a/backend/admin/testdata/go/resetsub/go.mod +++ b/backend/admin/testdata/go/resetsub/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/backend/admin/testdata/go/resetsub/go.sum b/backend/admin/testdata/go/resetsub/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/backend/admin/testdata/go/resetsub/go.sum +++ b/backend/admin/testdata/go/resetsub/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/backend/console/testdata/go/console/go.mod b/backend/console/testdata/go/console/go.mod index b50c07215c..48209bfb5c 100644 --- a/backend/console/testdata/go/console/go.mod +++ b/backend/console/testdata/go/console/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/backend/console/testdata/go/console/go.sum b/backend/console/testdata/go/console/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/backend/console/testdata/go/console/go.sum +++ b/backend/console/testdata/go/console/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/backend/controller/leases/testdata/go/leases/go.mod b/backend/controller/leases/testdata/go/leases/go.mod index aed4646bc9..d62c816408 100644 --- a/backend/controller/leases/testdata/go/leases/go.mod +++ b/backend/controller/leases/testdata/go/leases/go.mod @@ -6,7 +6,7 @@ replace github.com/block/ftl => ./../../../../../.. require ( github.com/alecthomas/assert/v2 v2.11.0 - github.com/alecthomas/errors v0.7.0 + github.com/alecthomas/errors v0.8.2 github.com/block/ftl v0.0.0-00010101000000-000000000000 golang.org/x/sync v0.13.0 ) diff --git a/backend/controller/leases/testdata/go/leases/go.sum b/backend/controller/leases/testdata/go/leases/go.sum index 939cdf617b..5306804f19 100644 --- a/backend/controller/leases/testdata/go/leases/go.sum +++ b/backend/controller/leases/testdata/go/leases/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/backend/controller/sql/testdata/go/database/go.mod b/backend/controller/sql/testdata/go/database/go.mod index 64fc030350..e7e833740a 100644 --- a/backend/controller/sql/testdata/go/database/go.mod +++ b/backend/controller/sql/testdata/go/database/go.mod @@ -21,7 +21,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/repr v0.4.0 // indirect diff --git a/backend/controller/sql/testdata/go/database/go.sum b/backend/controller/sql/testdata/go/database/go.sum index 939cdf617b..5306804f19 100644 --- a/backend/controller/sql/testdata/go/database/go.sum +++ b/backend/controller/sql/testdata/go/database/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/backend/controller/sql/testdata/go/mysql/go.mod b/backend/controller/sql/testdata/go/mysql/go.mod index abeabb7097..2417146ea5 100644 --- a/backend/controller/sql/testdata/go/mysql/go.mod +++ b/backend/controller/sql/testdata/go/mysql/go.mod @@ -21,7 +21,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/repr v0.4.0 // indirect diff --git a/backend/controller/sql/testdata/go/mysql/go.sum b/backend/controller/sql/testdata/go/mysql/go.sum index 939cdf617b..5306804f19 100644 --- a/backend/controller/sql/testdata/go/mysql/go.sum +++ b/backend/controller/sql/testdata/go/mysql/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/backend/cron/testdata/go/cron/go.mod b/backend/cron/testdata/go/cron/go.mod index f2208a5702..9ada2a0b0e 100644 --- a/backend/cron/testdata/go/cron/go.mod +++ b/backend/cron/testdata/go/cron/go.mod @@ -14,7 +14,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/backend/cron/testdata/go/cron/go.sum b/backend/cron/testdata/go/cron/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/backend/cron/testdata/go/cron/go.sum +++ b/backend/cron/testdata/go/cron/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/backend/ingress/testdata/go/httpingress/go.mod b/backend/ingress/testdata/go/httpingress/go.mod index ab3f27ae67..f270bd763e 100644 --- a/backend/ingress/testdata/go/httpingress/go.mod +++ b/backend/ingress/testdata/go/httpingress/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/backend/ingress/testdata/go/httpingress/go.sum b/backend/ingress/testdata/go/httpingress/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/backend/ingress/testdata/go/httpingress/go.sum +++ b/backend/ingress/testdata/go/httpingress/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/backend/provisioner/dev_provisioner.go b/backend/provisioner/dev_provisioner.go index a5ec5a7ebd..08eca1f5ad 100644 --- a/backend/provisioner/dev_provisioner.go +++ b/backend/provisioner/dev_provisioner.go @@ -17,6 +17,7 @@ import ( "github.com/block/ftl/internal/dsn" "github.com/block/ftl/internal/key" "github.com/block/ftl/internal/log" + "github.com/block/ftl/internal/projectconfig" "github.com/block/ftl/internal/provisioner/executor" "github.com/block/ftl/internal/provisioner/state" ) @@ -24,15 +25,16 @@ import ( var redPandaBrokers = []string{"127.0.0.1:19092"} // NewDevProvisioner creates a new provisioner that provisions resources locally when running FTL in dev mode -func NewDevProvisioner(postgresPort int, mysqlPort int, recreate bool) *InMemProvisioner { +func NewDevProvisioner(project projectconfig.Config, postgresPort int, mysqlPort int, recreate bool) *InMemProvisioner { return NewEmbeddedProvisioner(map[schema.ResourceType]InMemResourceProvisionerFn{ - schema.ResourceTypePostgres: provisionPostgres(postgresPort, recreate), - schema.ResourceTypeMysql: provisionMysql(mysqlPort, recreate), - schema.ResourceTypeTopic: provisionTopic(), + schema.ResourceTypePostgres: provisionPostgres(project, postgresPort, recreate), + schema.ResourceTypeMysql: provisionMysql(project, mysqlPort, recreate), + schema.ResourceTypeTopic: provisionTopic(project), schema.ResourceTypeSubscription: provisionSubscription(), }, map[schema.ResourceType]InMemResourceProvisionerFn{}) } -func provisionMysql(mysqlPort int, recreate bool) InMemResourceProvisionerFn { + +func provisionMysql(project projectconfig.Config, mysqlPort int, recreate bool) InMemResourceProvisionerFn { return func(ctx context.Context, changeset key.Changeset, deployment key.Deployment, res schema.Provisioned, module *schema.Module) (*schema.RuntimeElement, error) { logger := log.FromContext(ctx).Deployment(deployment) @@ -50,7 +52,7 @@ func provisionMysql(mysqlPort int, recreate bool) InMemResourceProvisionerFn { } // We assume that the DB hsas already been started when running in dev mode - mysqlDSN, err := dev.SetupMySQL(ctx, mysqlPort) + mysqlDSN, err := dev.SetupMySQL(ctx, project, mysqlPort) if err != nil { return nil, errors.Wrap(err, "failed to wait for mysql to be ready") } @@ -146,9 +148,9 @@ func establishMySQLDB(ctx context.Context, mysqlDSN string, dbName string, mysql }, nil } -func ProvisionPostgresForTest(ctx context.Context, realm, module, id string) (string, error) { +func ProvisionPostgresForTest(ctx context.Context, project projectconfig.Config, realm, module, id string) (string, error) { node := &schema.Database{Name: id + "_test"} - event, err := provisionPostgres(15432, true)(ctx, key.NewChangesetKey(), key.NewDeploymentKey(realm, module), node, nil) + event, err := provisionPostgres(project, 15432, true)(ctx, key.NewChangesetKey(), key.NewDeploymentKey(realm, module), node, nil) if err != nil { return "", errors.WithStack(err) } @@ -156,9 +158,9 @@ func ProvisionPostgresForTest(ctx context.Context, realm, module, id string) (st return event.Element.(*schema.DatabaseRuntime).Connections.Write.(*schema.DSNDatabaseConnector).DSN, nil //nolint:forcetypeassert } -func ProvisionMySQLForTest(ctx context.Context, realm, module, id string) (string, error) { +func ProvisionMySQLForTest(ctx context.Context, project projectconfig.Config, realm, module, id string) (string, error) { node := &schema.Database{Name: id + "_test"} - event, err := provisionMysql(13306, true)(ctx, key.NewChangesetKey(), key.NewDeploymentKey(realm, module), node, nil) + event, err := provisionMysql(project, 13306, true)(ctx, key.NewChangesetKey(), key.NewDeploymentKey(realm, module), node, nil) if err != nil { return "", errors.WithStack(err) } @@ -166,7 +168,7 @@ func ProvisionMySQLForTest(ctx context.Context, realm, module, id string) (strin } -func provisionPostgres(postgresPort int, alwaysRecreate bool) InMemResourceProvisionerFn { +func provisionPostgres(project projectconfig.Config, postgresPort int, alwaysRecreate bool) InMemResourceProvisionerFn { return func(ctx context.Context, changeset key.Changeset, deployment key.Deployment, resource schema.Provisioned, module *schema.Module) (*schema.RuntimeElement, error) { recreate := alwaysRecreate logger := log.FromContext(ctx).Deployment(deployment) @@ -180,7 +182,7 @@ func provisionPostgres(postgresPort int, alwaysRecreate bool) InMemResourceProvi // We assume that the DB has already been started when running in dev mode postgresDSN := dsn.PostgresDSN("ftl", dsn.Port(postgresPort)) - err := dev.SetupPostgres(ctx, optional.None[string](), postgresPort, recreate) + err := dev.SetupPostgres(ctx, project, optional.None[string](), postgresPort, recreate) if err != nil { return nil, errors.Wrap(err, "failed to wait for postgres to be ready") } @@ -265,9 +267,9 @@ func provisionPostgres(postgresPort int, alwaysRecreate bool) InMemResourceProvi } -func provisionTopic() InMemResourceProvisionerFn { +func provisionTopic(project projectconfig.Config) InMemResourceProvisionerFn { return func(ctx context.Context, changeset key.Changeset, deployment key.Deployment, res schema.Provisioned, module *schema.Module) (*schema.RuntimeElement, error) { - if err := dev.SetUpRedPanda(ctx); err != nil { + if err := dev.SetUpRedPanda(ctx, project); err != nil { return nil, errors.Wrap(err, "could not set up redpanda") } diff --git a/backend/provisioner/scaling/testdata/go/echo/go.mod b/backend/provisioner/scaling/testdata/go/echo/go.mod index 14e91b79c1..3edf433975 100644 --- a/backend/provisioner/scaling/testdata/go/echo/go.mod +++ b/backend/provisioner/scaling/testdata/go/echo/go.mod @@ -14,7 +14,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/backend/provisioner/scaling/testdata/go/echo/go.sum b/backend/provisioner/scaling/testdata/go/echo/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/backend/provisioner/scaling/testdata/go/echo/go.sum +++ b/backend/provisioner/scaling/testdata/go/echo/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/backend/provisioner/scaling/testdata/go/types/go.mod b/backend/provisioner/scaling/testdata/go/types/go.mod index 07f0b7f167..480c635e79 100644 --- a/backend/provisioner/scaling/testdata/go/types/go.mod +++ b/backend/provisioner/scaling/testdata/go/types/go.mod @@ -7,7 +7,7 @@ replace github.com/block/ftl => ./../../../../../.. require github.com/block/ftl v0.0.0-00010101000000-000000000000 require ( - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/deckarep/golang-set/v2 v2.8.0 // indirect diff --git a/backend/provisioner/scaling/testdata/go/types/go.sum b/backend/provisioner/scaling/testdata/go/types/go.sum index 6f3d47bdf6..3c5d494aac 100644 --- a/backend/provisioner/scaling/testdata/go/types/go.sum +++ b/backend/provisioner/scaling/testdata/go/types/go.sum @@ -1,7 +1,7 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/backend/provisioner/testdata/go/echo/go.mod b/backend/provisioner/testdata/go/echo/go.mod index d24c4dcf0e..20622fa906 100644 --- a/backend/provisioner/testdata/go/echo/go.mod +++ b/backend/provisioner/testdata/go/echo/go.mod @@ -15,7 +15,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/backend/provisioner/testdata/go/echo/go.sum b/backend/provisioner/testdata/go/echo/go.sum index bb905de77d..29b6eb4e00 100644 --- a/backend/provisioner/testdata/go/echo/go.sum +++ b/backend/provisioner/testdata/go/echo/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/backend/provisioner/testdata/go/egress/go.mod b/backend/provisioner/testdata/go/egress/go.mod index 019bd3dde8..3d1ad11969 100644 --- a/backend/provisioner/testdata/go/egress/go.mod +++ b/backend/provisioner/testdata/go/egress/go.mod @@ -15,7 +15,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/backend/provisioner/testdata/go/egress/go.sum b/backend/provisioner/testdata/go/egress/go.sum index bb905de77d..29b6eb4e00 100644 --- a/backend/provisioner/testdata/go/egress/go.sum +++ b/backend/provisioner/testdata/go/egress/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/backend/runner/proxy/testdata/go/echo/go.mod b/backend/runner/proxy/testdata/go/echo/go.mod index c8bc38b350..74a858bc13 100644 --- a/backend/runner/proxy/testdata/go/echo/go.mod +++ b/backend/runner/proxy/testdata/go/echo/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/backend/runner/proxy/testdata/go/echo/go.sum b/backend/runner/proxy/testdata/go/echo/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/backend/runner/proxy/testdata/go/echo/go.sum +++ b/backend/runner/proxy/testdata/go/echo/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/backend/runner/pubsub/testdata/go/publisher/go.mod b/backend/runner/pubsub/testdata/go/publisher/go.mod index 1559bca9cb..3d1cfc40a7 100644 --- a/backend/runner/pubsub/testdata/go/publisher/go.mod +++ b/backend/runner/pubsub/testdata/go/publisher/go.mod @@ -13,7 +13,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/backend/runner/pubsub/testdata/go/publisher/go.sum b/backend/runner/pubsub/testdata/go/publisher/go.sum index bb905de77d..29b6eb4e00 100644 --- a/backend/runner/pubsub/testdata/go/publisher/go.sum +++ b/backend/runner/pubsub/testdata/go/publisher/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/backend/runner/pubsub/testdata/go/subscriber/go.mod b/backend/runner/pubsub/testdata/go/subscriber/go.mod index bc6019e946..979ccce62a 100644 --- a/backend/runner/pubsub/testdata/go/subscriber/go.mod +++ b/backend/runner/pubsub/testdata/go/subscriber/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/backend/runner/pubsub/testdata/go/subscriber/go.sum b/backend/runner/pubsub/testdata/go/subscriber/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/backend/runner/pubsub/testdata/go/subscriber/go.sum +++ b/backend/runner/pubsub/testdata/go/subscriber/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/backend/timeline/testdata/go/cron/go.mod b/backend/timeline/testdata/go/cron/go.mod index f2208a5702..9ada2a0b0e 100644 --- a/backend/timeline/testdata/go/cron/go.mod +++ b/backend/timeline/testdata/go/cron/go.mod @@ -14,7 +14,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/backend/timeline/testdata/go/cron/go.sum b/backend/timeline/testdata/go/cron/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/backend/timeline/testdata/go/cron/go.sum +++ b/backend/timeline/testdata/go/cron/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/backend/timeline/testdata/go/echo/go.mod b/backend/timeline/testdata/go/echo/go.mod index d24c4dcf0e..20622fa906 100644 --- a/backend/timeline/testdata/go/echo/go.mod +++ b/backend/timeline/testdata/go/echo/go.mod @@ -15,7 +15,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/backend/timeline/testdata/go/echo/go.sum b/backend/timeline/testdata/go/echo/go.sum index bb905de77d..29b6eb4e00 100644 --- a/backend/timeline/testdata/go/echo/go.sum +++ b/backend/timeline/testdata/go/echo/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/backend/timeline/testdata/go/ingress/go.mod b/backend/timeline/testdata/go/ingress/go.mod index 8c0a5a9897..f63db87848 100644 --- a/backend/timeline/testdata/go/ingress/go.mod +++ b/backend/timeline/testdata/go/ingress/go.mod @@ -14,7 +14,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/backend/timeline/testdata/go/ingress/go.sum b/backend/timeline/testdata/go/ingress/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/backend/timeline/testdata/go/ingress/go.sum +++ b/backend/timeline/testdata/go/ingress/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/backend/timeline/testdata/go/publisher/go.mod b/backend/timeline/testdata/go/publisher/go.mod index b918105156..64e9a86689 100644 --- a/backend/timeline/testdata/go/publisher/go.mod +++ b/backend/timeline/testdata/go/publisher/go.mod @@ -15,7 +15,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/backend/timeline/testdata/go/publisher/go.sum b/backend/timeline/testdata/go/publisher/go.sum index bb905de77d..29b6eb4e00 100644 --- a/backend/timeline/testdata/go/publisher/go.sum +++ b/backend/timeline/testdata/go/publisher/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/backend/timeline/testdata/go/subscriber/go.mod b/backend/timeline/testdata/go/subscriber/go.mod index b6a45ff68c..2c655371bf 100644 --- a/backend/timeline/testdata/go/subscriber/go.mod +++ b/backend/timeline/testdata/go/subscriber/go.mod @@ -14,7 +14,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/backend/timeline/testdata/go/subscriber/go.sum b/backend/timeline/testdata/go/subscriber/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/backend/timeline/testdata/go/subscriber/go.sum +++ b/backend/timeline/testdata/go/subscriber/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/backend/timeline/testdata/go/time/go.mod b/backend/timeline/testdata/go/time/go.mod index 14f469a585..f38c3e202b 100644 --- a/backend/timeline/testdata/go/time/go.mod +++ b/backend/timeline/testdata/go/time/go.mod @@ -15,7 +15,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/backend/timeline/testdata/go/time/go.sum b/backend/timeline/testdata/go/time/go.sum index bb905de77d..29b6eb4e00 100644 --- a/backend/timeline/testdata/go/time/go.sum +++ b/backend/timeline/testdata/go/time/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/cmd/ftl/cmd_serve.go b/cmd/ftl/cmd_serve.go index 769b62fdb5..0ee385b4f6 100644 --- a/cmd/ftl/cmd_serve.go +++ b/cmd/ftl/cmd_serve.go @@ -161,7 +161,7 @@ func (s *serveCommonConfig) run( } if s.EnableGrafana && !bool(s.ObservabilityConfig.ExportOTEL) { - if err := dev.SetupGrafana(ctx, s.GrafanaImage); err != nil { + if err := dev.SetupGrafana(ctx, projConfig, s.GrafanaImage); err != nil { logger.Errorf(err, "Failed to setup grafana image") } else { logger.Infof("Grafana started at http://localhost:3000") @@ -174,7 +174,7 @@ func (s *serveCommonConfig) run( return errors.Wrap(err, "observability init failed") } // Bring up the image registry we use to store deployment content - if err := dev.SetupRegistry(ctx, s.RegistryImage, s.RegistryPort); err != nil { + if err := dev.SetupRegistry(ctx, projConfig, s.RegistryImage, s.RegistryPort); err != nil { return errors.Wrap(err, "registry init failed") } storage, err := artefacts.NewOCIRegistryStorage(ctx, artefacts.RegistryConfig{ @@ -253,7 +253,7 @@ func (s *serveCommonConfig) run( provisionerRegistry := &provisioner.ProvisionerRegistry{ Bindings: []*provisioner.ProvisionerBinding{ { - Provisioner: provisioner.NewDevProvisioner(s.DBPort, s.MysqlPort, s.Recreate), + Provisioner: provisioner.NewDevProvisioner(projConfig, s.DBPort, s.MysqlPort, s.Recreate), Types: []schema.ResourceType{ schema.ResourceTypeMysql, schema.ResourceTypePostgres, diff --git a/cmd/ftl/main.go b/cmd/ftl/main.go index 00e872a863..c5c198230e 100644 --- a/cmd/ftl/main.go +++ b/cmd/ftl/main.go @@ -169,14 +169,6 @@ func main() { // Set some envars for child processes. os.Setenv("LOG_LEVEL", cli.LogConfig.Level.String()) - configPath := cli.ConfigFlag - if configPath == "" { - var ok bool - configPath, ok = projectconfig.DefaultConfigPath().Get() - if !ok { - kctx.Fatalf("could not determine default config path, either place an ftl-project.toml file in the root of your project, use --config=FILE, or set the FTL_CONFIG envar") - } - } if terminal.IsANSITerminal(ctx) { cli.LogConfig.Color = true } @@ -189,8 +181,6 @@ func main() { logger.Warnf("--insecure skips TLS certificate verification") } - os.Setenv("FTL_CONFIG", configPath) - bindContext := makeBindContext(logger, cancel, csm) ctx = bindContext(ctx, kctx) @@ -218,6 +208,7 @@ func createKongApplication(cli any, csm *currentStatusManager) *kong.Kong { if !ok { return nil } + return &kong.Group{Key: node.Name, Title: "Command flags:"} }), kong.Vars{ @@ -248,6 +239,7 @@ func makeBindContext(logger *log.Logger, cancel context.CancelCauseFunc, csm *cu if err != nil && !errors.Is(err, os.ErrNotExist) { return config, errors.WithStack(err) } + os.Setenv("FTL_CONFIG", config.Path) return config, nil }) kctx.FatalIfErrorf(err) diff --git a/cmd/ftl/testdata/go/time/go.mod b/cmd/ftl/testdata/go/time/go.mod index 14f469a585..f38c3e202b 100644 --- a/cmd/ftl/testdata/go/time/go.mod +++ b/cmd/ftl/testdata/go/time/go.mod @@ -15,7 +15,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/cmd/ftl/testdata/go/time/go.sum b/cmd/ftl/testdata/go/time/go.sum index bb905de77d..29b6eb4e00 100644 --- a/cmd/ftl/testdata/go/time/go.sum +++ b/cmd/ftl/testdata/go/time/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/common/internal/tests/testdata/go/omitempty/go.mod b/common/internal/tests/testdata/go/omitempty/go.mod index 50679beb92..c20475b40b 100644 --- a/common/internal/tests/testdata/go/omitempty/go.mod +++ b/common/internal/tests/testdata/go/omitempty/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/common/internal/tests/testdata/go/omitempty/go.sum b/common/internal/tests/testdata/go/omitempty/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/common/internal/tests/testdata/go/omitempty/go.sum +++ b/common/internal/tests/testdata/go/omitempty/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/common/internal/tests/testdata/go/runtimereflection/go.mod b/common/internal/tests/testdata/go/runtimereflection/go.mod index 0e6f7926d0..07f1ca176a 100644 --- a/common/internal/tests/testdata/go/runtimereflection/go.mod +++ b/common/internal/tests/testdata/go/runtimereflection/go.mod @@ -15,7 +15,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/repr v0.4.0 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/common/internal/tests/testdata/go/runtimereflection/go.sum b/common/internal/tests/testdata/go/runtimereflection/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/common/internal/tests/testdata/go/runtimereflection/go.sum +++ b/common/internal/tests/testdata/go/runtimereflection/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/examples/go/cron/go.mod b/examples/go/cron/go.mod index 5977e0522a..baf0fcabf1 100644 --- a/examples/go/cron/go.mod +++ b/examples/go/cron/go.mod @@ -14,7 +14,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/examples/go/cron/go.sum b/examples/go/cron/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/examples/go/cron/go.sum +++ b/examples/go/cron/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/examples/go/echo/go.mod b/examples/go/echo/go.mod index 359cc060ba..156a5743f5 100644 --- a/examples/go/echo/go.mod +++ b/examples/go/echo/go.mod @@ -5,7 +5,7 @@ go 1.24.0 replace github.com/block/ftl => ../../.. require ( - github.com/alecthomas/errors v0.7.0 + github.com/alecthomas/errors v0.8.2 github.com/block/ftl v0.0.0-00010101000000-000000000000 ) diff --git a/examples/go/echo/go.sum b/examples/go/echo/go.sum index bb905de77d..29b6eb4e00 100644 --- a/examples/go/echo/go.sum +++ b/examples/go/echo/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/examples/go/http/go.mod b/examples/go/http/go.mod index b79d5b2211..d65b1bd651 100644 --- a/examples/go/http/go.mod +++ b/examples/go/http/go.mod @@ -14,7 +14,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/examples/go/http/go.sum b/examples/go/http/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/examples/go/http/go.sum +++ b/examples/go/http/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/examples/go/mysql/go.mod b/examples/go/mysql/go.mod index 3d735fe15f..c2052d79a6 100644 --- a/examples/go/mysql/go.mod +++ b/examples/go/mysql/go.mod @@ -4,7 +4,7 @@ go 1.24.0 require ( github.com/alecthomas/assert/v2 v2.11.0 - github.com/alecthomas/errors v0.7.0 + github.com/alecthomas/errors v0.8.2 github.com/alecthomas/types v0.19.0 github.com/block/ftl v0.189.0 ) diff --git a/examples/go/mysql/go.sum b/examples/go/mysql/go.sum index 939cdf617b..5306804f19 100644 --- a/examples/go/mysql/go.sum +++ b/examples/go/mysql/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/examples/go/postgres/go.mod b/examples/go/postgres/go.mod index c8836bf79a..83263cb8d7 100644 --- a/examples/go/postgres/go.mod +++ b/examples/go/postgres/go.mod @@ -4,7 +4,7 @@ go 1.24.0 require ( github.com/alecthomas/assert/v2 v2.11.0 - github.com/alecthomas/errors v0.7.0 + github.com/alecthomas/errors v0.8.2 github.com/block/ftl v0.189.0 ) diff --git a/examples/go/postgres/go.sum b/examples/go/postgres/go.sum index 939cdf617b..5306804f19 100644 --- a/examples/go/postgres/go.sum +++ b/examples/go/postgres/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/examples/go/pubsub/go.mod b/examples/go/pubsub/go.mod index 2963cfe75c..8c4755229b 100644 --- a/examples/go/pubsub/go.mod +++ b/examples/go/pubsub/go.mod @@ -5,7 +5,7 @@ go 1.24.0 replace github.com/block/ftl => ../../.. require ( - github.com/alecthomas/errors v0.7.0 + github.com/alecthomas/errors v0.8.2 github.com/block/ftl v0.0.0-00010101000000-000000000000 golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 ) diff --git a/examples/go/pubsub/go.sum b/examples/go/pubsub/go.sum index bb905de77d..29b6eb4e00 100644 --- a/examples/go/pubsub/go.sum +++ b/examples/go/pubsub/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/examples/go/time/go.mod b/examples/go/time/go.mod index b0c2939a11..fd20870b77 100644 --- a/examples/go/time/go.mod +++ b/examples/go/time/go.mod @@ -5,7 +5,7 @@ go 1.24.0 replace github.com/block/ftl => ../../.. require ( - github.com/alecthomas/errors v0.7.0 + github.com/alecthomas/errors v0.8.2 github.com/block/ftl v0.0.0-00010101000000-000000000000 ) diff --git a/examples/go/time/go.sum b/examples/go/time/go.sum index bb905de77d..29b6eb4e00 100644 --- a/examples/go/time/go.sum +++ b/examples/go/time/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/compile/testdata/go/echo/go.mod b/go-runtime/compile/testdata/go/echo/go.mod index d24c4dcf0e..20622fa906 100644 --- a/go-runtime/compile/testdata/go/echo/go.mod +++ b/go-runtime/compile/testdata/go/echo/go.mod @@ -15,7 +15,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/go-runtime/compile/testdata/go/echo/go.sum b/go-runtime/compile/testdata/go/echo/go.sum index bb905de77d..29b6eb4e00 100644 --- a/go-runtime/compile/testdata/go/echo/go.sum +++ b/go-runtime/compile/testdata/go/echo/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/compile/testdata/go/external/go.mod b/go-runtime/compile/testdata/go/external/go.mod index 51a7890a42..066d0bbcb4 100644 --- a/go-runtime/compile/testdata/go/external/go.mod +++ b/go-runtime/compile/testdata/go/external/go.mod @@ -5,7 +5,7 @@ go 1.24.0 require github.com/block/ftl v0.206.1 require ( - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/deckarep/golang-set/v2 v2.8.0 // indirect diff --git a/go-runtime/compile/testdata/go/external/go.sum b/go-runtime/compile/testdata/go/external/go.sum index 6f3d47bdf6..3c5d494aac 100644 --- a/go-runtime/compile/testdata/go/external/go.sum +++ b/go-runtime/compile/testdata/go/external/go.sum @@ -1,7 +1,7 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/compile/testdata/go/missingqueries/go.mod b/go-runtime/compile/testdata/go/missingqueries/go.mod index 3468b61c53..464dffabbb 100644 --- a/go-runtime/compile/testdata/go/missingqueries/go.mod +++ b/go-runtime/compile/testdata/go/missingqueries/go.mod @@ -16,7 +16,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect diff --git a/go-runtime/compile/testdata/go/missingqueries/go.sum b/go-runtime/compile/testdata/go/missingqueries/go.sum index bb905de77d..29b6eb4e00 100644 --- a/go-runtime/compile/testdata/go/missingqueries/go.sum +++ b/go-runtime/compile/testdata/go/missingqueries/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/compile/testdata/go/notexportedverb/go.mod b/go-runtime/compile/testdata/go/notexportedverb/go.mod index a044ca6320..c9442b3702 100644 --- a/go-runtime/compile/testdata/go/notexportedverb/go.mod +++ b/go-runtime/compile/testdata/go/notexportedverb/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/go-runtime/compile/testdata/go/notexportedverb/go.sum b/go-runtime/compile/testdata/go/notexportedverb/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/go-runtime/compile/testdata/go/notexportedverb/go.sum +++ b/go-runtime/compile/testdata/go/notexportedverb/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/compile/testdata/go/one/go.mod b/go-runtime/compile/testdata/go/one/go.mod index c6f2712fd7..2143570efc 100644 --- a/go-runtime/compile/testdata/go/one/go.mod +++ b/go-runtime/compile/testdata/go/one/go.mod @@ -15,7 +15,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/go-runtime/compile/testdata/go/one/go.sum b/go-runtime/compile/testdata/go/one/go.sum index bb905de77d..29b6eb4e00 100644 --- a/go-runtime/compile/testdata/go/one/go.sum +++ b/go-runtime/compile/testdata/go/one/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/compile/testdata/go/time/go.mod b/go-runtime/compile/testdata/go/time/go.mod index 3895e3f34e..1846a3dcc1 100644 --- a/go-runtime/compile/testdata/go/time/go.mod +++ b/go-runtime/compile/testdata/go/time/go.mod @@ -7,7 +7,7 @@ replace github.com/block/ftl => ../../../../.. require github.com/block/ftl v0.0.0-00010101000000-000000000000 require ( - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/deckarep/golang-set/v2 v2.8.0 // indirect diff --git a/go-runtime/compile/testdata/go/time/go.sum b/go-runtime/compile/testdata/go/time/go.sum index 6f3d47bdf6..3c5d494aac 100644 --- a/go-runtime/compile/testdata/go/time/go.sum +++ b/go-runtime/compile/testdata/go/time/go.sum @@ -1,7 +1,7 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/compile/testdata/go/two/go.mod b/go-runtime/compile/testdata/go/two/go.mod index 2da9c2f2de..5cef8a17bb 100644 --- a/go-runtime/compile/testdata/go/two/go.mod +++ b/go-runtime/compile/testdata/go/two/go.mod @@ -7,7 +7,7 @@ replace github.com/block/ftl => ../../../../.. require github.com/block/ftl v0.0.0-00010101000000-000000000000 require ( - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/deckarep/golang-set/v2 v2.8.0 // indirect diff --git a/go-runtime/compile/testdata/go/two/go.sum b/go-runtime/compile/testdata/go/two/go.sum index 6f3d47bdf6..3c5d494aac 100644 --- a/go-runtime/compile/testdata/go/two/go.sum +++ b/go-runtime/compile/testdata/go/two/go.sum @@ -1,7 +1,7 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/compile/testdata/go/undefinedverb/go.mod b/go-runtime/compile/testdata/go/undefinedverb/go.mod index a044ca6320..c9442b3702 100644 --- a/go-runtime/compile/testdata/go/undefinedverb/go.mod +++ b/go-runtime/compile/testdata/go/undefinedverb/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/go-runtime/compile/testdata/go/undefinedverb/go.sum b/go-runtime/compile/testdata/go/undefinedverb/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/go-runtime/compile/testdata/go/undefinedverb/go.sum +++ b/go-runtime/compile/testdata/go/undefinedverb/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/ftl/ftltest/database.go b/go-runtime/ftl/ftltest/database.go index 6c183301d8..ea7170300c 100644 --- a/go-runtime/ftl/ftltest/database.go +++ b/go-runtime/ftl/ftltest/database.go @@ -13,38 +13,27 @@ import ( // WithDatabase sets up a database for testing by appending "_test" to the DSN and emptying all tables func WithDatabase[T any]() Option { - return Option{ - rank: other, - apply: func(ctx context.Context, state *OptionsState) error { - db := reflection.GetDatabase[T]() - return errors.WithStack(setupTestDatabase(ctx, state, db.DBType, db.Name)) - }, + return func(ctx context.Context, state *testOptions) error { + state.databases = append(state.databases, reflection.GetDatabase[T]().ReflectedDatabase) + return nil } } // WithAllDatabases sets up all databases in the module for testing by appending "_test" to the DSN and emptying all tables func WithAllDatabases() Option { - return Option{ - rank: other, - apply: func(ctx context.Context, state *OptionsState) error { - dbs := reflection.GetAllDatabases() - for _, db := range dbs { - if err := setupTestDatabase(ctx, state, db.DBType, db.Name); err != nil { - return errors.WithStack(err) - } - } - return nil - }, + return func(ctx context.Context, options *testOptions) error { + options.databases = append(options.databases, reflection.GetAllDatabases()...) + return nil } } -func setupTestDatabase(ctx context.Context, state *OptionsState, dbType, dbName string) error { +func setupTestDatabase(ctx context.Context, state *State, dbType, dbName string) error { if _, ok := state.databases[dbName]; ok { return nil } switch dbType { case "postgres": - dsn, err := provisioner.ProvisionPostgresForTest(ctx, moduleGetter(), "test", dbName) + dsn, err := provisioner.ProvisionPostgresForTest(ctx, state.project, moduleGetter(), "test", dbName) if err != nil { return errors.Wrapf(err, "could not provision database %q", dbName) } @@ -63,7 +52,7 @@ func setupTestDatabase(ctx context.Context, state *OptionsState, dbType, dbName } state.databases[dbName] = replacementDB case "mysql": - dsn, err := provisioner.ProvisionMySQLForTest(ctx, moduleGetter(), "test", dbName) + dsn, err := provisioner.ProvisionMySQLForTest(ctx, state.project, moduleGetter(), "test", dbName) if err != nil { return errors.Wrapf(err, "could not provision database %q", dbName) } @@ -87,17 +76,8 @@ func setupTestDatabase(ctx context.Context, state *OptionsState, dbType, dbName // WithSQLVerbsEnabled enables direct execution of SQL verbs (without mocks). It also sets up any associated databases for tests. func WithSQLVerbsEnabled() Option { - return Option{ - rank: other, - apply: func(ctx context.Context, state *OptionsState) error { - state.allowDirectSQLVerbs = true - dbs := reflection.GetQueryVerbDatabases() - for _, db := range dbs { - if err := setupTestDatabase(ctx, state, db.DBType, db.Name); err != nil { - return errors.WithStack(err) - } - } - return nil - }, + return func(ctx context.Context, state *testOptions) error { + state.allowDirectSQLVerbs = true + return nil } } diff --git a/go-runtime/ftl/ftltest/ftltest.go b/go-runtime/ftl/ftltest/ftltest.go index f655dbd702..4ef80b30dc 100644 --- a/go-runtime/ftl/ftltest/ftltest.go +++ b/go-runtime/ftl/ftltest/ftltest.go @@ -7,7 +7,6 @@ import ( "fmt" "os" "reflect" - "sort" "strings" errors "github.com/alecthomas/errors" @@ -28,32 +27,29 @@ import ( "github.com/block/ftl/internal/configuration/providers" "github.com/block/ftl/internal/deploymentcontext" "github.com/block/ftl/internal/log" - pc "github.com/block/ftl/internal/projectconfig" + "github.com/block/ftl/internal/projectconfig" mcu "github.com/block/ftl/internal/testutils/modulecontext" ) // Allows tests to mock module reflection var moduleGetter = reflection.Module -type OptionsState struct { - databases map[string]deploymentcontext.Database - mockVerbs map[schema.RefKey]deploymentcontext.Verb +type testOptions struct { + projectConfigPath optional.Option[string] allowDirectVerbBehavior bool allowDirectSQLVerbs bool + mockVerbs map[schema.RefKey]deploymentcontext.Verb + databases []reflection.ReflectedDatabase } -type optionRank int - -const ( - profile optionRank = iota - other -) - -type Option struct { - rank optionRank - apply func(context.Context, *OptionsState) error +type State struct { + *testOptions + project projectconfig.Config + databases map[string]deploymentcontext.Database } +type Option func(context.Context, *testOptions) error + // Context suitable for use in testing FTL verbs with provided options func Context(options ...Option) context.Context { ctx := log.ContextWithNewDefaultLogger(context.Background()) @@ -62,25 +58,36 @@ func Context(options ...Option) context.Context { } func newContext(ctx context.Context, module string, options ...Option) context.Context { - state := &OptionsState{ - databases: make(map[string]deploymentcontext.Database), + opts := &testOptions{ mockVerbs: make(map[schema.RefKey]deploymentcontext.Verb), } ctx = contextWithFakeFTL(ctx, options...) - sort.Slice(options, func(i, j int) bool { - return options[i].rank < options[j].rank - }) - for _, option := range options { - err := option.apply(ctx, state) + err := option(ctx, opts) if err != nil { panic(fmt.Sprintf("error applying option: %v", err)) } } + project, err := loadProjectConfig(ctx, opts.projectConfigPath) + if err != nil { + panic(fmt.Sprintf("error loading project config: %v", err)) + } + + state := &State{ + testOptions: opts, + databases: make(map[string]deploymentcontext.Database), + project: project, + } + if state.allowDirectSQLVerbs { + for _, db := range opts.databases { + if err := setupTestDatabase(ctx, state, db.DBType, db.Name); err != nil { + panic(errors.WithStack(err)) + } + } querySvc, err := query.New(ctx, &schema.Module{Name: module}, xsync.NewMapOf[string, string]()) if err != nil { panic(errors.Wrap(err, "failed to create in-process query service to execute query verbs")) @@ -131,61 +138,54 @@ func WithDefaultProjectFile() Option { // // ... other options // ) func WithProjectFile(path string) Option { - // Convert to absolute path immediately in case working directory changes - var preprocessingErr error - if path == "" { - var ok bool - path, ok = pc.DefaultConfigPath().Get() - if !ok { - preprocessingErr = errors.Errorf("could not find default project file in $FTL_CONFIG or git") - } + return func(ctx context.Context, options *testOptions) error { + options.projectConfigPath = optional.Some(path) + return nil } - return Option{ - rank: profile, - apply: func(ctx context.Context, state *OptionsState) error { - if preprocessingErr != nil { - return errors.WithStack(preprocessingErr) - } - if _, err := os.Stat(path); err != nil { - return errors.Wrap(err, "error accessing project file") - } - projectConfig, err := pc.Load(ctx, optional.Some(path)) - if err != nil { - return errors.Wrap(err, "project") - } - cm, err := cf.NewDefaultConfigurationManagerFromConfig(ctx, providers.NewDefaultConfigRegistry(), projectConfig) - if err != nil { - return errors.Wrap(err, "could not set up configs") - } - configs, err := cm.MapForModule(ctx, moduleGetter()) - if err != nil { - return errors.Wrap(err, "could not read configs") - } +} - fftl := internal.FromContext(ctx).(*fakeFTL) //nolint:forcetypeassert - for name, data := range configs { - if err := fftl.setConfig(name, json.RawMessage(data)); err != nil { - return errors.WithStack(err) - } - } +func loadProjectConfig(ctx context.Context, path optional.Option[string]) (projectconfig.Config, error) { + projectConfig, err := projectconfig.Load(ctx, path) + if err != nil { + return projectconfig.Config{}, errors.Wrap(err, "project") + } + if projectConfig.Path == "" { + projectConfig.Path, err = os.Getwd() + if err != nil { + return projectconfig.Config{}, errors.Wrap(err, "could not get working directory") + } + return projectConfig, nil + } + cm, err := cf.NewDefaultConfigurationManagerFromConfig(ctx, providers.NewDefaultConfigRegistry(), projectConfig) + if err != nil { + return projectconfig.Config{}, errors.Wrap(err, "could not set up configs") + } + configs, err := cm.MapForModule(ctx, moduleGetter()) + if err != nil { + return projectconfig.Config{}, errors.Wrap(err, "could not read configs") + } - sm, err := cf.NewDefaultSecretsManagerFromConfig(ctx, providers.NewDefaultSecretsRegistry(), projectConfig) - if err != nil { - return errors.Wrap(err, "could not set up secrets") - } - secrets, err := sm.MapForModule(ctx, moduleGetter()) - if err != nil { - return errors.Wrap(err, "could not read secrets") - } - for name, data := range secrets { - if err := fftl.setSecret(name, json.RawMessage(data)); err != nil { - return errors.WithStack(err) - } - } - return nil - }, + fftl := internal.FromContext(ctx).(*fakeFTL) //nolint:forcetypeassert + for name, data := range configs { + if err := fftl.setConfig(name, json.RawMessage(data)); err != nil { + return projectconfig.Config{}, errors.WithStack(err) + } } + sm, err := cf.NewDefaultSecretsManagerFromConfig(ctx, providers.NewDefaultSecretsRegistry(), projectConfig) + if err != nil { + return projectconfig.Config{}, errors.Wrap(err, "could not set up secrets") + } + secrets, err := sm.MapForModule(ctx, moduleGetter()) + if err != nil { + return projectconfig.Config{}, errors.Wrap(err, "could not read secrets") + } + for name, data := range secrets { + if err := fftl.setSecret(name, json.RawMessage(data)); err != nil { + return projectconfig.Config{}, errors.WithStack(err) + } + } + return projectConfig, nil } // WithConfig sets a configuration for the current module @@ -197,18 +197,15 @@ func WithProjectFile(path string) Option { // // ... other options // ) func WithConfig[T ftl.ConfigType](config ftl.Config[T], value T) Option { - return Option{ - rank: other, - apply: func(ctx context.Context, state *OptionsState) error { - if config.Module != moduleGetter() { - return errors.Errorf("config %v does not match current module %s", config.Module, moduleGetter()) - } - fftl := internal.FromContext(ctx).(*fakeFTL) //nolint:forcetypeassert - if err := fftl.setConfig(config.Name, value); err != nil { - return errors.WithStack(err) - } - return nil - }, + return func(ctx context.Context, state *testOptions) error { + if config.Module != moduleGetter() { + return errors.Errorf("config %v does not match current module %s", config.Module, moduleGetter()) + } + fftl := internal.FromContext(ctx).(*fakeFTL) //nolint:forcetypeassert + if err := fftl.setConfig(config.Name, value); err != nil { + return errors.WithStack(err) + } + return nil } } @@ -221,18 +218,15 @@ func WithConfig[T ftl.ConfigType](config ftl.Config[T], value T) Option { // // ... other options // ) func WithSecret[T ftl.SecretType](secret ftl.Secret[T], value T) Option { - return Option{ - rank: other, - apply: func(ctx context.Context, state *OptionsState) error { - if secret.Module != moduleGetter() { - return errors.Errorf("secret %v does not match current module %s", secret.Module, moduleGetter()) - } - fftl := internal.FromContext(ctx).(*fakeFTL) //nolint:forcetypeassert - if err := fftl.setSecret(secret.Name, value); err != nil { - return errors.WithStack(err) - } - return nil - }, + return func(ctx context.Context, state *testOptions) error { + if secret.Module != moduleGetter() { + return errors.Errorf("secret %v does not match current module %s", secret.Module, moduleGetter()) + } + fftl := internal.FromContext(ctx).(*fakeFTL) //nolint:forcetypeassert + if err := fftl.setSecret(secret.Name, value); err != nil { + return errors.WithStack(err) + } + return nil } } @@ -247,19 +241,16 @@ func WithSecret[T ftl.SecretType](secret ftl.Secret[T], value T) Option { // // ... other options // ) func WhenVerb[VerbClient, Req, Resp any](fake ftl.Verb[Req, Resp]) Option { - return Option{ - rank: other, - apply: func(ctx context.Context, state *OptionsState) error { - ref := reflection.ClientRef[VerbClient]() - state.mockVerbs[schema.RefKey(ref)] = func(ctx context.Context, req any) (resp any, err error) { - request, ok := req.(Req) - if !ok { - return nil, errors.Errorf("invalid request type %T for %v, expected %v", req, ref, reflect.TypeFor[Req]()) - } - return errors.WithStack2(fake(ctx, request)) + return func(ctx context.Context, state *testOptions) error { + ref := reflection.ClientRef[VerbClient]() + state.mockVerbs[schema.RefKey(ref)] = func(ctx context.Context, req any) (resp any, err error) { + request, ok := req.(Req) + if !ok { + return nil, errors.Errorf("invalid request type %T for %v, expected %v", req, ref, reflect.TypeFor[Req]()) } - return nil - }, + return errors.WithStack2(fake(ctx, request)) + } + return nil } } @@ -274,15 +265,12 @@ func WhenVerb[VerbClient, Req, Resp any](fake ftl.Verb[Req, Resp]) Option { // // ... other options // ) func WhenSource[SourceClient, Resp any](fake ftl.Source[Resp]) Option { - return Option{ - rank: other, - apply: func(ctx context.Context, state *OptionsState) error { - ref := reflection.ClientRef[SourceClient]() - state.mockVerbs[schema.RefKey(ref)] = func(ctx context.Context, req any) (resp any, err error) { - return errors.WithStack2(fake(ctx)) - } - return nil - }, + return func(ctx context.Context, state *testOptions) error { + ref := reflection.ClientRef[SourceClient]() + state.mockVerbs[schema.RefKey(ref)] = func(ctx context.Context, req any) (resp any, err error) { + return errors.WithStack2(fake(ctx)) + } + return nil } } @@ -297,19 +285,16 @@ func WhenSource[SourceClient, Resp any](fake ftl.Source[Resp]) Option { // // ... other options // ) func WhenSink[SinkClient, Req any](fake ftl.Sink[Req]) Option { - return Option{ - rank: other, - apply: func(ctx context.Context, state *OptionsState) error { - ref := reflection.ClientRef[SinkClient]() - state.mockVerbs[schema.RefKey(ref)] = func(ctx context.Context, req any) (resp any, err error) { - request, ok := req.(Req) - if !ok { - return nil, errors.Errorf("invalid request type %T for %v, expected %v", req, ref, reflect.TypeFor[Req]()) - } - return ftl.Unit{}, errors.WithStack(fake(ctx, request)) + return func(ctx context.Context, state *testOptions) error { + ref := reflection.ClientRef[SinkClient]() + state.mockVerbs[schema.RefKey(ref)] = func(ctx context.Context, req any) (resp any, err error) { + request, ok := req.(Req) + if !ok { + return nil, errors.Errorf("invalid request type %T for %v, expected %v", req, ref, reflect.TypeFor[Req]()) } - return nil - }, + return ftl.Unit{}, errors.WithStack(fake(ctx, request)) + } + return nil } } @@ -323,15 +308,12 @@ func WhenSink[SinkClient, Req any](fake ftl.Sink[Req]) Option { // }), // ) func WhenEmpty[EmptyClient any](fake ftl.Empty) Option { - return Option{ - rank: other, - apply: func(ctx context.Context, state *OptionsState) error { - ref := reflection.ClientRef[EmptyClient]() - state.mockVerbs[schema.RefKey(ref)] = func(ctx context.Context, req any) (resp any, err error) { - return ftl.Unit{}, errors.WithStack(fake(ctx)) - } - return nil - }, + return func(ctx context.Context, state *testOptions) error { + ref := reflection.ClientRef[EmptyClient]() + state.mockVerbs[schema.RefKey(ref)] = func(ctx context.Context, req any) (resp any, err error) { + return ftl.Unit{}, errors.WithStack(fake(ctx)) + } + return nil } } @@ -339,12 +321,9 @@ func WhenEmpty[EmptyClient any](fake ftl.Empty) Option { // // Any overrides provided by calling WhenVerb(...) will take precedence func WithCallsAllowedWithinModule() Option { - return Option{ - rank: other, - apply: func(ctx context.Context, state *OptionsState) error { - state.allowDirectVerbBehavior = true - return nil - }, + return func(ctx context.Context, state *testOptions) error { + state.allowDirectVerbBehavior = true + return nil } } @@ -359,13 +338,10 @@ func WithCallsAllowedWithinModule() Option { // // ... other options // ) func WhenMap[T, U any](mapper *ftl.MapHandle[T, U], fake func(context.Context) (U, error)) Option { - return Option{ - rank: other, - apply: func(ctx context.Context, state *OptionsState) error { - fftl := internal.FromContext(ctx).(*fakeFTL) //nolint:forcetypeassert - addMapMock(fftl, mapper, fake) - return nil - }, + return func(ctx context.Context, state *testOptions) error { + fftl := internal.FromContext(ctx).(*fakeFTL) //nolint:forcetypeassert + addMapMock(fftl, mapper, fake) + return nil } } @@ -374,13 +350,10 @@ func WhenMap[T, U any](mapper *ftl.MapHandle[T, U], fake func(context.Context) ( // // Any overrides provided by calling WhenMap(...) will take precedence. func WithMapsAllowed() Option { - return Option{ - rank: other, - apply: func(ctx context.Context, state *OptionsState) error { - fftl := internal.FromContext(ctx).(*fakeFTL) //nolint:forcetypeassert - fftl.startAllowingMapCalls() - return nil - }, + return func(ctx context.Context, state *testOptions) error { + fftl := internal.FromContext(ctx).(*fakeFTL) //nolint:forcetypeassert + fftl.startAllowingMapCalls() + return nil } } diff --git a/go-runtime/ftl/ftltest/testdata/go/outer/go.mod b/go-runtime/ftl/ftltest/testdata/go/outer/go.mod index ca7cb9d54f..b37b3d6241 100644 --- a/go-runtime/ftl/ftltest/testdata/go/outer/go.mod +++ b/go-runtime/ftl/ftltest/testdata/go/outer/go.mod @@ -10,7 +10,7 @@ require ( ) require ( - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/repr v0.4.0 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/go-runtime/ftl/ftltest/testdata/go/outer/go.sum b/go-runtime/ftl/ftltest/testdata/go/outer/go.sum index 6f3d47bdf6..3c5d494aac 100644 --- a/go-runtime/ftl/ftltest/testdata/go/outer/go.sum +++ b/go-runtime/ftl/ftltest/testdata/go/outer/go.sum @@ -1,7 +1,7 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/ftl/ftltest/testdata/go/pubsub/go.mod b/go-runtime/ftl/ftltest/testdata/go/pubsub/go.mod index e90f3f033c..639970a264 100644 --- a/go-runtime/ftl/ftltest/testdata/go/pubsub/go.mod +++ b/go-runtime/ftl/ftltest/testdata/go/pubsub/go.mod @@ -13,7 +13,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/go-runtime/ftl/ftltest/testdata/go/pubsub/go.sum b/go-runtime/ftl/ftltest/testdata/go/pubsub/go.sum index bb905de77d..29b6eb4e00 100644 --- a/go-runtime/ftl/ftltest/testdata/go/pubsub/go.sum +++ b/go-runtime/ftl/ftltest/testdata/go/pubsub/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/ftl/ftltest/testdata/go/subscriber/go.mod b/go-runtime/ftl/ftltest/testdata/go/subscriber/go.mod index 85db4053d1..d7eb24f446 100644 --- a/go-runtime/ftl/ftltest/testdata/go/subscriber/go.mod +++ b/go-runtime/ftl/ftltest/testdata/go/subscriber/go.mod @@ -20,7 +20,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/repr v0.4.0 // indirect diff --git a/go-runtime/ftl/ftltest/testdata/go/subscriber/go.sum b/go-runtime/ftl/ftltest/testdata/go/subscriber/go.sum index 939cdf617b..5306804f19 100644 --- a/go-runtime/ftl/ftltest/testdata/go/subscriber/go.sum +++ b/go-runtime/ftl/ftltest/testdata/go/subscriber/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/ftl/ftltest/testdata/go/time/go.mod b/go-runtime/ftl/ftltest/testdata/go/time/go.mod index be0439f358..2702862017 100644 --- a/go-runtime/ftl/ftltest/testdata/go/time/go.mod +++ b/go-runtime/ftl/ftltest/testdata/go/time/go.mod @@ -7,7 +7,7 @@ replace github.com/block/ftl => ./../../../../../.. require github.com/block/ftl v0.0.0-00010101000000-000000000000 require ( - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/deckarep/golang-set/v2 v2.8.0 // indirect diff --git a/go-runtime/ftl/ftltest/testdata/go/time/go.sum b/go-runtime/ftl/ftltest/testdata/go/time/go.sum index d1afb13001..435a781f9b 100644 --- a/go-runtime/ftl/ftltest/testdata/go/time/go.sum +++ b/go-runtime/ftl/ftltest/testdata/go/time/go.sum @@ -1,7 +1,7 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/ftl/ftltest/testdata/go/verbtypes/go.mod b/go-runtime/ftl/ftltest/testdata/go/verbtypes/go.mod index fdd5dc4082..b252359653 100644 --- a/go-runtime/ftl/ftltest/testdata/go/verbtypes/go.mod +++ b/go-runtime/ftl/ftltest/testdata/go/verbtypes/go.mod @@ -4,7 +4,7 @@ go 1.24.0 require ( github.com/alecthomas/assert/v2 v2.11.0 - github.com/alecthomas/errors v0.7.0 + github.com/alecthomas/errors v0.8.2 github.com/block/ftl v0.201.0 ) diff --git a/go-runtime/ftl/ftltest/testdata/go/verbtypes/go.sum b/go-runtime/ftl/ftltest/testdata/go/verbtypes/go.sum index 939cdf617b..5306804f19 100644 --- a/go-runtime/ftl/ftltest/testdata/go/verbtypes/go.sum +++ b/go-runtime/ftl/ftltest/testdata/go/verbtypes/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/ftl/ftltest/testdata/go/wrapped/go.mod b/go-runtime/ftl/ftltest/testdata/go/wrapped/go.mod index 9e45ea3c31..855ee6a951 100644 --- a/go-runtime/ftl/ftltest/testdata/go/wrapped/go.mod +++ b/go-runtime/ftl/ftltest/testdata/go/wrapped/go.mod @@ -20,7 +20,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/repr v0.4.0 // indirect diff --git a/go-runtime/ftl/ftltest/testdata/go/wrapped/go.sum b/go-runtime/ftl/ftltest/testdata/go/wrapped/go.sum index 939cdf617b..5306804f19 100644 --- a/go-runtime/ftl/ftltest/testdata/go/wrapped/go.sum +++ b/go-runtime/ftl/ftltest/testdata/go/wrapped/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/ftl/testdata/go/echo/go.mod b/go-runtime/ftl/testdata/go/echo/go.mod index 750a6ad54e..7a5f27ad6d 100644 --- a/go-runtime/ftl/testdata/go/echo/go.mod +++ b/go-runtime/ftl/testdata/go/echo/go.mod @@ -15,7 +15,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/go-runtime/ftl/testdata/go/echo/go.sum b/go-runtime/ftl/testdata/go/echo/go.sum index bb905de77d..29b6eb4e00 100644 --- a/go-runtime/ftl/testdata/go/echo/go.sum +++ b/go-runtime/ftl/testdata/go/echo/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/ftl/testdata/go/mapper/go.mod b/go-runtime/ftl/testdata/go/mapper/go.mod index e58227d654..7cd273badd 100644 --- a/go-runtime/ftl/testdata/go/mapper/go.mod +++ b/go-runtime/ftl/testdata/go/mapper/go.mod @@ -20,7 +20,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/repr v0.4.0 // indirect diff --git a/go-runtime/ftl/testdata/go/mapper/go.sum b/go-runtime/ftl/testdata/go/mapper/go.sum index 939cdf617b..5306804f19 100644 --- a/go-runtime/ftl/testdata/go/mapper/go.sum +++ b/go-runtime/ftl/testdata/go/mapper/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/ftl/testdata/go/time/go.mod b/go-runtime/ftl/testdata/go/time/go.mod index 0aa696467e..20847b7213 100644 --- a/go-runtime/ftl/testdata/go/time/go.mod +++ b/go-runtime/ftl/testdata/go/time/go.mod @@ -7,7 +7,7 @@ replace github.com/block/ftl => ./../../../../.. require github.com/block/ftl v0.0.0-00010101000000-000000000000 require ( - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/deckarep/golang-set/v2 v2.8.0 // indirect diff --git a/go-runtime/ftl/testdata/go/time/go.sum b/go-runtime/ftl/testdata/go/time/go.sum index 6f3d47bdf6..3c5d494aac 100644 --- a/go-runtime/ftl/testdata/go/time/go.sum +++ b/go-runtime/ftl/testdata/go/time/go.sum @@ -1,7 +1,7 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/ftl/testdata/go/typeregistry/go.mod b/go-runtime/ftl/testdata/go/typeregistry/go.mod index b3e2ae5234..928b156b53 100644 --- a/go-runtime/ftl/testdata/go/typeregistry/go.mod +++ b/go-runtime/ftl/testdata/go/typeregistry/go.mod @@ -20,7 +20,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/repr v0.4.0 // indirect diff --git a/go-runtime/ftl/testdata/go/typeregistry/go.sum b/go-runtime/ftl/testdata/go/typeregistry/go.sum index 939cdf617b..5306804f19 100644 --- a/go-runtime/ftl/testdata/go/typeregistry/go.sum +++ b/go-runtime/ftl/testdata/go/typeregistry/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/goplugin/testdata/alpha/go.mod b/go-runtime/goplugin/testdata/alpha/go.mod index 69ad8bfde8..1ebbc281a2 100644 --- a/go-runtime/goplugin/testdata/alpha/go.mod +++ b/go-runtime/goplugin/testdata/alpha/go.mod @@ -13,7 +13,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/go-runtime/goplugin/testdata/alpha/go.sum b/go-runtime/goplugin/testdata/alpha/go.sum index bb905de77d..29b6eb4e00 100644 --- a/go-runtime/goplugin/testdata/alpha/go.sum +++ b/go-runtime/goplugin/testdata/alpha/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/goplugin/testdata/another/go.mod b/go-runtime/goplugin/testdata/another/go.mod index 1dfa3c560f..e92c72eaef 100644 --- a/go-runtime/goplugin/testdata/another/go.mod +++ b/go-runtime/goplugin/testdata/another/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/go-runtime/goplugin/testdata/another/go.sum b/go-runtime/goplugin/testdata/another/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/go-runtime/goplugin/testdata/another/go.sum +++ b/go-runtime/goplugin/testdata/another/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/goplugin/testdata/other/go.mod b/go-runtime/goplugin/testdata/other/go.mod index 0796038765..f9074fae71 100644 --- a/go-runtime/goplugin/testdata/other/go.mod +++ b/go-runtime/goplugin/testdata/other/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/go-runtime/goplugin/testdata/other/go.sum b/go-runtime/goplugin/testdata/other/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/go-runtime/goplugin/testdata/other/go.sum +++ b/go-runtime/goplugin/testdata/other/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/internal/testdata/go/mapper/go.mod b/go-runtime/internal/testdata/go/mapper/go.mod index f3ee93c1e5..c4c640d260 100644 --- a/go-runtime/internal/testdata/go/mapper/go.mod +++ b/go-runtime/internal/testdata/go/mapper/go.mod @@ -14,7 +14,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/go-runtime/internal/testdata/go/mapper/go.sum b/go-runtime/internal/testdata/go/mapper/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/go-runtime/internal/testdata/go/mapper/go.sum +++ b/go-runtime/internal/testdata/go/mapper/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/schema/testdata/failing/go.mod b/go-runtime/schema/testdata/failing/go.mod index 37a49c09bd..7e53dbfcdf 100644 --- a/go-runtime/schema/testdata/failing/go.mod +++ b/go-runtime/schema/testdata/failing/go.mod @@ -14,7 +14,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/go-runtime/schema/testdata/failing/go.sum b/go-runtime/schema/testdata/failing/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/go-runtime/schema/testdata/failing/go.sum +++ b/go-runtime/schema/testdata/failing/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/schema/testdata/named/go.mod b/go-runtime/schema/testdata/named/go.mod index 25f8a2a4d3..cfa973df5a 100644 --- a/go-runtime/schema/testdata/named/go.mod +++ b/go-runtime/schema/testdata/named/go.mod @@ -7,7 +7,7 @@ replace github.com/block/ftl => ../../../.. require github.com/block/ftl v0.430.1 require ( - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/deckarep/golang-set/v2 v2.8.0 // indirect diff --git a/go-runtime/schema/testdata/named/go.sum b/go-runtime/schema/testdata/named/go.sum index 6f3d47bdf6..3c5d494aac 100644 --- a/go-runtime/schema/testdata/named/go.sum +++ b/go-runtime/schema/testdata/named/go.sum @@ -1,7 +1,7 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/schema/testdata/one/go.mod b/go-runtime/schema/testdata/one/go.mod index 7f9dd07e98..d5cb1bf465 100644 --- a/go-runtime/schema/testdata/one/go.mod +++ b/go-runtime/schema/testdata/one/go.mod @@ -14,7 +14,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/go-runtime/schema/testdata/one/go.sum b/go-runtime/schema/testdata/one/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/go-runtime/schema/testdata/one/go.sum +++ b/go-runtime/schema/testdata/one/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/schema/testdata/parent/go.mod b/go-runtime/schema/testdata/parent/go.mod index 71c8e9790e..9058e0f976 100644 --- a/go-runtime/schema/testdata/parent/go.mod +++ b/go-runtime/schema/testdata/parent/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/go-runtime/schema/testdata/parent/go.sum b/go-runtime/schema/testdata/parent/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/go-runtime/schema/testdata/parent/go.sum +++ b/go-runtime/schema/testdata/parent/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/schema/testdata/pubsub/go.mod b/go-runtime/schema/testdata/pubsub/go.mod index c6162b1aa2..130ec21831 100644 --- a/go-runtime/schema/testdata/pubsub/go.mod +++ b/go-runtime/schema/testdata/pubsub/go.mod @@ -3,7 +3,7 @@ module ftl/pubsub go 1.24.0 require ( - github.com/alecthomas/errors v0.7.0 + github.com/alecthomas/errors v0.8.2 github.com/block/ftl v0.430.1 ) diff --git a/go-runtime/schema/testdata/pubsub/go.sum b/go-runtime/schema/testdata/pubsub/go.sum index bb905de77d..29b6eb4e00 100644 --- a/go-runtime/schema/testdata/pubsub/go.sum +++ b/go-runtime/schema/testdata/pubsub/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/schema/testdata/subscriber/go.mod b/go-runtime/schema/testdata/subscriber/go.mod index 5b63a7e7a6..487114dd89 100644 --- a/go-runtime/schema/testdata/subscriber/go.mod +++ b/go-runtime/schema/testdata/subscriber/go.mod @@ -5,7 +5,7 @@ go 1.24.0 require github.com/block/ftl v0.430.1 require ( - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/deckarep/golang-set/v2 v2.8.0 // indirect diff --git a/go-runtime/schema/testdata/subscriber/go.sum b/go-runtime/schema/testdata/subscriber/go.sum index d1afb13001..435a781f9b 100644 --- a/go-runtime/schema/testdata/subscriber/go.sum +++ b/go-runtime/schema/testdata/subscriber/go.sum @@ -1,7 +1,7 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go-runtime/schema/testdata/two/go.mod b/go-runtime/schema/testdata/two/go.mod index e22f41c8f8..e15983632d 100644 --- a/go-runtime/schema/testdata/two/go.mod +++ b/go-runtime/schema/testdata/two/go.mod @@ -18,7 +18,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/go-runtime/schema/testdata/two/go.sum b/go-runtime/schema/testdata/two/go.sum index bb905de77d..29b6eb4e00 100644 --- a/go-runtime/schema/testdata/two/go.sum +++ b/go-runtime/schema/testdata/two/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/go-runtime/schema/testdata/validation/go.mod b/go-runtime/schema/testdata/validation/go.mod index 7303171a01..892e2d4b32 100644 --- a/go-runtime/schema/testdata/validation/go.mod +++ b/go-runtime/schema/testdata/validation/go.mod @@ -14,7 +14,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/go-runtime/schema/testdata/validation/go.sum b/go-runtime/schema/testdata/validation/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/go-runtime/schema/testdata/validation/go.sum +++ b/go-runtime/schema/testdata/validation/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/go.mod b/go.mod index 87e563d4f7..c55c4f88a1 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/alecthomas/atomic v0.1.0-alpha2 github.com/alecthomas/chroma/v2 v2.16.0 github.com/alecthomas/concurrency v0.0.2 - github.com/alecthomas/errors v0.7.0 + github.com/alecthomas/errors v0.8.2 github.com/alecthomas/kong v1.10.0 github.com/alecthomas/kong-toml v0.2.0 github.com/alecthomas/participle/v2 v2.1.4 diff --git a/go.sum b/go.sum index eb8f1f86f5..baf9242386 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ github.com/alecthomas/chroma/v2 v2.16.0 h1:QC5ZMizk67+HzxFDjQ4ASjni5kWBTGiigRG1u github.com/alecthomas/chroma/v2 v2.16.0/go.mod h1:RVX6AvYm4VfYe/zsk7mjHueLDZor3aWCNE14TFlepBk= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/kong-toml v0.2.0 h1:RmUe7ajGUvGD1ew8tGkbLzIYZ0YrUxsYdF/7hfTaYV0= diff --git a/internal/buildengine/languageplugin/testdata/go/plugintest/go.mod b/internal/buildengine/languageplugin/testdata/go/plugintest/go.mod index 1e25052c46..5e7fc3d444 100644 --- a/internal/buildengine/languageplugin/testdata/go/plugintest/go.mod +++ b/internal/buildengine/languageplugin/testdata/go/plugintest/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/internal/buildengine/languageplugin/testdata/go/plugintest/go.sum b/internal/buildengine/languageplugin/testdata/go/plugintest/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/internal/buildengine/languageplugin/testdata/go/plugintest/go.sum +++ b/internal/buildengine/languageplugin/testdata/go/plugintest/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/internal/buildengine/testdata/alpha/go.mod b/internal/buildengine/testdata/alpha/go.mod index 69ad8bfde8..1ebbc281a2 100644 --- a/internal/buildengine/testdata/alpha/go.mod +++ b/internal/buildengine/testdata/alpha/go.mod @@ -13,7 +13,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/internal/buildengine/testdata/alpha/go.sum b/internal/buildengine/testdata/alpha/go.sum index bb905de77d..29b6eb4e00 100644 --- a/internal/buildengine/testdata/alpha/go.sum +++ b/internal/buildengine/testdata/alpha/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/internal/buildengine/testdata/another/go.mod b/internal/buildengine/testdata/another/go.mod index 1dfa3c560f..e92c72eaef 100644 --- a/internal/buildengine/testdata/another/go.mod +++ b/internal/buildengine/testdata/another/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/internal/buildengine/testdata/another/go.sum b/internal/buildengine/testdata/another/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/internal/buildengine/testdata/another/go.sum +++ b/internal/buildengine/testdata/another/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/internal/buildengine/testdata/other/go.mod b/internal/buildengine/testdata/other/go.mod index 0796038765..f9074fae71 100644 --- a/internal/buildengine/testdata/other/go.mod +++ b/internal/buildengine/testdata/other/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/internal/buildengine/testdata/other/go.sum b/internal/buildengine/testdata/other/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/internal/buildengine/testdata/other/go.sum +++ b/internal/buildengine/testdata/other/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/internal/config/asm_integration_test.go b/internal/config/asm_integration_test.go index 3e9bf1b0f2..cc0c37180e 100644 --- a/internal/config/asm_integration_test.go +++ b/internal/config/asm_integration_test.go @@ -15,6 +15,7 @@ import ( "github.com/block/ftl/internal/config" "github.com/block/ftl/internal/container" "github.com/block/ftl/internal/log" + "github.com/block/ftl/internal/projectconfig" ) //go:embed testdata/docker-compose.yml @@ -22,7 +23,9 @@ var composeYAML string func TestASMIntegration(t *testing.T) { ctx := log.ContextWithNewDefaultLogger(context.TODO()) - down, err := container.ComposeUp(ctx, "asm", composeYAML, optional.None[string]()) + project, err := projectconfig.Load(ctx, optional.None[string]()) + assert.NoError(t, err) + down, err := container.ComposeUp(ctx, project, "asm", composeYAML, optional.None[string]()) assert.NoError(t, err) t.Cleanup(func() { assert.NoError(t, down()) }) diff --git a/internal/configuration/routers/projectconfig_router_test.go b/internal/configuration/routers/projectconfig_router_test.go index 4802f41470..c797c9d31d 100644 --- a/internal/configuration/routers/projectconfig_router_test.go +++ b/internal/configuration/routers/projectconfig_router_test.go @@ -15,29 +15,8 @@ import ( "github.com/block/ftl/internal/configuration/providers" "github.com/block/ftl/internal/configuration/routers" "github.com/block/ftl/internal/log" - "github.com/block/ftl/internal/projectconfig" ) -func TestSet(t *testing.T) { - defaultPath, ok := projectconfig.DefaultConfigPath().Get() - assert.True(t, ok) - origConfigBytes, err := os.ReadFile(defaultPath) - assert.NoError(t, err) - - config := filepath.Join(t.TempDir(), "ftl-project.toml") - existing, err := os.ReadFile("testdata/ftl-project.toml") - assert.NoError(t, err) - err = os.WriteFile(config, existing, 0600) - assert.NoError(t, err) - - setAndAssert(t, "echo", config) - setAndAssert(t, "echooo", config) - - // Restore the original config file. - err = os.WriteFile(defaultPath, origConfigBytes, 0600) - assert.NoError(t, err) -} - func TestGetGlobal(t *testing.T) { config := filepath.Join(t.TempDir(), "ftl-project.toml") existing, err := os.ReadFile("testdata/ftl-project.toml") diff --git a/internal/container/container.go b/internal/container/container.go index 1face9776a..ec62674809 100644 --- a/internal/container/container.go +++ b/internal/container/container.go @@ -360,17 +360,11 @@ func PollContainerHealth(ctx context.Context, containerName string, timeout time // reading from disk. The project file will not be included in the release build. // // The "down" function can be optionally called to stop the containers. -func ComposeUp(ctx context.Context, name, composeYAML string, profile optional.Option[string], envars ...string) (down func() error, err error) { +func ComposeUp(ctx context.Context, project projectconfig.Config, name, composeYAML string, profile optional.Option[string], envars ...string) (down func() error, err error) { logger := log.FromContext(ctx).Scope(name) ctx = log.ContextWithLogger(ctx, logger) - // A flock is used to provent Docker compose getting confused, which happens when we call `docker compose up` - // multiple times simultaneously for the same services. - projCfg, ok := projectconfig.DefaultConfigPath().Get() - if !ok { - return nil, errors.Errorf("failed to get project config path") - } - dir := filepath.Join(filepath.Dir(projCfg), ".ftl") + dir := filepath.Join(project.Root(), ".ftl") err = os.MkdirAll(dir, 0700) if err != nil { return nil, errors.Wrap(err, "failed to create directory") diff --git a/internal/dev/db.go b/internal/dev/db.go index 31b244bbb0..99c7664284 100644 --- a/internal/dev/db.go +++ b/internal/dev/db.go @@ -19,6 +19,7 @@ import ( "github.com/block/ftl/internal/dsn" "github.com/block/ftl/internal/log" "github.com/block/ftl/internal/observability" + "github.com/block/ftl/internal/projectconfig" ) //go:embed docker-compose.mysql.yml @@ -105,7 +106,7 @@ func PostgresDSN(ctx context.Context, port int) string { return dsn.PostgresDSN("ftl", dsn.Port(port)) } -func SetupPostgres(ctx context.Context, image optional.Option[string], port int, recreate bool) error { +func SetupPostgres(ctx context.Context, project projectconfig.Config, image optional.Option[string], port int, recreate bool) error { postgresLock.Lock() defer postgresLock.Unlock() @@ -121,7 +122,7 @@ func SetupPostgres(ctx context.Context, image optional.Option[string], port int, if imaneName, ok := image.Get(); ok { envars = append(envars, "FTL_DATABASE_IMAGE="+imaneName) } - _, err := container.ComposeUp(ctx, "postgres", postgresDockerCompose, optional.None[string](), envars...) + _, err := container.ComposeUp(ctx, project, "postgres", postgresDockerCompose, optional.None[string](), envars...) if err != nil { return errors.Wrap(err, "could not start postgres") } @@ -133,7 +134,7 @@ func SetupPostgres(ctx context.Context, image optional.Option[string], port int, return nil } -func SetupMySQL(ctx context.Context, port int) (string, error) { +func SetupMySQL(ctx context.Context, project projectconfig.Config, port int) (string, error) { mysqlLock.Lock() defer mysqlLock.Unlock() @@ -146,7 +147,7 @@ func SetupMySQL(ctx context.Context, port int) (string, error) { if port != 0 { envars = append(envars, "MYSQL_PORT="+strconv.Itoa(port)) } - _, err := container.ComposeUp(ctx, "mysql", mysqlDockerCompose, optional.None[string](), envars...) + _, err := container.ComposeUp(ctx, project, "mysql", mysqlDockerCompose, optional.None[string](), envars...) if err != nil { return "", errors.Wrap(err, "could not start mysql") } diff --git a/internal/dev/grafana.go b/internal/dev/grafana.go index 792bcae028..5c509c323a 100644 --- a/internal/dev/grafana.go +++ b/internal/dev/grafana.go @@ -8,13 +8,14 @@ import ( "github.com/alecthomas/types/optional" "github.com/block/ftl/internal/container" + "github.com/block/ftl/internal/projectconfig" ) //go:embed docker-compose.grafana.yml var grafanaDockerCompose string -func SetupGrafana(ctx context.Context, image string) error { - _, err := container.ComposeUp(ctx, "grafana", grafanaDockerCompose, optional.None[string]()) +func SetupGrafana(ctx context.Context, project projectconfig.Config, image string) error { + _, err := container.ComposeUp(ctx, project, "grafana", grafanaDockerCompose, optional.None[string]()) if err != nil { return errors.Wrap(err, "could not start grafana") } diff --git a/internal/dev/redpanda.go b/internal/dev/redpanda.go index 7dbd785e42..62f4ca8c6c 100644 --- a/internal/dev/redpanda.go +++ b/internal/dev/redpanda.go @@ -10,6 +10,7 @@ import ( "github.com/alecthomas/types/optional" "github.com/block/ftl/internal/container" + "github.com/block/ftl/internal/projectconfig" ) //go:embed docker-compose.redpanda.yml @@ -19,7 +20,7 @@ var redpandaDockerCompose string var redPandaLock = &sync.Mutex{} var redPandaRunning bool -func SetUpRedPanda(ctx context.Context) error { +func SetUpRedPanda(ctx context.Context, project projectconfig.Config) error { redPandaLock.Lock() defer redPandaLock.Unlock() @@ -31,7 +32,7 @@ func SetUpRedPanda(ctx context.Context) error { // include console except in CI profile = optional.Some[string]("console") } - _, err := container.ComposeUp(ctx, "redpanda", redpandaDockerCompose, profile) + _, err := container.ComposeUp(ctx, project, "redpanda", redpandaDockerCompose, profile) if err != nil { return errors.Wrap(err, "could not start redpanda") } diff --git a/internal/dev/registry.go b/internal/dev/registry.go index f0cb02163b..39e2898bf0 100644 --- a/internal/dev/registry.go +++ b/internal/dev/registry.go @@ -12,13 +12,14 @@ import ( "github.com/alecthomas/types/optional" "github.com/block/ftl/internal/container" + "github.com/block/ftl/internal/projectconfig" ) //go:embed docker-compose.registry.yml var registryDockerCompose string -func SetupRegistry(ctx context.Context, image string, port int) error { - _, err := container.ComposeUp(ctx, "registry", registryDockerCompose, optional.None[string](), +func SetupRegistry(ctx context.Context, project projectconfig.Config, image string, port int) error { + _, err := container.ComposeUp(ctx, project, "registry", registryDockerCompose, optional.None[string](), "FTL_REGISTRY_IMAGE="+image, "FTL_REGISTRY_PORT="+strconv.Itoa(port)) if err != nil { diff --git a/internal/exec/exec.go b/internal/exec/exec.go index a76c5c6522..ac3d106587 100644 --- a/internal/exec/exec.go +++ b/internal/exec/exec.go @@ -3,6 +3,7 @@ package exec import ( "bytes" "context" + "fmt" "os" "os/exec" //nolint:depguard "strings" @@ -61,8 +62,8 @@ func CommandWithEnv(ctx context.Context, level log.Level, dir string, env []stri func (c *Cmd) RunBuffered(ctx context.Context) error { outputBuffer := NewCircularBuffer(100) output := outputBuffer.WriterAt(ctx, c.level) - c.Cmd.Stdout = output - c.Cmd.Stderr = output + c.Stdout = output + c.Stderr = output err := c.Run() if err != nil { @@ -79,12 +80,13 @@ func (c *Cmd) RunBuffered(ctx context.Context) error { // RunStderrError runs the command and captures stderr. If the command fails, the stderr is returned as the error message. func (c *Cmd) RunStderrError(ctx context.Context) error { errorBuffer := NewCircularBuffer(100) + output := errorBuffer.WriterAt(ctx, c.level) - c.Cmd.Stdout = nil - c.Cmd.Stderr = errorBuffer.WriterAt(ctx, c.level) + c.Stdout = output + c.Stderr = output if err := c.Run(); err != nil { - return errors.WithStack(errors.New(strings.TrimSpace(string(errorBuffer.Bytes())))) + return errors.Wrap(err, c.String()+": "+strings.TrimSpace(string(errorBuffer.Bytes()))) } return nil @@ -99,7 +101,7 @@ func (c *Cmd) Capture(ctx context.Context) ([]byte, error) { c.Stderr = errorBuffer.WriterAt(ctx, c.level) if err := c.Run(); err != nil { - return nil, errors.WithStack(errors.New(strings.TrimSpace(string(errorBuffer.Bytes())))) + return nil, errors.Wrap(err, c.String()+": "+strings.TrimSpace(string(errorBuffer.Bytes()))) } return outBuffer.Bytes(), nil @@ -112,3 +114,5 @@ func (c *Cmd) Kill(signal syscall.Signal) error { } return errors.WithStack(syscall.Kill(c.Process.Pid, signal)) } + +func (c *Cmd) String() string { return fmt.Sprintf("cd %s && %s", c.Dir, shellquote.Join(c.Args...)) } diff --git a/internal/pgproxy/pgproxy_test.go b/internal/pgproxy/pgproxy_test.go index 5cc5adb2e5..306891406a 100644 --- a/internal/pgproxy/pgproxy_test.go +++ b/internal/pgproxy/pgproxy_test.go @@ -13,14 +13,18 @@ import ( "github.com/block/ftl/internal/dev" "github.com/block/ftl/internal/log" "github.com/block/ftl/internal/pgproxy" + "github.com/block/ftl/internal/projectconfig" ) func TestPgProxy(t *testing.T) { ctx := log.ContextWithNewDefaultLogger(context.Background()) client, proxy := net.Pipe() + project, err := projectconfig.Load(ctx, optional.None[string]()) + assert.NoError(t, err) + dsn := dev.PostgresDSN(ctx, 0) - err := dev.SetupPostgres(ctx, optional.None[string](), 0, false) + err = dev.SetupPostgres(ctx, project, optional.None[string](), 0, false) assert.NoError(t, err) frontend := pgproto3.NewFrontend(client, client) diff --git a/internal/projectconfig/projectconfig.go b/internal/projectconfig/projectconfig.go index 8486d8e93f..57651924f3 100644 --- a/internal/projectconfig/projectconfig.go +++ b/internal/projectconfig/projectconfig.go @@ -96,12 +96,12 @@ func (c Config) AbsModuleDirs() []string { return absDirs } -// DefaultConfigPath returns the absolute default path for the project config file, if possible. +// defaultConfigPath returns the absolute default path for the project config file, if possible. // // The default path is determined by the FTL_CONFIG environment variable, if set, or by the presence of a Git // repository. If the Git repository is found, the default path is the root of the repository with the filename // "ftl-project.toml". -func DefaultConfigPath() optional.Option[string] { +func defaultConfigPath() optional.Option[string] { if envar, ok := os.LookupEnv("FTL_CONFIG"); ok { absPath, err := filepath.Abs(envar) if err != nil { @@ -156,11 +156,13 @@ func Create(ctx context.Context, config Config, dir string) error { } // Load project config from a file. +// +// Will return an empty Config if a path is not provided and a default config cannot be found. func Load(ctx context.Context, configPath optional.Option[string]) (Config, error) { var path string var ok bool if path, ok = configPath.Get(); !ok { - maybePath, ok := DefaultConfigPath().Get() + maybePath, ok := defaultConfigPath().Get() if !ok { return Config{}, nil } diff --git a/internal/projectconfig/testdata/go/echo/go.mod b/internal/projectconfig/testdata/go/echo/go.mod index 5996153b35..d5f33384d7 100644 --- a/internal/projectconfig/testdata/go/echo/go.mod +++ b/internal/projectconfig/testdata/go/echo/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/internal/projectconfig/testdata/go/echo/go.sum b/internal/projectconfig/testdata/go/echo/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/internal/projectconfig/testdata/go/echo/go.sum +++ b/internal/projectconfig/testdata/go/echo/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/internal/projectconfig/testdata/go/findconfig/go.mod b/internal/projectconfig/testdata/go/findconfig/go.mod index e14ce1b72c..602d6253d7 100644 --- a/internal/projectconfig/testdata/go/findconfig/go.mod +++ b/internal/projectconfig/testdata/go/findconfig/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/internal/projectconfig/testdata/go/findconfig/go.sum b/internal/projectconfig/testdata/go/findconfig/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/internal/projectconfig/testdata/go/findconfig/go.sum +++ b/internal/projectconfig/testdata/go/findconfig/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/internal/projectconfig/testdata/go/validateconfig/go.mod b/internal/projectconfig/testdata/go/validateconfig/go.mod index 620d34aa53..df9ea75b58 100644 --- a/internal/projectconfig/testdata/go/validateconfig/go.mod +++ b/internal/projectconfig/testdata/go/validateconfig/go.mod @@ -13,7 +13,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/internal/projectconfig/testdata/go/validateconfig/go.sum b/internal/projectconfig/testdata/go/validateconfig/go.sum index bb905de77d..29b6eb4e00 100644 --- a/internal/projectconfig/testdata/go/validateconfig/go.sum +++ b/internal/projectconfig/testdata/go/validateconfig/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/internal/watch/testdata/alpha/go.mod b/internal/watch/testdata/alpha/go.mod index 69ad8bfde8..1ebbc281a2 100644 --- a/internal/watch/testdata/alpha/go.mod +++ b/internal/watch/testdata/alpha/go.mod @@ -13,7 +13,7 @@ require ( github.com/XSAM/otelsql v0.38.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/kong v1.10.0 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect diff --git a/internal/watch/testdata/alpha/go.sum b/internal/watch/testdata/alpha/go.sum index bb905de77d..29b6eb4e00 100644 --- a/internal/watch/testdata/alpha/go.sum +++ b/internal/watch/testdata/alpha/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/internal/watch/testdata/another/go.mod b/internal/watch/testdata/another/go.mod index 1dfa3c560f..e92c72eaef 100644 --- a/internal/watch/testdata/another/go.mod +++ b/internal/watch/testdata/another/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/internal/watch/testdata/another/go.sum b/internal/watch/testdata/another/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/internal/watch/testdata/another/go.sum +++ b/internal/watch/testdata/another/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/internal/watch/testdata/other/go.mod b/internal/watch/testdata/other/go.mod index 0796038765..f9074fae71 100644 --- a/internal/watch/testdata/other/go.mod +++ b/internal/watch/testdata/other/go.mod @@ -12,7 +12,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/internal/watch/testdata/other/go.sum b/internal/watch/testdata/other/go.sum index 13a14e8f72..2194e3f0d9 100644 --- a/internal/watch/testdata/other/go.sum +++ b/internal/watch/testdata/other/go.sum @@ -18,8 +18,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/jvm-runtime/testdata/go/gomodule/go.mod b/jvm-runtime/testdata/go/gomodule/go.mod index b30b22047b..7c4627aec5 100644 --- a/jvm-runtime/testdata/go/gomodule/go.mod +++ b/jvm-runtime/testdata/go/gomodule/go.mod @@ -17,7 +17,7 @@ require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/alecthomas/atomic v0.1.0-alpha2 // indirect github.com/alecthomas/concurrency v0.0.2 // indirect - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/benbjohnson/clock v1.3.5 // indirect diff --git a/jvm-runtime/testdata/go/gomodule/go.sum b/jvm-runtime/testdata/go/gomodule/go.sum index f32d6f3554..b2485f04c7 100644 --- a/jvm-runtime/testdata/go/gomodule/go.sum +++ b/jvm-runtime/testdata/go/gomodule/go.sum @@ -19,8 +19,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/smoketest/echo/go.mod b/smoketest/echo/go.mod index ff2b88ba64..231ca7d22c 100644 --- a/smoketest/echo/go.mod +++ b/smoketest/echo/go.mod @@ -7,7 +7,7 @@ replace github.com/block/ftl => ../.. require github.com/block/ftl v0.476.1 require ( - github.com/alecthomas/errors v0.7.0 // indirect + github.com/alecthomas/errors v0.8.2 // indirect github.com/alecthomas/participle/v2 v2.1.4 // indirect github.com/alecthomas/types v0.19.0 // indirect github.com/deckarep/golang-set/v2 v2.8.0 // indirect diff --git a/smoketest/echo/go.sum b/smoketest/echo/go.sum index d1afb13001..435a781f9b 100644 --- a/smoketest/echo/go.sum +++ b/smoketest/echo/go.sum @@ -1,7 +1,7 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= github.com/alecthomas/participle/v2 v2.1.4/go.mod h1:8tqVbpTX20Ru4NfYQgZf4mP18eXPTBViyMWiArNEgGI= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= diff --git a/smoketest/origin/go.mod b/smoketest/origin/go.mod index 184cc2d4bc..71bbfde438 100644 --- a/smoketest/origin/go.mod +++ b/smoketest/origin/go.mod @@ -3,7 +3,7 @@ module ftl/origin go 1.24.0 require ( - github.com/alecthomas/errors v0.7.0 + github.com/alecthomas/errors v0.8.2 github.com/block/ftl v0.476.1 ) diff --git a/smoketest/origin/go.sum b/smoketest/origin/go.sum index bb905de77d..29b6eb4e00 100644 --- a/smoketest/origin/go.sum +++ b/smoketest/origin/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U= diff --git a/smoketest/relay/go.mod b/smoketest/relay/go.mod index 0f65e410f5..5b0e51cb47 100644 --- a/smoketest/relay/go.mod +++ b/smoketest/relay/go.mod @@ -3,7 +3,7 @@ module ftl/relay go 1.24.0 require ( - github.com/alecthomas/errors v0.7.0 + github.com/alecthomas/errors v0.8.2 github.com/block/ftl v0.476.1 ) diff --git a/smoketest/relay/go.sum b/smoketest/relay/go.sum index bb905de77d..29b6eb4e00 100644 --- a/smoketest/relay/go.sum +++ b/smoketest/relay/go.sum @@ -24,8 +24,8 @@ github.com/alecthomas/atomic v0.1.0-alpha2 h1:dqwXmax66gXvHhsOS4pGPZKqYOlTkapELk github.com/alecthomas/atomic v0.1.0-alpha2/go.mod h1:zD6QGEyw49HIq19caJDc2NMXAy8rNi9ROrxtMXATfyI= github.com/alecthomas/concurrency v0.0.2 h1:Q3kGPtLbleMbH9lHX5OBFvJygfyFw29bXZKBg+IEVuo= github.com/alecthomas/concurrency v0.0.2/go.mod h1:GmuQb/iHX7mbNtPlC/WDzEFxDMB0HYFer2Qda9QTs7w= -github.com/alecthomas/errors v0.7.0 h1:lBKNV+t5Qrx+k6WUg6xz0yRfXvbj6ZF2vLzdIIZ5sFM= -github.com/alecthomas/errors v0.7.0/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= +github.com/alecthomas/errors v0.8.2 h1:PLif19+0yYe+MRyCNjphmSzD3uAXnmdDzHIdlP2xkrg= +github.com/alecthomas/errors v0.8.2/go.mod h1:0DQf6/xQp3f9rv+k72g2NmeTW2lC74kXA6b/8dN9BwY= github.com/alecthomas/kong v1.10.0 h1:8K4rGDpT7Iu+jEXCIJUeKqvpwZHbsFRoebLbnzlmrpw= github.com/alecthomas/kong v1.10.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/participle/v2 v2.1.4 h1:W/H79S8Sat/krZ3el6sQMvMaahJ+XcM9WSI2naI7w2U=