Skip to content

Commit c267763

Browse files
olamilekan000olamilekan000
authored
bump pkgs (#2475)
1 parent ea028cd commit c267763

File tree

4 files changed

+231
-242
lines changed

4 files changed

+231
-242
lines changed

‎Dockerfile.dev‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ COPY . .
2424
RUN CGO_ENABLED=0
2525
RUN go install ./cmd
2626

27-
FROM alpine:3.16.2
27+
FROM alpine:3.22.2
2828
COPY --from=build-env /go/bin/cmd /
2929
COPY --from=build-env /go/src/frain-dev/convoy/internal/email/templates/* templates/
3030
COPY --from=build-env /go/src/frain-dev/convoy/configs/local/start.sh /

‎cmd/agent/agent.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ import (
66
"os/signal"
77
"time"
88

9-
workerSrv "github.com/frain-dev/convoy/cmd/worker"
10-
"github.com/frain-dev/convoy/util"
9+
"github.com/spf13/cobra"
1110

1211
"github.com/frain-dev/convoy/api"
1312
"github.com/frain-dev/convoy/api/types"
1413
"github.com/frain-dev/convoy/auth/realm_chain"
1514
ingestSrv "github.com/frain-dev/convoy/cmd/ingest"
15+
workerSrv "github.com/frain-dev/convoy/cmd/worker"
1616
"github.com/frain-dev/convoy/config"
1717
"github.com/frain-dev/convoy/database/postgres"
1818
"github.com/frain-dev/convoy/internal/pkg/cli"
1919
"github.com/frain-dev/convoy/internal/pkg/fflag"
2020
"github.com/frain-dev/convoy/internal/pkg/memorystore"
2121
"github.com/frain-dev/convoy/internal/pkg/server"
2222
"github.com/frain-dev/convoy/pkg/log"
23-
"github.com/spf13/cobra"
23+
"github.com/frain-dev/convoy/util"
2424
)
2525

2626
func AddAgentCommand(a *cli.App) *cobra.Command {

‎go.mod‎

Lines changed: 65 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
module github.com/frain-dev/convoy
22

3-
go 1.24.0
4-
5-
toolchain go1.24.1
3+
go 1.24.9
64

75
require (
8-
cloud.google.com/go/pubsub v1.49.0
6+
cloud.google.com/go/pubsub v1.50.1
97
github.com/DataDog/datadog-go/v5 v5.7.1
108
github.com/Subomi/go-authz v0.2.0
119
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
1210
github.com/aws/aws-sdk-go v1.55.6
1311
github.com/danvixent/asynqmon v0.7.3
1412
github.com/dchest/uniuri v1.2.0
15-
github.com/docker/compose/v2 v2.35.1
13+
github.com/docker/compose/v2 v2.40.2
1614
github.com/dop251/goja v0.0.0-20250309171923-bcd7cc6bf64c
1715
github.com/dop251/goja_nodejs v0.0.0-20250409162600-f7acab6894b0
1816
github.com/exaring/otelpgx v0.9.0
@@ -50,45 +48,44 @@ require (
5048
github.com/prometheus/client_golang v1.22.0
5149
github.com/r3labs/diff/v3 v3.0.1
5250
github.com/rabbitmq/amqp091-go v1.10.0
53-
github.com/redis/go-redis/extra/redisotel/v9 v9.7.3
54-
github.com/redis/go-redis/v9 v9.14.0
51+
github.com/redis/go-redis/extra/redisotel/v9 v9.16.0
52+
github.com/redis/go-redis/v9 v9.16.0
5553
github.com/riandyrn/otelchi v0.12.1
5654
github.com/rubenv/sql-migrate v1.8.0
5755
github.com/sebdah/goldie/v2 v2.5.5
5856
github.com/segmentio/kafka-go v0.4.47
5957
github.com/sirupsen/logrus v1.9.3
6058
github.com/slack-go/slack v0.16.0
61-
github.com/spf13/cobra v1.9.1
62-
github.com/spf13/pflag v1.0.6
59+
github.com/spf13/cobra v1.10.1
60+
github.com/spf13/pflag v1.0.10
6361
github.com/stealthrocket/netjail v0.1.2
6462
github.com/stretchr/testify v1.11.1
6563
github.com/subomi/requestmigrations v0.4.0
6664
github.com/swaggo/swag v1.16.4
67-
github.com/testcontainers/testcontainers-go v0.36.0
68-
github.com/testcontainers/testcontainers-go/modules/compose v0.36.0
65+
github.com/testcontainers/testcontainers-go v0.39.0
66+
github.com/testcontainers/testcontainers-go/modules/compose v0.39.1
6967
github.com/tidwall/gjson v1.18.0
7068
github.com/xdg-go/pbkdf2 v1.0.0
7169
github.com/xeipuuv/gojsonschema v1.2.0
72-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0
70+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0
7371
go.opentelemetry.io/otel v1.38.0
74-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0
72+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0
7573
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0
7674
go.opentelemetry.io/otel/sdk v1.38.0
7775
go.opentelemetry.io/otel/trace v1.38.0
78-
go.uber.org/mock v0.5.1
79-
golang.org/x/crypto v0.42.0
80-
google.golang.org/api v0.229.0
76+
go.uber.org/mock v0.6.0
77+
golang.org/x/crypto v0.43.0
78+
google.golang.org/api v0.254.0
8179
gopkg.in/DataDog/dd-trace-go.v1 v1.69.1
8280
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
8381
gopkg.in/guregu/null.v4 v4.0.0
8482
)
8583

8684
require (
87-
cloud.google.com/go/auth v0.16.0 // indirect
85+
cloud.google.com/go/auth v0.17.0 // indirect
8886
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
89-
dario.cat/mergo v1.0.1 // indirect
90-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
91-
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
87+
cloud.google.com/go/pubsub/v2 v2.0.0 // indirect
88+
dario.cat/mergo v1.0.2 // indirect
9289
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
9390
github.com/DataDog/appsec-internal-go v1.9.0 // indirect
9491
github.com/DataDog/datadog-agent/pkg/obfuscate v0.58.0 // indirect
@@ -98,7 +95,7 @@ require (
9895
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
9996
github.com/DataDog/sketches-go v1.4.5 // indirect
10097
github.com/DefangLabs/secret-detector v0.0.0-20250403165618-22662109213e // indirect
101-
github.com/Masterminds/semver/v3 v3.3.1 // indirect
98+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
10299
github.com/Microsoft/go-winio v0.6.2 // indirect
103100
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
104101
github.com/ajg/form v1.5.1 // indirect
@@ -119,10 +116,10 @@ require (
119116
github.com/aws/smithy-go v1.22.3 // indirect
120117
github.com/buger/goterm v1.0.4 // indirect
121118
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
122-
github.com/compose-spec/compose-go/v2 v2.6.1 // indirect
123-
github.com/containerd/console v1.0.4 // indirect
124-
github.com/containerd/containerd/api v1.8.0 // indirect
125-
github.com/containerd/containerd/v2 v2.0.5 // indirect
119+
github.com/compose-spec/compose-go/v2 v2.9.0 // indirect
120+
github.com/containerd/console v1.0.5 // indirect
121+
github.com/containerd/containerd/api v1.9.0 // indirect
122+
github.com/containerd/containerd/v2 v2.1.4 // indirect
126123
github.com/containerd/continuity v0.4.5 // indirect
127124
github.com/containerd/errdefs v1.0.0 // indirect
128125
github.com/containerd/errdefs/pkg v0.3.0 // indirect
@@ -134,30 +131,30 @@ require (
134131
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
135132
github.com/distribution/reference v0.6.0 // indirect
136133
github.com/dlclark/regexp2 v1.11.5 // indirect
137-
github.com/docker/buildx v0.23.0 // indirect
138-
github.com/docker/cli v28.1.1+incompatible // indirect
139-
github.com/docker/cli-docs-tool v0.9.0 // indirect
134+
github.com/docker/buildx v0.29.1 // indirect
135+
github.com/docker/cli v28.5.1+incompatible // indirect
136+
github.com/docker/cli-docs-tool v0.10.0 // indirect
140137
github.com/docker/distribution v2.8.3+incompatible // indirect
141-
github.com/docker/docker v28.1.1+incompatible // indirect
138+
github.com/docker/docker v28.5.1+incompatible // indirect
142139
github.com/docker/docker-credential-helpers v0.9.3 // indirect
143140
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
144-
github.com/docker/go-connections v0.5.0 // indirect
141+
github.com/docker/go-connections v0.6.0 // indirect
145142
github.com/docker/go-metrics v0.0.1 // indirect
146143
github.com/docker/go-units v0.5.0 // indirect
147144
github.com/dustin/go-humanize v1.0.1 // indirect
148145
github.com/eapache/queue/v2 v2.0.0-20230407133247-75960ed334e4 // indirect
149-
github.com/ebitengine/purego v0.8.2 // indirect
146+
github.com/ebitengine/purego v0.8.4 // indirect
150147
github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203 // indirect
151148
github.com/emicklei/go-restful/v3 v3.11.3 // indirect
152149
github.com/fsnotify/fsevents v0.2.0 // indirect
153150
github.com/fvbommel/sortorder v1.1.0 // indirect
154151
github.com/fxamacker/cbor/v2 v2.7.1 // indirect
155-
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
152+
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
156153
github.com/go-logr/logr v1.4.3 // indirect
157154
github.com/go-logr/stdr v1.2.2 // indirect
158155
github.com/go-ole/go-ole v1.2.6 // indirect
159156
github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
160-
github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
157+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
161158
github.com/gofrs/flock v0.12.1 // indirect
162159
github.com/gogo/protobuf v1.3.2 // indirect
163160
github.com/gomodule/redigo v2.0.0+incompatible // indirect
@@ -169,7 +166,7 @@ require (
169166
github.com/google/s2a-go v0.1.9 // indirect
170167
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
171168
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
172-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
169+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
173170
github.com/hashicorp/errwrap v1.1.0 // indirect
174171
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
175172
github.com/hashicorp/go-multierror v1.1.1 // indirect
@@ -181,33 +178,28 @@ require (
181178
github.com/hashicorp/go-version v1.7.0 // indirect
182179
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
183180
github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
184-
github.com/imdario/mergo v0.3.16 // indirect
185181
github.com/in-toto/in-toto-golang v0.9.0 // indirect
186182
github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf // indirect
187183
github.com/jackc/pgpassfile v1.0.0 // indirect
188184
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
189185
github.com/jackc/puddle/v2 v2.2.2 // indirect
190186
github.com/jonboulle/clockwork v0.5.0 // indirect
191187
github.com/json-iterator/go v1.1.12 // indirect
192-
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
193188
github.com/keygen-sh/go-update v1.0.0 // indirect
194189
github.com/keygen-sh/jsonapi-go v1.2.1 // indirect
195190
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
196191
github.com/magiconair/properties v1.8.10 // indirect
197-
github.com/mattn/go-colorable v0.1.14 // indirect
198-
github.com/mattn/go-isatty v0.0.20 // indirect
199192
github.com/mattn/go-runewidth v0.0.16 // indirect
200193
github.com/mattn/go-shellwords v1.0.12 // indirect
201-
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
202194
github.com/miekg/pkcs11 v1.1.1 // indirect
203195
github.com/mitchellh/go-homedir v1.1.0 // indirect
204196
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
205-
github.com/moby/buildkit v0.21.0 // indirect
197+
github.com/moby/buildkit v0.25.1 // indirect
206198
github.com/moby/docker-image-spec v1.3.1 // indirect
207199
github.com/moby/go-archive v0.1.0 // indirect
208200
github.com/moby/locker v1.0.1 // indirect
209201
github.com/moby/patternmatcher v0.6.0 // indirect
210-
github.com/moby/spdystream v0.4.0 // indirect
202+
github.com/moby/spdystream v0.5.0 // indirect
211203
github.com/moby/sys/atomicwriter v0.1.0 // indirect
212204
github.com/moby/sys/capability v0.4.0 // indirect
213205
github.com/moby/sys/mountinfo v0.7.2 // indirect
@@ -235,14 +227,14 @@ require (
235227
github.com/pierrec/lz4/v4 v4.1.22 // indirect
236228
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
237229
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
238-
github.com/r3labs/sse v0.0.0-20210224172625-26fe804710bc // indirect
239-
github.com/redis/go-redis/extra/rediscmd/v9 v9.7.3 // indirect
230+
github.com/redis/go-redis/extra/rediscmd/v9 v9.16.0 // indirect
240231
github.com/rivo/uniseg v0.4.7 // indirect
241232
github.com/ryanuber/go-glob v1.0.0 // indirect
233+
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
242234
github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
243235
github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b // indirect
244236
github.com/shibumi/go-pathspec v1.3.0 // indirect
245-
github.com/shirou/gopsutil/v4 v4.25.3 // indirect
237+
github.com/shirou/gopsutil/v4 v4.25.6 // indirect
246238
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
247239
github.com/theupdateframework/notary v0.7.0 // indirect
248240
github.com/tidwall/match v1.1.1 // indirect
@@ -252,7 +244,7 @@ require (
252244
github.com/tklauser/go-sysconf v0.3.15 // indirect
253245
github.com/tklauser/numcpus v0.10.0 // indirect
254246
github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323 // indirect
255-
github.com/tonistiigi/fsutil v0.0.0-20250417144416-3f76f8130144 // indirect
247+
github.com/tonistiigi/fsutil v0.0.0-20250605211040-586307ad452f // indirect
256248
github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0 // indirect
257249
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect
258250
github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab // indirect
@@ -263,30 +255,30 @@ require (
263255
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
264256
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
265257
github.com/yusufpapurcu/wmi v1.2.4 // indirect
266-
github.com/zclconf/go-cty v1.16.2 // indirect
258+
github.com/zclconf/go-cty v1.17.0 // indirect
267259
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
268-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
269-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.56.0 // indirect
270-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.31.0 // indirect
271-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.31.0 // indirect
272-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.31.0 // indirect
260+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
261+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.60.0 // indirect
262+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.35.0 // indirect
263+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.35.0 // indirect
264+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
273265
go.opentelemetry.io/otel/metric v1.38.0 // indirect
274266
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
275-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
267+
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
276268
go.uber.org/atomic v1.11.0 // indirect
277-
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
278-
golang.org/x/mod v0.27.0 // indirect
279-
golang.org/x/term v0.35.0 // indirect
269+
go.yaml.in/yaml/v3 v3.0.4 // indirect
270+
golang.org/x/mod v0.28.0 // indirect
271+
golang.org/x/term v0.36.0 // indirect
280272
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
281-
google.golang.org/genproto v0.0.0-20250303144028-a0af3efb3deb // indirect
282-
google.golang.org/genproto/googleapis/api v0.0.0-20250422160041-2d3770c4ea7f // indirect
283-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // indirect
284-
gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
273+
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
274+
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
275+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251022142026-3a174f9686a8 // indirect
276+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
285277
gopkg.in/inf.v0 v0.9.1 // indirect
286278
gopkg.in/ini.v1 v1.67.0 // indirect
287-
k8s.io/api v0.31.7 // indirect
288-
k8s.io/apimachinery v0.31.7 // indirect
289-
k8s.io/client-go v0.31.7 // indirect
279+
k8s.io/api v0.32.3 // indirect
280+
k8s.io/apimachinery v0.32.3 // indirect
281+
k8s.io/client-go v0.32.3 // indirect
290282
k8s.io/klog/v2 v2.130.1 // indirect
291283
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
292284
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
@@ -298,8 +290,8 @@ require (
298290
)
299291

300292
require (
301-
cloud.google.com/go v0.120.1 // indirect
302-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
293+
cloud.google.com/go v0.121.6 // indirect
294+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
303295
cloud.google.com/go/iam v1.5.2 // indirect
304296
github.com/KyleBanks/depth v1.2.1 // indirect
305297
github.com/beorn7/perks v1.0.1 // indirect
@@ -314,7 +306,7 @@ require (
314306
github.com/golang/protobuf v1.5.4 // indirect
315307
github.com/google/uuid v1.6.0
316308
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
317-
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
309+
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
318310
github.com/gorilla/mux v1.8.1 // indirect
319311
github.com/inconshreveable/mousetrap v1.1.0 // indirect
320312
github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -333,15 +325,15 @@ require (
333325
github.com/vmihailenco/msgpack/v5 v5.4.1
334326
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
335327
go.opencensus.io v0.24.0 // indirect
336-
golang.org/x/net v0.43.0 // indirect
337-
golang.org/x/oauth2 v0.29.0 // indirect
328+
golang.org/x/net v0.46.0 // indirect
329+
golang.org/x/oauth2 v0.32.0 // indirect
338330
golang.org/x/sync v0.17.0 // indirect
339-
golang.org/x/sys v0.36.0 // indirect
340-
golang.org/x/text v0.29.0
341-
golang.org/x/time v0.12.0 // indirect
342-
golang.org/x/tools v0.36.0 // indirect
343-
google.golang.org/grpc v1.71.1
344-
google.golang.org/protobuf v1.36.6 // indirect
331+
golang.org/x/sys v0.37.0 // indirect
332+
golang.org/x/text v0.30.0
333+
golang.org/x/time v0.14.0 // indirect
334+
golang.org/x/tools v0.37.0 // indirect
335+
google.golang.org/grpc v1.76.0
336+
google.golang.org/protobuf v1.36.10 // indirect
345337
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
346338
gopkg.in/yaml.v2 v2.4.0 // indirect
347339
gopkg.in/yaml.v3 v3.0.1

0 commit comments

Comments
 (0)