Skip to content

Commit db0a3a5

Browse files
authored
Merge pull request #118 from questdb/jv/fix_go_dependencies
chore: update Go dependencies to fix CVEs
2 parents 8f080e2 + 2294443 commit db0a3a5

File tree

3 files changed

+322
-351
lines changed

3 files changed

+322
-351
lines changed

.github/workflows/run-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ jobs:
3838
with:
3939
node-version-file: '.nvmrc'
4040

41+
- name: Install Yarn
42+
run: npm install -g yarn
43+
4144
- name: Install yarn dependencies
4245
run: yarn install
4346
env:

go.mod

Lines changed: 109 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,142 +1,165 @@
11
module github.com/questdb/grafana-questdb-datasource
22

3-
go 1.21
3+
go 1.24.1
44

5-
toolchain go1.21.4
5+
toolchain go1.24.3
66

77
require (
8-
github.com/docker/docker v24.0.7+incompatible
9-
github.com/grafana/grafana-plugin-sdk-go v0.199.0
8+
github.com/docker/docker v28.0.1+incompatible
9+
github.com/grafana/grafana-plugin-sdk-go v0.277.1
1010
github.com/grafana/sqlds/v2 v2.7.2
1111
github.com/lib/pq v1.10.9 // @grafana/backend-platform
1212
github.com/pkg/errors v0.9.1
13-
github.com/stretchr/testify v1.8.4
14-
github.com/testcontainers/testcontainers-go v0.27.0
15-
golang.org/x/net v0.20.0
13+
github.com/stretchr/testify v1.10.0
14+
github.com/testcontainers/testcontainers-go v0.37.0
15+
golang.org/x/net v0.39.0
1616
)
1717

1818
require (
19-
github.com/apache/arrow/go/v13 v13.0.0 // indirect
19+
dario.cat/mergo v1.0.1 // indirect
2020
github.com/containerd/log v0.1.0 // indirect
21+
github.com/cpuguy83/dockercfg v0.3.2 // indirect
22+
github.com/distribution/reference v0.6.0 // indirect
2123
github.com/docker/go-units v0.5.0 // indirect
22-
github.com/goccy/go-json v0.10.0 // indirect
23-
github.com/klauspost/cpuid/v2 v2.2.3 // indirect
24-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
24+
github.com/felixge/httpsnoop v1.0.4 // indirect
25+
github.com/go-ole/go-ole v1.2.6 // indirect
26+
github.com/goccy/go-json v0.10.5 // indirect
27+
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
28+
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
29+
github.com/magiconair/properties v1.8.10 // indirect
30+
github.com/moby/docker-image-spec v1.3.1 // indirect
31+
github.com/moby/patternmatcher v0.6.0 // indirect
32+
github.com/moby/sys/sequential v0.6.0 // indirect
33+
github.com/moby/sys/user v0.4.0 // indirect
34+
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
35+
github.com/tklauser/go-sysconf v0.3.12 // indirect
36+
github.com/tklauser/numcpus v0.6.1 // indirect
37+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
2538
github.com/zeebo/xxh3 v1.0.2 // indirect
26-
go.opentelemetry.io/contrib/samplers/jaegerremote v0.15.1 // indirect
27-
google.golang.org/genproto v0.0.0-20231002182017-d307bd883b97 // indirect
39+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
40+
go.opentelemetry.io/contrib/samplers/jaegerremote v0.29.0 // indirect
2841
)
2942

3043
require (
31-
dario.cat/mergo v1.0.0 // indirect
3244
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
33-
github.com/BurntSushi/toml v1.3.2 // indirect
34-
github.com/Microsoft/go-winio v0.6.1 // indirect
35-
github.com/Microsoft/hcsshim v0.11.4 // indirect
45+
github.com/BurntSushi/toml v1.4.0 // indirect
46+
github.com/Microsoft/go-winio v0.6.2 // indirect
47+
github.com/apache/arrow-go/v18 v18.2.0 // indirect
3648
github.com/beorn7/perks v1.0.1 // indirect
37-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
38-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
49+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
50+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3951
github.com/cheekybits/genny v1.0.0 // indirect
40-
github.com/chromedp/cdproto v0.0.0-20230816033919-17ee49f3eb4f // indirect
41-
github.com/containerd/containerd v1.7.11 // indirect
42-
github.com/cpuguy83/dockercfg v0.3.1 // indirect
43-
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
52+
github.com/chromedp/cdproto v0.0.0-20250429231605-6ed5b53462d4 // indirect
53+
github.com/containerd/platforms v0.2.1 // indirect
54+
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
4455
github.com/davecgh/go-spew v1.1.1 // indirect
45-
github.com/docker/distribution v2.8.2+incompatible // indirect
46-
github.com/docker/go-connections v0.4.0 // indirect
47-
github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a // indirect
56+
github.com/docker/go-connections v0.5.0 // indirect
57+
github.com/ebitengine/purego v0.8.2 // indirect
58+
github.com/elazarl/goproxy v1.7.2 // indirect
4859
github.com/fatih/color v1.15.0 // indirect
49-
github.com/getkin/kin-openapi v0.120.0 // indirect
50-
github.com/go-logr/logr v1.3.0 // indirect
60+
github.com/fsnotify/fsnotify v1.6.0 // indirect
61+
github.com/getkin/kin-openapi v0.132.0 // indirect
62+
github.com/go-logr/logr v1.4.2 // indirect
5163
github.com/go-logr/stdr v1.2.2 // indirect
52-
github.com/go-ole/go-ole v1.2.6 // indirect
53-
github.com/go-openapi/jsonpointer v0.20.0 // indirect
54-
github.com/go-openapi/swag v0.22.4 // indirect
64+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
65+
github.com/go-openapi/swag v0.23.0 // indirect
5566
github.com/gogo/protobuf v1.3.2 // indirect
56-
github.com/golang/protobuf v1.5.3 // indirect
57-
github.com/google/flatbuffers v23.1.21+incompatible // indirect
58-
github.com/google/go-cmp v0.6.0 // indirect
59-
github.com/google/uuid v1.5.0 // indirect
67+
github.com/golang/protobuf v1.5.4 // indirect
68+
github.com/google/flatbuffers v25.2.10+incompatible // indirect
69+
github.com/google/go-cmp v0.7.0 // indirect
70+
github.com/google/uuid v1.6.0 // indirect
6071
github.com/gorilla/mux v1.8.0 // indirect
61-
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
62-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
63-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect
64-
github.com/hashicorp/go-hclog v1.6.2 // indirect
65-
github.com/hashicorp/go-plugin v1.6.0 // indirect
72+
github.com/grafana/otel-profiling-go v0.5.1 // indirect
73+
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
74+
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect
75+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
76+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
77+
github.com/hashicorp/go-hclog v1.6.3 // indirect
78+
github.com/hashicorp/go-plugin v1.6.3 // indirect
6679
github.com/hashicorp/yamux v0.1.1 // indirect
67-
github.com/invopop/yaml v0.2.0 // indirect
6880
github.com/josharian/intern v1.0.0 // indirect
6981
github.com/json-iterator/go v1.1.12 // indirect
70-
github.com/klauspost/compress v1.16.7 // indirect
71-
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
82+
github.com/jszwedko/go-datemath v0.1.1-0.20230526204004-640a500621d6 // indirect
83+
github.com/klauspost/compress v1.18.0 // indirect
7284
github.com/magefile/mage v1.15.0 // indirect
73-
github.com/magiconair/properties v1.8.7 // indirect
7485
github.com/mailru/easyjson v0.7.7 // indirect
7586
github.com/mattetti/filebuffer v1.0.1 // indirect
7687
github.com/mattn/go-colorable v0.1.13 // indirect
77-
github.com/mattn/go-isatty v0.0.18 // indirect
78-
github.com/mattn/go-runewidth v0.0.9 // indirect
88+
github.com/mattn/go-isatty v0.0.20 // indirect
89+
github.com/mattn/go-runewidth v0.0.16 // indirect
7990
github.com/mitchellh/go-homedir v1.1.0 // indirect
80-
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
8191
github.com/mithrandie/csvq v1.17.10 // indirect
8292
github.com/mithrandie/csvq-driver v1.6.8 // indirect
8393
github.com/mithrandie/go-file/v2 v2.1.0 // indirect
8494
github.com/mithrandie/go-text v1.5.4 // indirect
8595
github.com/mithrandie/ternary v1.1.1 // indirect
86-
github.com/moby/patternmatcher v0.6.0 // indirect
87-
github.com/moby/sys/sequential v0.5.0 // indirect
96+
github.com/moby/go-archive v0.1.0 // indirect
97+
github.com/moby/sys/atomicwriter v0.1.0 // indirect
98+
github.com/moby/sys/userns v0.1.0 // indirect
8899
github.com/moby/term v0.5.0 // indirect
89100
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
90101
github.com/modern-go/reflect2 v1.0.2 // indirect
91102
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
92103
github.com/morikuni/aec v1.0.0 // indirect
104+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
105+
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
106+
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
93107
github.com/oklog/run v1.1.0 // indirect
94108
github.com/olekukonko/tablewriter v0.0.5 // indirect
95109
github.com/opencontainers/go-digest v1.0.0 // indirect
96-
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
97-
github.com/opencontainers/runc v1.1.9 // indirect
110+
github.com/opencontainers/image-spec v1.1.1 // indirect
98111
github.com/perimeterx/marshmallow v1.1.5 // indirect
99-
github.com/pierrec/lz4/v4 v4.1.18 // indirect
112+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
100113
github.com/pmezard/go-difflib v1.0.0 // indirect
101-
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
102-
github.com/prometheus/client_golang v1.18.0 // indirect
103-
github.com/prometheus/client_model v0.5.0 // indirect
104-
github.com/prometheus/common v0.45.0 // indirect
105-
github.com/prometheus/procfs v0.12.0 // indirect
114+
github.com/prometheus/client_golang v1.20.5 // indirect
115+
github.com/prometheus/client_model v0.6.1 // indirect
116+
github.com/prometheus/common v0.63.0 // indirect
117+
github.com/prometheus/procfs v0.15.1 // indirect
118+
github.com/rivo/uniseg v0.4.4 // indirect
106119
github.com/russross/blackfriday/v2 v2.1.0 // indirect
107-
github.com/shirou/gopsutil/v3 v3.23.11 // indirect
108-
github.com/shoenig/go-m1cpu v0.1.6 // indirect
120+
github.com/shirou/gopsutil/v4 v4.25.1 // indirect
109121
github.com/sirupsen/logrus v1.9.3 // indirect
110-
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect
111-
github.com/tklauser/go-sysconf v0.3.12 // indirect
112-
github.com/tklauser/numcpus v0.6.1 // indirect
113122
github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8 // indirect
114123
github.com/unknwon/com v1.0.1 // indirect
115124
github.com/unknwon/log v0.0.0-20200308114134-929b1006e34a // indirect
116-
github.com/urfave/cli v1.22.14 // indirect
117-
github.com/yusufpapurcu/wmi v1.2.3 // indirect
118-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
119-
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 // indirect
120-
go.opentelemetry.io/contrib/propagators/jaeger v1.21.1 // indirect
121-
go.opentelemetry.io/otel v1.21.0 // indirect
122-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
123-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
124-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
125-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
126-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
127-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
128-
golang.org/x/crypto v0.18.0 // indirect
129-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
130-
golang.org/x/mod v0.13.0 // indirect
131-
golang.org/x/sys v0.16.0 // indirect
132-
golang.org/x/term v0.16.0 // indirect
133-
golang.org/x/text v0.14.0 // indirect
134-
golang.org/x/tools v0.14.0 // indirect
135-
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
136-
google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 // indirect
137-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
138-
google.golang.org/grpc v1.60.1 // indirect
139-
google.golang.org/protobuf v1.32.0 // indirect
125+
github.com/urfave/cli v1.22.16 // indirect
126+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
127+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
128+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.60.0 // indirect
129+
go.opentelemetry.io/contrib/propagators/jaeger v1.35.0 // indirect
130+
go.opentelemetry.io/otel v1.35.0 // indirect
131+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0 // indirect
132+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0 // indirect
133+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
134+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
135+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
136+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
137+
golang.org/x/crypto v0.38.0 // indirect
138+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
139+
golang.org/x/mod v0.23.0 // indirect
140+
golang.org/x/sync v0.14.0 // indirect
141+
golang.org/x/sys v0.33.0 // indirect
142+
golang.org/x/term v0.32.0 // indirect
143+
golang.org/x/text v0.25.0 // indirect
144+
golang.org/x/tools v0.30.0 // indirect
145+
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
146+
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
147+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
148+
google.golang.org/grpc v1.71.1 // indirect
149+
google.golang.org/protobuf v1.36.6 // indirect
140150
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
141151
gopkg.in/yaml.v3 v3.0.1 // indirect
142152
)
153+
154+
replace go.opentelemetry.io/otel/exporters/otlp/otlptrace => go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0
155+
156+
replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0
157+
158+
replace go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0
159+
160+
replace go.opentelemetry.io/otel/exporters/otlp/internal/retry => go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.35.0
161+
162+
replace (
163+
github.com/docker/docker => github.com/docker/docker v28.1.1+incompatible
164+
github.com/testcontainers/testcontainers-go => github.com/testcontainers/testcontainers-go v0.37.0
165+
)

0 commit comments

Comments
 (0)