Skip to content

Commit 8d3c0aa

Browse files
authored
Merge pull request #835 from linkedin/go123
Update Golang to version 1.23
2 parents edc503d + 22b53fe commit 8d3c0aa

File tree

8 files changed

+68
-64
lines changed

8 files changed

+68
-64
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
go-version: [1.22.x]
12+
go-version: [1.23.x]
1313
platform: [ubuntu-latest]
1414

1515
steps:
@@ -28,7 +28,7 @@ jobs:
2828
${{ runner.os }}-go-
2929
3030
- name: Install dependencies
31-
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.0
31+
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.62.2
3232

3333
- name: Run test suite
3434
run: make test

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup Go
1919
uses: actions/setup-go@v3
2020
with:
21-
go-version: 1.22.x
21+
go-version: 1.23.x
2222

2323
- uses: actions/cache@v3
2424
with:

.golangci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ linters-settings:
5555
- name: time-naming
5656
- name: unexported-return
5757
- name: indent-error-flow
58-
- name: errorf
58+
- name: errorf
5959
- name: empty-block
6060
- name: superfluous-else
6161
# - name: unused-parameter
@@ -83,7 +83,7 @@ linters:
8383
- ineffassign
8484
- misspell
8585
- nakedret
86-
- exportloopref
86+
- copyloopvar
8787
- staticcheck
8888
# - structcheck
8989
- stylecheck

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# stage 1: builder
2-
FROM golang:1.22.3-alpine as builder
2+
FROM golang:1.23.4-alpine as builder
33

44
ENV BURROW_SRC /usr/src/Burrow/
55

core/internal/helpers/sarama_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func TestInitSaramaLogging(t *testing.T) {
6565
func shouldPanicForVersion(t *testing.T, v string) {
6666
defer func() { recover() }()
6767
out := parseKafkaVersion(v)
68-
t.Errorf("Kafka version " + v + " should have panicked, but got: " + out.String())
68+
t.Errorf("Kafka version %s should have panicked, but got: %s", v, out.String())
6969
}
7070

7171
func TestVersionMapping(t *testing.T) {

core/internal/helpers/zookeeper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func newTLSDialer(addr, caFile, certFile, keyFile string) (zk.Dialer, error) {
8888
RootCAs: caCertPool,
8989
}
9090

91-
if len(certFile) > 0 && len(keyFile) > 0 {
91+
if certFile != "" && keyFile != "" {
9292
cert, err := tls.LoadX509KeyPair(certFile, keyFile)
9393
if err != nil {
9494
return nil, errors.New("cannot read TLS certificate or key file: " + err.Error())

go.mod

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module github.com/linkedin/Burrow
22

3-
go 1.22
3+
go 1.23
44

55
require (
6-
github.com/IBM/sarama v1.43.2
6+
github.com/IBM/sarama v1.43.3
77
github.com/OneOfOne/xxhash v1.2.8
88
github.com/julienschmidt/httprouter v1.3.0
99
github.com/karrick/goswarm v1.10.0
1010
github.com/pborman/uuid v1.2.1
1111
github.com/pkg/errors v0.9.1
12-
github.com/prometheus/client_golang v1.19.0
12+
github.com/prometheus/client_golang v1.20.5
1313
github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414
14-
github.com/spf13/viper v1.18.2
15-
github.com/stretchr/testify v1.9.0
14+
github.com/spf13/viper v1.19.0
15+
github.com/stretchr/testify v1.10.0
1616
github.com/xdg/scram v1.0.5
17-
go.uber.org/automaxprocs v1.5.3
17+
go.uber.org/automaxprocs v1.6.0
1818
go.uber.org/zap v1.27.0
1919
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
2020
gopkg.in/natefinch/lumberjack.v2 v2.2.1
@@ -24,10 +24,10 @@ require (
2424
github.com/beorn7/perks v1.0.1 // indirect
2525
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2626
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
27-
github.com/eapache/go-resiliency v1.6.0 // indirect
27+
github.com/eapache/go-resiliency v1.7.0 // indirect
2828
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
2929
github.com/eapache/queue v1.1.0 // indirect
30-
github.com/fsnotify/fsnotify v1.7.0 // indirect
30+
github.com/fsnotify/fsnotify v1.8.0 // indirect
3131
github.com/golang/snappy v0.0.4 // indirect
3232
github.com/google/uuid v1.6.0 // indirect
3333
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -39,32 +39,33 @@ require (
3939
github.com/jcmturner/gofork v1.7.6 // indirect
4040
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
4141
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
42-
github.com/klauspost/compress v1.17.8 // indirect
43-
github.com/magiconair/properties v1.8.7 // indirect
42+
github.com/klauspost/compress v1.17.11 // indirect
43+
github.com/magiconair/properties v1.8.9 // indirect
4444
github.com/mitchellh/mapstructure v1.5.0 // indirect
45-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
46-
github.com/pierrec/lz4/v4 v4.1.21 // indirect
45+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
46+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
47+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
4748
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
4849
github.com/prometheus/client_model v0.6.1 // indirect
49-
github.com/prometheus/common v0.53.0 // indirect
50-
github.com/prometheus/procfs v0.14.0 // indirect
50+
github.com/prometheus/common v0.61.0 // indirect
51+
github.com/prometheus/procfs v0.15.1 // indirect
5152
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
52-
github.com/sagikazarmark/locafero v0.4.0 // indirect
53+
github.com/sagikazarmark/locafero v0.6.0 // indirect
5354
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
5455
github.com/sourcegraph/conc v0.3.0 // indirect
5556
github.com/spf13/afero v1.11.0 // indirect
56-
github.com/spf13/cast v1.6.0 // indirect
57+
github.com/spf13/cast v1.7.1 // indirect
5758
github.com/spf13/pflag v1.0.5 // indirect
5859
github.com/stretchr/objx v0.5.2 // indirect
5960
github.com/subosito/gotenv v1.6.0 // indirect
6061
github.com/xdg/stringprep v1.0.3 // indirect
6162
go.uber.org/multierr v1.11.0 // indirect
6263
golang.org/x/crypto v0.31.0 // indirect
63-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
64-
golang.org/x/net v0.25.0 // indirect
64+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
65+
golang.org/x/net v0.33.0 // indirect
6566
golang.org/x/sys v0.28.0 // indirect
6667
golang.org/x/text v0.21.0 // indirect
67-
google.golang.org/protobuf v1.34.1 // indirect
68+
google.golang.org/protobuf v1.36.0 // indirect
6869
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
6970
gopkg.in/ini.v1 v1.67.0 // indirect
7071
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)