Skip to content

Commit f7703b1

Browse files
mhiltonmhilton
authored
build(flux): update flux to v0.197.0 (#26564)
* build(flux): update flux to v0.197.0 * chore: update github.com/apache/arrow-go The new version of flux uses an updated arrow version. Update the version used throughout influxdb to match. * fix: staticcheck Regenerate the protobuf implementations to avoid deprecation warnings from staticcheck. * fix: lint Use the version of protoc-gen-go from the linked protobuf module. This is to ensure the generated protobuf files are compatible with the module. * fix: lint * fix: lint
1 parent b8da500 commit f7703b1

File tree

16 files changed

+1230
-2868
lines changed

16 files changed

+1230
-2868
lines changed

‎GNUmakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ generate-sources: protoc tmpl stringer goimports
130130
generate: generate-web-assets generate-sources
131131

132132
protoc:
133-
$(GO_INSTALL) google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.1
133+
$(GO_INSTALL) google.golang.org/protobuf/cmd/protoc-gen-go@v1.36.5
134134

135135
tmpl:
136136
$(GO_INSTALL) github.com/benbjohnson/tmpl

‎go.mod‎

Lines changed: 60 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/NYTimes/gziphandler v1.0.1
1111
github.com/RoaringBitmap/roaring v0.4.16
1212
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
13-
github.com/apache/arrow/go/v7 v7.0.1
13+
github.com/apache/arrow-go/v18 v18.2.0
1414
github.com/benbjohnson/clock v0.0.0-20161215174838-7dc76406b6d3
1515
github.com/benbjohnson/tmpl v1.0.0
1616
github.com/buger/jsonparser v1.1.1
@@ -26,24 +26,24 @@ require (
2626
github.com/golang/gddo v0.0.0-20181116215533-9bd4a3295021
2727
github.com/golang/mock v1.6.0
2828
github.com/golang/snappy v0.0.4
29-
github.com/google/btree v1.0.1
29+
github.com/google/btree v1.1.3
3030
github.com/google/go-cmp v0.6.0
3131
github.com/google/go-jsonnet v0.17.0
3232
github.com/google/uuid v1.6.0
3333
github.com/hashicorp/go-multierror v1.1.1
3434
github.com/hashicorp/vault/api v1.0.2
3535
github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe
36-
github.com/influxdata/flux v0.196.1
36+
github.com/influxdata/flux v0.197.0
3737
github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69
3838
github.com/influxdata/influx-cli/v2 v2.2.1-0.20221028161653-3285a03e9e28
3939
github.com/influxdata/influxql v1.2.0
4040
github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839
41-
github.com/influxdata/pkg-config v0.2.14
41+
github.com/influxdata/pkg-config v0.3.0
4242
github.com/jmoiron/sqlx v1.3.4
4343
github.com/jsternberg/zap-logfmt v1.2.0
4444
github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef
4545
github.com/kevinburke/go-bindata v3.22.0+incompatible
46-
github.com/mattn/go-isatty v0.0.19
46+
github.com/mattn/go-isatty v0.0.20
4747
github.com/mattn/go-sqlite3 v1.14.18
4848
github.com/matttproud/golang_protobuf_extensions v1.0.4
4949
github.com/mileusna/useragent v0.0.0-20190129205925-3e331f0949a5
@@ -56,39 +56,41 @@ require (
5656
github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52
5757
github.com/spf13/cast v1.3.0
5858
github.com/spf13/cobra v1.0.0
59-
github.com/spf13/pflag v1.0.5
59+
github.com/spf13/pflag v1.0.6
6060
github.com/spf13/viper v1.6.1
61-
github.com/stretchr/testify v1.9.0
61+
github.com/stretchr/testify v1.10.0
6262
github.com/testcontainers/testcontainers-go v0.18.0
6363
github.com/tinylib/msgp v1.1.0
6464
github.com/uber/jaeger-client-go v2.28.0+incompatible
6565
github.com/xlab/treeprint v1.0.0
6666
github.com/yudai/gojsondiff v1.0.0
6767
go.etcd.io/bbolt v1.3.6
68-
go.uber.org/multierr v1.6.0
69-
go.uber.org/zap v1.16.0
70-
golang.org/x/crypto v0.36.0
71-
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8
72-
golang.org/x/sync v0.12.0
73-
golang.org/x/sys v0.31.0
74-
golang.org/x/text v0.23.0
75-
golang.org/x/time v0.5.0
76-
golang.org/x/tools v0.22.0
77-
google.golang.org/protobuf v1.34.1
68+
go.uber.org/multierr v1.10.0
69+
go.uber.org/zap v1.27.0
70+
golang.org/x/crypto v0.39.0
71+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
72+
golang.org/x/sync v0.15.0
73+
golang.org/x/sys v0.33.0
74+
golang.org/x/text v0.26.0
75+
golang.org/x/time v0.8.0
76+
golang.org/x/tools v0.34.0
77+
google.golang.org/protobuf v1.36.5
7878
gopkg.in/yaml.v2 v2.4.0
7979
gopkg.in/yaml.v3 v3.0.1
8080
honnef.co/go/tools v0.4.6
8181
)
8282

8383
require (
84-
cloud.google.com/go v0.114.0 // indirect
85-
cloud.google.com/go/auth v0.5.1 // indirect
86-
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
87-
cloud.google.com/go/bigquery v1.61.0 // indirect
88-
cloud.google.com/go/bigtable v1.10.1 // indirect
89-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
90-
cloud.google.com/go/iam v1.1.8 // indirect
91-
cloud.google.com/go/longrunning v0.5.7 // indirect
84+
cel.dev/expr v0.19.1 // indirect
85+
cloud.google.com/go v0.118.0 // indirect
86+
cloud.google.com/go/auth v0.13.0 // indirect
87+
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
88+
cloud.google.com/go/bigquery v1.64.0 // indirect
89+
cloud.google.com/go/bigtable v1.33.0 // indirect
90+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
91+
cloud.google.com/go/iam v1.2.2 // indirect
92+
cloud.google.com/go/longrunning v0.6.2 // indirect
93+
cloud.google.com/go/monitoring v1.21.2 // indirect
9294
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
9395
github.com/99designs/keyring v1.2.2 // indirect
9496
github.com/AlecAivazis/survey/v2 v2.3.4 // indirect
@@ -107,6 +109,7 @@ require (
107109
github.com/DATA-DOG/go-sqlmock v1.4.1 // indirect
108110
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
109111
github.com/Masterminds/semver v1.4.2 // indirect
112+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
110113
github.com/Masterminds/sprig v2.16.0+incompatible // indirect
111114
github.com/Microsoft/go-winio v0.5.2 // indirect
112115
github.com/SAP/go-hdb v1.9.6 // indirect
@@ -130,6 +133,7 @@ require (
130133
github.com/beorn7/perks v1.0.1 // indirect
131134
github.com/bonitoo-io/go-sql-bigquery v0.3.4-1.4.0 // indirect
132135
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
136+
github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 // indirect
133137
github.com/containerd/containerd v1.6.18 // indirect
134138
github.com/danieljoos/wincred v1.2.1 // indirect
135139
github.com/deepmap/oapi-codegen v1.6.0 // indirect
@@ -142,6 +146,8 @@ require (
142146
github.com/dvsekhvalnov/jose2go v1.7.0 // indirect
143147
github.com/eclipse/paho.mqtt.golang v1.2.0 // indirect
144148
github.com/editorconfig/editorconfig-core-go/v2 v2.1.1 // indirect
149+
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
150+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
145151
github.com/fatih/color v1.15.0 // indirect
146152
github.com/felixge/httpsnoop v1.0.4 // indirect
147153
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
@@ -152,18 +158,17 @@ require (
152158
github.com/go-logr/logr v1.4.2 // indirect
153159
github.com/go-logr/stdr v1.2.2 // indirect
154160
github.com/go-sql-driver/mysql v1.6.0 // indirect
155-
github.com/goccy/go-json v0.10.3 // indirect
161+
github.com/goccy/go-json v0.10.5 // indirect
156162
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
157163
github.com/gofrs/uuid v3.3.0+incompatible // indirect
158164
github.com/gogo/protobuf v1.3.2 // indirect
159165
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
160166
github.com/golang/geo v0.0.0-20190916061304-5b978397cfec // indirect
161-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
162167
github.com/golang/protobuf v1.5.4 // indirect
163-
github.com/google/flatbuffers v24.3.25+incompatible // indirect
164-
github.com/google/s2a-go v0.1.7 // indirect
165-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
166-
github.com/googleapis/gax-go/v2 v2.12.4 // indirect
168+
github.com/google/flatbuffers v25.2.10+incompatible // indirect
169+
github.com/google/s2a-go v0.1.8 // indirect
170+
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
171+
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
167172
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
168173
github.com/hashicorp/errwrap v1.1.0 // indirect
169174
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
@@ -178,13 +183,12 @@ require (
178183
github.com/inconshreveable/mousetrap v1.0.0 // indirect
179184
github.com/influxdata/gosnowflake v1.9.0 // indirect
180185
github.com/influxdata/influxdb-client-go/v2 v2.3.1-0.20210518120617-5d1fff431040 // indirect
181-
github.com/influxdata/influxdb-iox-client-go v1.0.0-beta.1 // indirect
182186
github.com/influxdata/line-protocol/v2 v2.2.1 // indirect
183187
github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b // indirect
184188
github.com/jmespath/go-jmespath v0.4.0 // indirect
185189
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
186-
github.com/klauspost/compress v1.17.8 // indirect
187-
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
190+
github.com/klauspost/compress v1.18.0 // indirect
191+
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
188192
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
189193
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
190194
github.com/lib/pq v1.2.0 // indirect
@@ -208,15 +212,16 @@ require (
208212
github.com/pelletier/go-toml v1.9.5 // indirect
209213
github.com/philhofer/fwd v1.0.0 // indirect
210214
github.com/pierrec/lz4 v2.0.5+incompatible // indirect
211-
github.com/pierrec/lz4/v4 v4.1.21 // indirect
215+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
212216
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
217+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
213218
github.com/pmezard/go-difflib v1.0.0 // indirect
214219
github.com/prometheus/procfs v0.15.0 // indirect
215220
github.com/ryanuber/go-glob v1.0.0 // indirect
216221
github.com/segmentio/kafka-go v0.2.0 // indirect
217222
github.com/sergi/go-diff v1.1.0 // indirect
218223
github.com/sirupsen/logrus v1.9.3 // indirect
219-
github.com/spf13/afero v1.2.2 // indirect
224+
github.com/spf13/afero v1.10.0 // indirect
220225
github.com/spf13/jwalterweatherman v1.0.0 // indirect
221226
github.com/stretchr/objx v0.5.2 // indirect
222227
github.com/subosito/gotenv v1.2.0 // indirect
@@ -228,25 +233,27 @@ require (
228233
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
229234
github.com/yudai/pp v2.0.1+incompatible // indirect
230235
github.com/zeebo/xxh3 v1.0.2 // indirect
231-
go.opencensus.io v0.24.0 // indirect
232-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
233-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
234-
go.opentelemetry.io/otel v1.27.0 // indirect
235-
go.opentelemetry.io/otel/metric v1.27.0 // indirect
236-
go.opentelemetry.io/otel/trace v1.27.0 // indirect
236+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
237+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
238+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
239+
go.opentelemetry.io/otel v1.34.0 // indirect
240+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
241+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
242+
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
243+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
237244
go.uber.org/atomic v1.7.0 // indirect
238245
golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
239-
golang.org/x/mod v0.18.0 // indirect
240-
golang.org/x/net v0.38.0 // indirect
241-
golang.org/x/oauth2 v0.21.0 // indirect
242-
golang.org/x/term v0.30.0 // indirect
243-
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
244-
gonum.org/v1/gonum v0.12.0 // indirect
245-
google.golang.org/api v0.183.0 // indirect
246-
google.golang.org/genproto v0.0.0-20240604185151-ef581f913117 // indirect
247-
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
248-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
249-
google.golang.org/grpc v1.64.1 // indirect
246+
golang.org/x/mod v0.25.0 // indirect
247+
golang.org/x/net v0.41.0 // indirect
248+
golang.org/x/oauth2 v0.25.0 // indirect
249+
golang.org/x/term v0.32.0 // indirect
250+
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
251+
gonum.org/v1/gonum v0.15.1 // indirect
252+
google.golang.org/api v0.214.0 // indirect
253+
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
254+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
255+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
256+
google.golang.org/grpc v1.71.0 // indirect
250257
gopkg.in/ini.v1 v1.51.0 // indirect
251258
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
252259
)

0 commit comments

Comments
 (0)