Skip to content

Commit 5bfa593

Browse files
authored
Ver2.4.1 (#32)
* fix: schema make file * fix: json schema * fix: update dependencies in go.mod
1 parent 9e2dd78 commit 5bfa593

14 files changed

Lines changed: 102 additions & 115 deletions

File tree

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ generate: pkg/types/dtap_frame.go
3232
pkg/types/dtap_frame.go: proto/dtap_frame.proto
3333
protoc --proto_path=./proto --go_opt=Mdnstap.proto=github.com/dnstap/golang-dnstap --go_opt=paths=source_relative --go_out=./pkg/types proto/dtap_frame.proto
3434

35-
schema/input_plugins.json: $(input_plugin_schemas)
35+
schemas/input_plugins.json: $(input_plugin_schemas)
3636
go run misc/merge-schema/main.go pkg/plugin/input /schemas/input_plugins.json > schemas/input_plugins.json.tmp && mv schemas/input_plugins.json.tmp schemas/input_plugins.json
37-
schema/output_plugins.json: $(output_plugin_schemas)
37+
schemas/output_plugins.json: $(output_plugin_schemas)
3838
go run misc/merge-schema/main.go pkg/plugin/output /schemas/output_plugins.json > schemas/output_plugins.json.tmp && mv schemas/output_plugins.json.tmp schemas/output_plugins.json
39-
schema/filter_plugins.json: $(filter_plugin_schemas)
39+
schemas/filter_plugins.json: $(filter_plugin_schemas)
4040
go run misc/merge-schema/main.go pkg/plugin/filter /schemas/filter_plugins.json > schemas/filter_plugins.json.tmp && mv schemas/filter_plugins.json.tmp schemas/filter_plugins.json
41-
schema: $(schemas) schema/input_plugins.json schema/output_plugins.json schema/filter_plugins.json
41+
schema: $(schemas)
4242
ajv compile -s schemas/schema.json --allow-union-types --inline-refs=true --spec=draft2019 $(addprefix -r ,$(plugin_schemas)) $(addprefix -r ,$(schemas))

go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ toolchain go1.23.1
66

77
require go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
88

9-
require github.com/nats-io/nats-server/v2 v2.9.23
9+
require github.com/nats-io/nats-server/v2 v2.11.6
1010

1111
require (
1212
github.com/Shopify/sarama v1.30.0
@@ -22,7 +22,7 @@ require (
2222
github.com/linkedin/goavro v2.1.0+incompatible
2323
github.com/miekg/dns v1.1.62
2424
github.com/mimuret/dnsutils v1.11.0
25-
github.com/nats-io/nats.go v1.28.0
25+
github.com/nats-io/nats.go v1.43.0
2626
github.com/onsi/ginkgo/v2 v2.22.1
2727
github.com/onsi/gomega v1.36.2
2828
github.com/packetcap/go-pcap v0.0.0-20250417081904-081143ce5ce4
@@ -42,8 +42,8 @@ require (
4242
go.opentelemetry.io/otel/sdk/log v0.11.0
4343
go.uber.org/zap v1.27.0
4444
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
45-
golang.org/x/net v0.39.0
46-
golang.org/x/sync v0.13.0
45+
golang.org/x/net v0.40.0
46+
golang.org/x/sync v0.15.0
4747
google.golang.org/protobuf v1.36.5
4848
gopkg.in/natefinch/lumberjack.v2 v2.2.1
4949
sigs.k8s.io/yaml v1.4.0
@@ -109,6 +109,7 @@ require (
109109
github.com/golang/snappy v0.0.4 // indirect
110110
github.com/google/btree v1.1.3 // indirect
111111
github.com/google/go-cmp v0.7.0 // indirect
112+
github.com/google/go-tpm v0.9.5 // indirect
112113
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
113114
github.com/google/s2a-go v0.1.9 // indirect
114115
github.com/google/uuid v1.6.0 // indirect
@@ -145,7 +146,6 @@ require (
145146
github.com/josharian/intern v1.0.0 // indirect
146147
github.com/jpillora/backoff v1.0.0 // indirect
147148
github.com/json-iterator/go v1.1.12 // indirect
148-
github.com/juju/zaputil v0.0.0-20190326175239-ef53049637ac // indirect
149149
github.com/julienschmidt/httprouter v1.3.0 // indirect
150150
github.com/klauspost/compress v1.18.0 // indirect
151151
github.com/kylelemons/godebug v1.1.0 // indirect
@@ -156,7 +156,7 @@ require (
156156
github.com/mdlayher/socket v0.5.1 // indirect
157157
github.com/mdlayher/vsock v1.2.1 // indirect
158158
github.com/mimuret/intcast v0.2.0 // indirect
159-
github.com/minio/highwayhash v1.0.2 // indirect
159+
github.com/minio/highwayhash v1.0.3 // indirect
160160
github.com/mitchellh/copystructure v1.2.0 // indirect
161161
github.com/mitchellh/go-homedir v1.1.0 // indirect
162162
github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
@@ -165,8 +165,8 @@ require (
165165
github.com/modern-go/reflect2 v1.0.2 // indirect
166166
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
167167
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
168-
github.com/nats-io/jwt/v2 v2.5.0 // indirect
169-
github.com/nats-io/nkeys v0.4.4 // indirect
168+
github.com/nats-io/jwt/v2 v2.7.4 // indirect
169+
github.com/nats-io/nkeys v0.4.11 // indirect
170170
github.com/nats-io/nuid v1.0.1 // indirect
171171
github.com/oklog/ulid v1.3.1 // indirect
172172
github.com/opentracing-contrib/go-grpc v0.1.1 // indirect
@@ -210,13 +210,13 @@ require (
210210
go.uber.org/goleak v1.3.0 // indirect
211211
go.uber.org/multierr v1.11.0 // indirect
212212
go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect
213-
golang.org/x/crypto v0.37.0 // indirect
214-
golang.org/x/mod v0.22.0 // indirect
213+
golang.org/x/crypto v0.39.0 // indirect
214+
golang.org/x/mod v0.25.0 // indirect
215215
golang.org/x/oauth2 v0.28.0 // indirect
216-
golang.org/x/sys v0.32.0 // indirect
217-
golang.org/x/text v0.24.0 // indirect
218-
golang.org/x/time v0.9.0 // indirect
219-
golang.org/x/tools v0.28.0 // indirect
216+
golang.org/x/sys v0.33.0 // indirect
217+
golang.org/x/text v0.26.0 // indirect
218+
golang.org/x/time v0.12.0 // indirect
219+
golang.org/x/tools v0.33.0 // indirect
220220
google.golang.org/api v0.218.0 // indirect
221221
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
222222
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect

0 commit comments

Comments
 (0)