Upgrade dependencies, remove toolchain

.github/workflows/vulncheck.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ 1.24.x ]
+        go-version: [ 1.25.x ]
     steps:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v4

go.mod

@@ -2,27 +2,25 @@ module github.com/minio/minio-go/v7
 
 go 1.24.0
 
-toolchain go1.25.5
-
 require (
 	github.com/dustin/go-humanize v1.0.1
 	github.com/go-ini/ini v1.67.0
 	github.com/google/uuid v1.6.0
-	github.com/klauspost/compress v1.18.0
+	github.com/klauspost/compress v1.18.2
 	github.com/klauspost/crc32 v1.3.0
-	github.com/minio/crc64nvme v1.1.0
+	github.com/minio/crc64nvme v1.1.1
 	github.com/minio/md5-simd v1.1.2
 	github.com/rs/xid v1.6.0
-	github.com/tinylib/msgp v1.3.0
+	github.com/tinylib/msgp v1.6.1
 	go.yaml.in/yaml/v3 v3.0.4
-	golang.org/x/crypto v0.36.0
-	golang.org/x/net v0.38.0
+	golang.org/x/crypto v0.46.0
+	golang.org/x/net v0.48.0
 )
 
 require (
 	github.com/klauspost/cpuid/v2 v2.2.11 // indirect
 	github.com/philhofer/fwd v1.2.0 // indirect
 	github.com/stretchr/testify v1.9.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
 )

go.sum

@@ -6,15 +6,15 @@ github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
 github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
+github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.11 h1:0OwqZRYI2rFrjS4kvkDnqJkKHdHaRnCm68/DY4OxRzU=
 github.com/klauspost/cpuid/v2 v2.2.11/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/klauspost/crc32 v1.3.0 h1:sSmTt3gUt81RP655XGZPElI0PelVTZ6YwCRnPSupoFM=
 github.com/klauspost/crc32 v1.3.0/go.mod h1:D7kQaZhnkX/Y0tstFGf8VUzv2UofNGqCjnC3zdHB0Hw=
-github.com/minio/crc64nvme v1.1.0 h1:e/tAguZ+4cw32D+IO/8GSf5UVr9y+3eJcxZI2WOO/7Q=
-github.com/minio/crc64nvme v1.1.0/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
+github.com/minio/crc64nvme v1.1.1 h1:8dwx/Pz49suywbO+auHCBpCtlW1OfpcLN7wYgVR6wAI=
+github.com/minio/crc64nvme v1.1.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
 github.com/philhofer/fwd v1.2.0 h1:e6DnBTl7vGY+Gz322/ASL4Gyp1FspeMvx1RNDoToZuM=
@@ -25,18 +25,18 @@ github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tinylib/msgp v1.3.0 h1:ULuf7GPooDaIlbyvgAxBV/FI7ynli6LZ1/nVUNu+0ww=
-github.com/tinylib/msgp v1.3.0/go.mod h1:ykjzy2wzgrlvpDCRc4LA8UXy6D8bzMSuAF3WD57Gok0=
+github.com/tinylib/msgp v1.6.1 h1:ESRv8eL3u+DNHUoSAAQRE50Hm162zqAnBoGv9PzScPY=
+github.com/tinylib/msgp v1.6.1/go.mod h1:RSp0LW9oSxFut3KzESt5Voq4GVWyS+PSulT77roAqEA=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
-golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
+golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
+golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

pkg/set/msgp.go

@@ -17,119 +17,47 @@
 
 package set
 
-import "github.com/tinylib/msgp/msgp"
+import (
+	"github.com/tinylib/msgp/msgp"
+	"github.com/tinylib/msgp/msgp/setof"
+)
 
 // EncodeMsg encodes the message to the writer.
 // Values are stored as a slice of strings or nil.
 func (s StringSet) EncodeMsg(writer *msgp.Writer) error {
-	if s == nil {
-		return writer.WriteNil()
-	}
-	err := writer.WriteArrayHeader(uint32(len(s)))
-	if err != nil {
-		return err
-	}
-	sorted := s.ToByteSlices()
-	for _, k := range sorted {
-		err = writer.WriteStringFromBytes(k)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
+	return setof.StringSorted(s).EncodeMsg(writer)
 }
 
 // MarshalMsg encodes the message to the bytes.
 // Values are stored as a slice of strings or nil.
 func (s StringSet) MarshalMsg(bytes []byte) ([]byte, error) {
-	if s == nil {
-		return msgp.AppendNil(bytes), nil
-	}
-	if len(s) == 0 {
-		return msgp.AppendArrayHeader(bytes, 0), nil
-	}
-	bytes = msgp.AppendArrayHeader(bytes, uint32(len(s)))
-	sorted := s.ToByteSlices()
-	for _, k := range sorted {
-		bytes = msgp.AppendStringFromBytes(bytes, k)
-	}
-	return bytes, nil
+	return setof.StringSorted(s).MarshalMsg(bytes)
 }
 
 // DecodeMsg decodes the message from the reader.
 func (s *StringSet) DecodeMsg(reader *msgp.Reader) error {
-	if reader.IsNil() {
-		*s = nil
-		return reader.Skip()
-	}
-	sz, err := reader.ReadArrayHeader()
-	if err != nil {
+	var ss setof.String
+	if err := ss.DecodeMsg(reader); err != nil {
 		return err
 	}
-	dst := *s
-	if dst == nil {
-		dst = make(StringSet, sz)
-	} else {
-		for k := range dst {
-			delete(dst, k)
-		}
-	}
-	for i := uint32(0); i < sz; i++ {
-		var k string
-		k, err = reader.ReadString()
-		if err != nil {
-			return err
-		}
-		dst[k] = struct{}{}
-	}
-	*s = dst
+	*s = StringSet(ss)
 	return nil
 }
 
 // UnmarshalMsg decodes the message from the bytes.
 func (s *StringSet) UnmarshalMsg(bytes []byte) ([]byte, error) {
-	if msgp.IsNil(bytes) {
-		*s = nil
-		return bytes[msgp.NilSize:], nil
-	}
-	// Read the array header
-	sz, bytes, err := msgp.ReadArrayHeaderBytes(bytes)
+	var ss setof.String
+	bytes, err := ss.UnmarshalMsg(bytes)
 	if err != nil {
 		return nil, err
 	}
-	dst := *s
-	if dst == nil {
-		dst = make(StringSet, sz)
-	} else {
-		for k := range dst {
-			delete(dst, k)
-		}
-	}
-	for i := uint32(0); i < sz; i++ {
-		var k string
-		k, bytes, err = msgp.ReadStringBytes(bytes)
-		if err != nil {
-			return nil, err
-		}
-		dst[k] = struct{}{}
-	}
-	*s = dst
+	*s = StringSet(ss)
 	return bytes, nil
 }
 
 // Msgsize returns the maximum size of the message.
 func (s StringSet) Msgsize() int {
-	if s == nil {
-		return msgp.NilSize
-	}
-	if len(s) == 0 {
-		return msgp.ArrayHeaderSize
-	}
-	size := msgp.ArrayHeaderSize
-	for key := range s {
-		size += msgp.StringPrefixSize + len(key)
-	}
-	return size
+	return setof.String(s).Msgsize()
 }
 
 // MarshalBinary encodes the receiver into a binary form and returns the result.