Merge pull request #102 from github/git-systems/upgrade-go-version

Upgrade Go to the 1.24 version

Author: migue

.github/workflows/golangci-lint.yml

@@ -14,11 +14,11 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.24"
       - name: Vendor modules for later steps.
         run: |
           go mod vendor
-      - uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
+      - uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.55
+          version: v1.64

go.mod

@@ -1,6 +1,6 @@
 module github.com/github/spokes-receive-pack
 
-go 1.20
+go 1.24
 
 require (
 	github.com/github/go-pipe v1.0.2

go.sum

@@ -8,6 +8,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
 github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c h1:CgbKAHto5CQgWM9fSBIvaxsJHuGP0uM74HXtv3MyyGQ=
@@ -24,6 +25,7 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
+go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=

internal/integration/parse.go

@@ -164,6 +164,11 @@ func readPktline(r io.Reader) ([]byte, error) {
 
 func writePktlinef(w io.Writer, format string, args ...interface{}) error {
 	msg := fmt.Sprintf(format, args...)
+	err := writePktline(w, msg)
+	return err
+}
+
+func writePktline(w io.Writer, msg string) error {
 	_, err := fmt.Fprintf(w, "%04x%s", 4+len(msg), msg)
 	return err
 }

internal/integration/pushoptions_test.go

@@ -126,8 +126,8 @@ func TestPushOptionsLimitCount(t *testing.T) {
 
 	// the limit is 2, let's send 3 push options
 	for i := 0; i < 3; i++ {
-		require.NoError(t, writePktlinef(srpIn,
-			fmt.Sprintf("option-%d\n", i)))
+		option := fmt.Sprintf("option-%d\n", i)
+		require.NoError(t, writePktline(srpIn, option))
 	}
 	_, err = srpIn.Write([]byte("0000"))
 	require.NoError(t, err)