Potential issues as this moves the application to the new DBI interface
that provdes a single (by default) transaction across the entire request
cycle.
Changelog-updated: gobwebs bump and move to DBI interface.
---
cmd/test/helpers.go | 4 ++--
go.mod | 12 ++++++------
go.sum | 24 ++++++++++++------------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/cmd/test/helpers.go b/cmd/test/helpers.go
index 36feda8..6737c32 100644
--- a/cmd/test/helpers.go
+++ b/cmd/test/helpers.go
@@ -192,7 +192,7 @@ func NewAPITestServer(t *testing.T) (*server.Server, *echo.Echo, string) {
srv = srv.
DefaultMiddlewareWithConfig(mwConf).
WithMiddleware(
- database.Middleware(db),
+ database.DBIMiddleware(db),
core.RemoteIPMiddleware,
core.TimezoneContext(),
crypto.Middleware(entropy),
@@ -280,7 +280,7 @@ func getMWChain(s *server.Server, f echo.HandlerFunc, user *models.User) echo.Ha
handlerFunc = authMiddleware(handlerFunc)
sessionMiddleware := sessions.LoadAndSave(s.Session)
handlerFunc = sessionMiddleware(handlerFunc)
- dbMiddleware := database.Middleware(s.DB)
+ dbMiddleware := database.DBIMiddleware(s.DB)
return dbMiddleware(handlerFunc)
}
diff --git a/go.mod b/go.mod
index c9ae738..e70f2c7 100644
--- a/go.mod
+++ b/go.mod
@@ -30,12 +30,12 @@ require (
golang.org/x/text v0.27.0
golang.org/x/time v0.8.0
hg.code.netlandish.com/~netlandish/sendygo v0.0.0-20230124192435-bbf347776232
- netlandish.com/x/gobwebs v0.1.3
- netlandish.com/x/gobwebs-auditlog v0.2.1
- netlandish.com/x/gobwebs-formguard v0.2.1
- netlandish.com/x/gobwebs-graphql v0.2.2
- netlandish.com/x/gobwebs-oauth2 v0.2.1
- netlandish.com/x/gobwebs-ses-feedback v0.2.1
+ netlandish.com/x/gobwebs v0.1.5
+ netlandish.com/x/gobwebs-auditlog v0.2.2
+ netlandish.com/x/gobwebs-formguard v0.2.3
+ netlandish.com/x/gobwebs-graphql v0.2.3
+ netlandish.com/x/gobwebs-oauth2 v0.2.2
+ netlandish.com/x/gobwebs-ses-feedback v0.2.3
petersanchez.com/x/carrier v0.2.3
petersanchez.com/x/carrier/ses v0.0.0-20250114214955-7f5d9b835a85
petersanchez.com/x/carrier/smtp v0.0.0-20250114214955-7f5d9b835a85
diff --git a/go.sum b/go.sum
index 3e8a4fb..a0f957a 100644
--- a/go.sum
+++ b/go.sum
@@ -2578,18 +2578,18 @@ modernc.org/z v1.0.1-0.20210308123920-1f282aa71362/go.mod h1:8/SRk5C/HgiQWCgXdfp
modernc.org/z v1.0.1/go.mod h1:8/SRk5C/HgiQWCgXdfpb+1RvhORdkz5sw72d3jjtyqA=
modernc.org/z v1.2.20/go.mod h1:zU9FiF4PbHdOTUxw+IF8j7ArBMRPsHgq10uVPt6xTzo=
modernc.org/zappy v1.0.0/go.mod h1:hHe+oGahLVII/aTTyWK/b53VDHMAGCBYYeZ9sn83HC4=
-netlandish.com/x/gobwebs v0.1.3 h1:nPLqpM5BJ5HKabGDhbY8TpZ1SdI/MxTy/lnti1FLP6g=
-netlandish.com/x/gobwebs v0.1.3/go.mod h1:RAf0VNiujzXen/pu0k6yyhvPWMgCY9tKD7ftXrkT53E=
-netlandish.com/x/gobwebs-auditlog v0.2.1 h1:3wdULHX3qtWF7qu3vWDMznEoF0Vx/a5xk6S7p6xmffE=
-netlandish.com/x/gobwebs-auditlog v0.2.1/go.mod h1:67Wc5fWo3g0jnviqt1fSCzk+oRxQFE9gLTgJ8IaSRrw=
-netlandish.com/x/gobwebs-formguard v0.2.1 h1:h2OThT9fnntfPrC0OoB3U+23urmcGa17SKHfPzU8dDg=
-netlandish.com/x/gobwebs-formguard v0.2.1/go.mod h1:GHiN6/0phQ8gOu1acrifbwG8P6jMJ6Ij2vJlvHHm+1w=
-netlandish.com/x/gobwebs-graphql v0.2.2 h1:KzHHFkHSJtV2rGqMr2QpnBlI4STTijDgAouliYAzTpY=
-netlandish.com/x/gobwebs-graphql v0.2.2/go.mod h1:E9Xk+dGllPWsIBEE+VyzhedX7kwsygdeOHwxJdJxoYw=
-netlandish.com/x/gobwebs-oauth2 v0.2.1 h1:j/zU13PY0GavaSNnEy+f6ExbkamWBIm4mUIPaQ8gE78=
-netlandish.com/x/gobwebs-oauth2 v0.2.1/go.mod h1:ssioqpjdRNwqFI7Da46A1K08szJzOZaEgIYoTPPYaXo=
-netlandish.com/x/gobwebs-ses-feedback v0.2.1 h1:9BLmmsPmmCkb7DpLzJgBrhibaJOW3NQfPnSlkpjWSnY=
-netlandish.com/x/gobwebs-ses-feedback v0.2.1/go.mod h1:jL9Yvz59RaRnVTPDlE/A+jpwiSLPHSuvP1TIcnTDljI=
+netlandish.com/x/gobwebs v0.1.5 h1:ZYm/zVFOr/D9lRhE4zXWTv27BwDEHP8pPaZafTiPxDo=
+netlandish.com/x/gobwebs v0.1.5/go.mod h1:RAf0VNiujzXen/pu0k6yyhvPWMgCY9tKD7ftXrkT53E=
+netlandish.com/x/gobwebs-auditlog v0.2.2 h1:BqDXkBnK0P2rKqQxliCP6r33Fv1cMUxFB/W65L/LCT0=
+netlandish.com/x/gobwebs-auditlog v0.2.2/go.mod h1:BP+hVVNdsTNgCUaM1JfwnLNsdGwCoyBGxXhDrS8hPww=
+netlandish.com/x/gobwebs-formguard v0.2.3 h1:uXWVGLu7fslk4qGw7ZuVJQcplyh/HOf8kmmuReIlarE=
+netlandish.com/x/gobwebs-formguard v0.2.3/go.mod h1:0nK6mnyCATC32tanPrG5SrXj/Kbsmu4jRLt5JWtWURA=
+netlandish.com/x/gobwebs-graphql v0.2.3 h1:0rjL7YdvWdCvmwT0iofO4PAJ0GVbHum+pAmtfNNp51U=
+netlandish.com/x/gobwebs-graphql v0.2.3/go.mod h1:UDV59+6AOffuJE85u9zRYf6ngPUm6ebxNtb4HL8XaDU=
+netlandish.com/x/gobwebs-oauth2 v0.2.2 h1:Q4tQpCH6bJqrkk8ozmnG6WsykED2BaFXt9VLmJQryHc=
+netlandish.com/x/gobwebs-oauth2 v0.2.2/go.mod h1:Sbi9h2E+5JrCr+vaB+8pmFgQNgdCyPqdvB4cqLXM8GM=
+netlandish.com/x/gobwebs-ses-feedback v0.2.3 h1:yW+1m+TFT6i93NlEoZaPJI1G4ZWBfDEDZGXHsspbC5g=
+netlandish.com/x/gobwebs-ses-feedback v0.2.3/go.mod h1:6iKSktXc1oNHTWQZKY/TyXIj/7uCmLoI7/XK8CKqjsw=
petersanchez.com/x/carrier v0.2.3 h1:6ScWG2HVFqeqafQp2D9kChNdXYkou4rduzppc3SDYMg=
petersanchez.com/x/carrier v0.2.3/go.mod h1:GLiDI9OThDmruufk/VHlR6Ihvq/hIJQyA5beU6AFNYk=
petersanchez.com/x/carrier/ses v0.0.0-20250114214955-7f5d9b835a85 h1:yy81/rrGdI+YWuTvv7JPvVnY104/g10vnloBnKxVAHk=
--
2.49.1
Applied.
To git@git.code.netlandish.com:~netlandish/links
a22df5a..6973ac0 master -> master