From 7e318f705eeb9db91a12ca4bfcd2784cc3d17c5c Mon Sep 17 00:00:00 2001 From: Nathaniel Caza Date: Wed, 27 Nov 2024 13:43:44 -0600 Subject: [PATCH 1/4] build(deps): update dependencies to latest versions --- go.mod | 30 +++++++++---------- go.sum | 64 ++++++++++++++++++++--------------------- pkg/sysapi/sysapi.pb.go | 2 +- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/go.mod b/go.mod index 70bed9db15..4ea5e1f7cb 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23 toolchain go1.23.3 require ( - github.com/99designs/gqlgen v0.17.56 + github.com/99designs/gqlgen v0.17.57 github.com/brianvoe/gofakeit/v6 v6.28.0 github.com/coreos/go-oidc/v3 v3.11.0 github.com/creack/pty/v2 v2.0.1 @@ -33,10 +33,10 @@ require ( github.com/pelletier/go-toml/v2 v2.2.3 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.20.5 - github.com/riverqueue/river v0.14.1 - github.com/riverqueue/river/cmd/river v0.14.1 - github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.1 - github.com/riverqueue/river/rivertype v0.14.1 + github.com/riverqueue/river v0.14.2 + github.com/riverqueue/river/cmd/river v0.14.2 + github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.2 + github.com/riverqueue/river/rivertype v0.14.2 github.com/samber/slog-logrus v1.0.0 github.com/sirupsen/logrus v1.9.3 github.com/slack-go/slack v0.15.0 @@ -44,7 +44,7 @@ require ( github.com/spf13/viper v1.19.0 github.com/sqlc-dev/pqtype v0.3.0 github.com/stretchr/testify v1.10.0 - github.com/vektah/gqlparser/v2 v2.5.19 + github.com/vektah/gqlparser/v2 v2.5.20 golang.org/x/crypto v0.29.0 golang.org/x/oauth2 v0.24.0 golang.org/x/sys v0.27.0 @@ -52,9 +52,9 @@ require ( golang.org/x/tools v0.27.0 google.golang.org/grpc v1.68.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 - google.golang.org/protobuf v1.35.1 + google.golang.org/protobuf v1.35.2 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df - riverqueue.com/riverui v0.5.3 + riverqueue.com/riverui v0.6.0 ) require ( @@ -79,12 +79,12 @@ require ( github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/fullstorydev/grpcurl v1.9.1 // indirect - github.com/gabriel-vasile/mimetype v1.4.6 // indirect + github.com/gabriel-vasile/mimetype v1.4.7 // indirect github.com/go-jose/go-jose/v3 v3.0.3 // indirect github.com/go-jose/go-jose/v4 v4.0.4 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.22.1 // indirect + github.com/go-playground/validator/v10 v10.23.0 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/go-querystring v1.1.0 // indirect @@ -105,7 +105,7 @@ require ( github.com/jhump/protoreflect v1.17.0 // indirect github.com/klauspost/compress v1.17.11 // indirect github.com/leodido/go-urn v1.4.0 // indirect - github.com/lmittmann/tint v1.0.4 // indirect + github.com/lmittmann/tint v1.0.5 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -121,8 +121,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.60.1 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/riverqueue/river/riverdriver v0.14.1 // indirect - github.com/riverqueue/river/rivershared v0.14.1 // indirect + github.com/riverqueue/river/riverdriver v0.14.2 // indirect + github.com/riverqueue/river/rivershared v0.14.2 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/sagikazarmark/locafero v0.6.0 // indirect @@ -150,8 +150,8 @@ require ( golang.org/x/net v0.31.0 // indirect golang.org/x/sync v0.9.0 // indirect golang.org/x/text v0.20.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 1fc3b53d40..1e4710bcc1 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ cel.dev/expr v0.18.0 h1:CJ6drgk+Hf96lkLikr4rFf19WrU0BOWEihyZnI2TAzo= cel.dev/expr v0.18.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo= cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k= -github.com/99designs/gqlgen v0.17.56 h1:+J42ARAHvnysH6klO9Wq+tCsGF32cpAgU3SyF0VRJtI= -github.com/99designs/gqlgen v0.17.56/go.mod h1:rmB6vLvtL8uf9F9w0/irJ5alBkD8DJvj35ET31BKbtY= +github.com/99designs/gqlgen v0.17.57 h1:Ak4p60BRq6QibxY0lEc0JnQhDurfhxA67sp02lMjmPc= +github.com/99designs/gqlgen v0.17.57/go.mod h1:Jx61hzOSTcR4VJy/HFIgXiQ5rJ0Ypw8DxWLjbYDAUw0= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= @@ -86,8 +86,8 @@ github.com/fullstorydev/grpcui v1.5.0 h1:jOoKLMIbAFwZLlOWzfEXGpwNi4IKbWIlpxllvcW github.com/fullstorydev/grpcui v1.5.0/go.mod h1:zsf22AMRaRqVCAxo3sVrbh7ZexlO70JGACwGenuBsgA= github.com/fullstorydev/grpcurl v1.9.1 h1:YxX1aCcCc4SDBQfj9uoWcTLe8t4NWrZe1y+mk83BQgo= github.com/fullstorydev/grpcurl v1.9.1/go.mod h1:i8gKLIC6s93WdU3LSmkE5vtsCxyRmihUj5FK1cNW5EM= -github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= -github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= +github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA= +github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU= github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df/go.mod h1:GJr+FCSXshIwgHBtLglIg9M2l2kQSi6QjVAngtzI08Y= github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k= github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= @@ -101,8 +101,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= -github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o= +github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-test/deep v1.0.4 h1:u2CU3YKy9I2pmu9pX0eq50wCgjfGIt539SqR7FbHiho= github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= @@ -243,8 +243,8 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lmittmann/tint v1.0.4 h1:LeYihpJ9hyGvE0w+K2okPTGUdVLfng1+nDNVR4vWISc= -github.com/lmittmann/tint v1.0.4/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= +github.com/lmittmann/tint v1.0.5 h1:NQclAutOfYsqs2F1Lenue6OoWCajs5wJcP3DfWVpePw= +github.com/lmittmann/tint v1.0.5/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/matcornic/hermes/v2 v2.1.0 h1:9TDYFBPFv6mcXanaDmRDEp/RTWj0dTTi+LpFnnnfNWc= @@ -303,20 +303,20 @@ github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPA github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= -github.com/riverqueue/river v0.14.1 h1:t9DIYRcjyRH5hMJx/ecB7TTOySIg+CKWAinB1wOXPFU= -github.com/riverqueue/river v0.14.1/go.mod h1:3cQREff7+iGZC+u2lire03SOxUmT41bjzpqZWAWPXtk= -github.com/riverqueue/river/cmd/river v0.14.1 h1:zDVMYEfkhYE7PgWSzuOdH21VmWQGawSR51DBdblgOWc= -github.com/riverqueue/river/cmd/river v0.14.1/go.mod h1:iNvBeW3rtGUxv1Fs9sF/cnJZZdVRvbHMXtRwamcrzg8= -github.com/riverqueue/river/riverdriver v0.14.1 h1:gf8s2v97DKY12i7nvXqBM/ljHOGbkW2dLVmHvxyyegA= -github.com/riverqueue/river/riverdriver v0.14.1/go.mod h1:bJDNRwDNiCyXv3ZEfOGUvGBEo6C3fNnPc4VQRF1P+Ys= -github.com/riverqueue/river/riverdriver/riverdatabasesql v0.14.1 h1:HE8NK0JQ+GpFsZaJZKSxmWeb15WsfUaAzpNx/eDXbvc= -github.com/riverqueue/river/riverdriver/riverdatabasesql v0.14.1/go.mod h1:C+A3pzwxMwyclSwfeTRyWoDRoFd9BhNmsSPSe8bv4l8= -github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.1 h1:iViK0mabHYm5yUP9peG7wek8YQ9nVbOHhaR1P411mSU= -github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.1/go.mod h1:P9rfgq0hgRM19ty6CHMQTAKUq3crmP28f4BINDfRCyw= -github.com/riverqueue/river/rivershared v0.14.1 h1:lixOqzW20A4f5ubfyl1Gp6TJuSEqYQ2J0UrhB2B12LE= -github.com/riverqueue/river/rivershared v0.14.1/go.mod h1:322qBNl96TTNBdyJ2UNoOfABpvmMAkz4hvnuID1mBs0= -github.com/riverqueue/river/rivertype v0.14.1 h1:f90SKNnmHgePjaxB82ZFi3rkXyVIbOJHSYZ3m6n1UUk= -github.com/riverqueue/river/rivertype v0.14.1/go.mod h1:wVOhGBeay6+JcIi0pTFlF4KtUgHYFkhMYv8dpxU46W0= +github.com/riverqueue/river v0.14.2 h1:I2VJ5HawamDDiL7QIy1XF2/PtwC+Re2y0OBR9Si6v/s= +github.com/riverqueue/river v0.14.2/go.mod h1:RHcZSKQuaYfylhbkIHcw+xUdBia3LtPJr66qsFCMj3Q= +github.com/riverqueue/river/cmd/river v0.14.2 h1:Ytik8AzF4frGcskoBW7F4lvKBXr7oPvn8P1lMg+fYyc= +github.com/riverqueue/river/cmd/river v0.14.2/go.mod h1:srpxZ3Iy0BB+nLLXmWgfGPIy5Y30mmZMKyJGi176z9g= +github.com/riverqueue/river/riverdriver v0.14.2 h1:7WSg3m8gjMbmwMeavBklkABLqy/+ox+Zg7d96zT0yBc= +github.com/riverqueue/river/riverdriver v0.14.2/go.mod h1:Z3mKValBmOfJGfOxd7FWeAQDR9tFkpYObqNS0BSJtMU= +github.com/riverqueue/river/riverdriver/riverdatabasesql v0.14.2 h1:SRUAmpZBIwJj8P8l6DK86z1jp7o31YSg4aresvnC8yc= +github.com/riverqueue/river/riverdriver/riverdatabasesql v0.14.2/go.mod h1:ThZfeDtiphBt3a0iwFQTy7uVTQ1DliC9cXdwNaPDQ2w= +github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.2 h1:+zhN3LGdzEoi/EmmNxMkunmeFd84XAB8ykDD8Rfqoq8= +github.com/riverqueue/river/riverdriver/riverpgxv5 v0.14.2/go.mod h1:OrpOHxAy4wOHGK2bwFKyOgKG353e2Z2EaPwO6RWlZp4= +github.com/riverqueue/river/rivershared v0.14.2 h1:5cUC3jXYi1zLg7tPjsOwDPj9KQuxM1Mf5QBRS6QFHkc= +github.com/riverqueue/river/rivershared v0.14.2/go.mod h1:WZnOZV9KQgittVA01UH3/GI9RSgG0JfDkA/cohqV7v0= +github.com/riverqueue/river/rivertype v0.14.2 h1:otCEcibq2y5+HAxqvVPpc4tgShwISbFWrtqyL8qnI0M= +github.com/riverqueue/river/rivertype v0.14.2/go.mod h1:4vpt5ZSdZ35mFbRAV4oXgeRdH3Mq5h1pUzQTvaGfCUA= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= @@ -410,8 +410,8 @@ github.com/vanng822/go-premailer v0.0.0-20191214114701-be27abe028fe/go.mod h1:JT github.com/vanng822/go-premailer v1.22.0 h1:5gG92q3nG3BwcfUUDzrSDbYDbpwYC/lri4nba+vhdJQ= github.com/vanng822/go-premailer v1.22.0/go.mod h1:K7DxRBW6AxdZUTqmW9jU6041CtfAWiP9uSXm2WmMB1k= github.com/vanng822/r2router v0.0.0-20150523112421-1023140a4f30/go.mod h1:1BVq8p2jVr55Ost2PkZWDrG86PiJ/0lxqcXoAcGxvWU= -github.com/vektah/gqlparser/v2 v2.5.19 h1:bhCPCX1D4WWzCDvkPl4+TP1N8/kLrWnp43egplt7iSg= -github.com/vektah/gqlparser/v2 v2.5.19/go.mod h1:y7kvl5bBlDeuWIvLtA9849ncyvx6/lj06RsMrEjVy3U= +github.com/vektah/gqlparser/v2 v2.5.20 h1:kPaWbhBntxoZPaNdBaIPT1Kh0i1b/onb5kXgEdP5JCo= +github.com/vektah/gqlparser/v2 v2.5.20/go.mod h1:xMl+ta8a5M1Yo1A1Iwt/k7gSpscwSnHZdw7tfhEGfTM= github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4= github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= @@ -574,16 +574,16 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g= -google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 h1:pgr/4QbFyktUv9CtQ/Fq4gzEE6/Xs7iCXbktaGzLHbQ= +google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697/go.mod h1:+D9ySVjN8nY8YCVjc5O7PZDIdZporIDY3KaGfJunh88= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 h1:LWZqQOEjDyONlF1H6afSWpAL/znlREo2tHfLoe+8LMA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0= google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 h1:F29+wU6Ee6qgu9TddPgooOdaqsxTMunOoj8KA5yuS5A= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1/go.mod h1:5KF+wpkbTSbGcR9zteSqZV6fqFOWBl4Yde8En8MryZA= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= @@ -607,5 +607,5 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -riverqueue.com/riverui v0.5.3 h1:SoKWTreMJqTgFYScvoqBva5YZ45bBzgXWEEAv/oQrKE= -riverqueue.com/riverui v0.5.3/go.mod h1:846dydyj0GILXGmiOnsnZ4HYJSfgtQ93jib+joX4no4= +riverqueue.com/riverui v0.6.0 h1:tBJcFwTuZIrnXCQSlLcUNgC/XBlOcFl95B8hF79n8AY= +riverqueue.com/riverui v0.6.0/go.mod h1:kPNZBv4GETdPSkcahrgjc+h9p2ofu27sqXXXaUkwIQk= diff --git a/pkg/sysapi/sysapi.pb.go b/pkg/sysapi/sysapi.pb.go index ab7d6e4b41..ba39b1156f 100644 --- a/pkg/sysapi/sysapi.pb.go +++ b/pkg/sysapi/sysapi.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.1 +// protoc-gen-go v1.35.2 // protoc v5.28.3 // source: pkg/sysapi/sysapi.proto From c0d881b23fbae3819b4df726a9047d3d4457be1a Mon Sep 17 00:00:00 2001 From: Nathaniel Caza Date: Wed, 27 Nov 2024 13:43:53 -0600 Subject: [PATCH 2/4] build(deps): update golangci-lint, mailpit, and protoc to latest versions --- golangci-lint.version | 2 +- mailpit.version | 2 +- protoc.version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/golangci-lint.version b/golangci-lint.version index 76d0536205..6d74a81773 100644 --- a/golangci-lint.version +++ b/golangci-lint.version @@ -1 +1 @@ -1.62.0 +1.62.2 diff --git a/mailpit.version b/mailpit.version index 0369d0b1e9..ce2dd53570 100644 --- a/mailpit.version +++ b/mailpit.version @@ -1 +1 @@ -1.21.2 +1.21.5 diff --git a/protoc.version b/protoc.version index c8de36eb82..231f5c7799 100644 --- a/protoc.version +++ b/protoc.version @@ -1 +1 @@ -28.3 +29.0 From 858a88c9702e00a1a220a0083ecca522c266b41c Mon Sep 17 00:00:00 2001 From: Nathaniel Caza Date: Wed, 27 Nov 2024 13:48:54 -0600 Subject: [PATCH 3/4] regen grpc --- pkg/sysapi/sysapi.pb.go | 2 +- pkg/sysapi/sysapi_grpc.pb.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/sysapi/sysapi.pb.go b/pkg/sysapi/sysapi.pb.go index ba39b1156f..c154564a09 100644 --- a/pkg/sysapi/sysapi.pb.go +++ b/pkg/sysapi/sysapi.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.35.2 -// protoc v5.28.3 +// protoc v5.29.0 // source: pkg/sysapi/sysapi.proto package sysapi diff --git a/pkg/sysapi/sysapi_grpc.pb.go b/pkg/sysapi/sysapi_grpc.pb.go index 90eb01d66e..b801aac7ff 100644 --- a/pkg/sysapi/sysapi_grpc.pb.go +++ b/pkg/sysapi/sysapi_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.5.1 -// - protoc v5.28.3 +// - protoc v5.29.0 // source: pkg/sysapi/sysapi.proto package sysapi From 868becec9fd83e1e6ed30efd7ef5edb680610556 Mon Sep 17 00:00:00 2001 From: Nathaniel Caza Date: Wed, 27 Nov 2024 15:28:19 -0600 Subject: [PATCH 4/4] graphql: enhance error handling for request body validation --- graphql2/graphqlapp/app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphql2/graphqlapp/app.go b/graphql2/graphqlapp/app.go index 46f5158ee7..1e46cf2a7e 100644 --- a/graphql2/graphqlapp/app.go +++ b/graphql2/graphqlapp/app.go @@ -134,7 +134,7 @@ func isGQLValidation(gqlErr *gqlerror.Error) bool { return true } - if strings.HasPrefix(gqlErr.Message, "json request body") || strings.HasPrefix(gqlErr.Message, "could not get json request body:") { + if strings.HasPrefix(gqlErr.Message, "json request body") || strings.HasPrefix(gqlErr.Message, "could not get json request body:") || strings.HasPrefix(gqlErr.Message, "could not read request body:") { var body string gqlErr.Message, body, _ = strings.Cut(gqlErr.Message, " body:") // remove body if !strings.HasPrefix(strings.TrimSpace(body), "{") {