Update to Go 1.23 (and fix some nits)

BarbarossaTM · BarbarossaTM · commit f422dbad63bd · 2025-05-29T22:03:55.000+02:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.22.x]
+        go-version: [1.23.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/cmd/bio-rd/main.go b/cmd/bio-rd/main.go
@@ -69,8 +69,8 @@ func main() {
 
 	listenAddrsByVRF := map[string][]string{
 		vrf.DefaultVRFName: {
-			fmt.Sprintf(*bgpListenAddrIPv6),
-			fmt.Sprintf(*bgpListenAddrIPv4),
+			*bgpListenAddrIPv6,
+			*bgpListenAddrIPv4,
 		},
 	}
 
diff --git a/fuzzing/packet/gen_initial_corpus.go b/fuzzing/packet/gen_initial_corpus.go
@@ -99,11 +99,13 @@ func main() {
 			wantFail: true,
 		},
 	}
+
 	for i, t := range tests {
 		f, err := os.Create(fmt.Sprintf("corpus/%v.bytes", i))
 		if err != nil {
-			log.Fatalf(err.Error())
+			log.Fatalf("%s", err.Error())
 		}
+
 		f.Write(t.input)
 		f.Close()
 	}
diff --git a/go.mod b/go.mod
@@ -41,4 +41,6 @@ require (
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 )
 
-go 1.18
+go 1.23.0
+
+toolchain go1.24.2
diff --git a/go.sum b/go.sum
@@ -51,6 +51,7 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 h1:Iju5GlWwrvL6UBg4zJJt3btmonfrMlCDdsejg4CZE7c=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
@@ -133,6 +134,7 @@ github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmF
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
diff --git a/protocols/bgp/server/update_sender.go b/protocols/bgp/server/update_sender.go
@@ -338,7 +338,7 @@ func (u *UpdateSender) withdrawPrefix(out io.Writer, pfx *bnet.Prefix, p *route.
 	}
 
 	if !u.addressFamily.multiProtocol {
-		return fmt.Errorf(packet.AFIName(u.addressFamily.afi) + " was not negotiated")
+		return fmt.Errorf("%s was not negotiated", packet.AFIName(u.addressFamily.afi))
 	}
 
 	return u.withdrawPrefixMultiProtocol(out, pfx, p)

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ func main() {`
`69`	`69`
`70`	`70`	`listenAddrsByVRF := map[string][]string{`
`71`	`71`	`vrf.DefaultVRFName: {`
`72`		`- fmt.Sprintf(*bgpListenAddrIPv6),`
`73`		`- fmt.Sprintf(*bgpListenAddrIPv4),`
	`72`	`+ *bgpListenAddrIPv6,`
	`73`	`+ *bgpListenAddrIPv4,`
`74`	`74`	`},`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -99,11 +99,13 @@ func main() {`
`99`	`99`	`wantFail: true,`
`100`	`100`	`},`
`101`	`101`	`}`
	`102`	`+`
`102`	`103`	`for i, t := range tests {`
`103`	`104`	`f, err := os.Create(fmt.Sprintf("corpus/%v.bytes", i))`
`104`	`105`	`if err != nil {`
`105`		`- log.Fatalf(err.Error())`
	`106`	`+ log.Fatalf("%s", err.Error())`
`106`	`107`	`}`
	`108`	`+`
`107`	`109`	`f.Write(t.input)`
`108`	`110`	`f.Close()`
`109`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,6 @@ require (`
`41`	`41`	`google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect`
`42`	`42`	`)`
`43`	`43`
`44`		`-go 1.18`
	`44`	`+go 1.23.0`
	`45`	`+`
	`46`	`+toolchain go1.24.2`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ func (u UpdateSender) withdrawPrefix(out io.Writer, pfx bnet.Prefix, p *route.`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`if !u.addressFamily.multiProtocol {`
`341`		`- return fmt.Errorf(packet.AFIName(u.addressFamily.afi) + " was not negotiated")`
	`341`	`+ return fmt.Errorf("%s was not negotiated", packet.AFIName(u.addressFamily.afi))`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`return u.withdrawPrefixMultiProtocol(out, pfx, p)`