Skip to content

Commit 8a1db34

Browse files
authored
Merge pull request #8 from StackVista/STAC-23429
STAC-23429 Updated to go 1.24.6 and bumped some deps in go.mod
2 parents 4d4cfd0 + 3452f98 commit 8a1db34

30 files changed

Lines changed: 343 additions & 376 deletions

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
go-version: [1.22.x]
14+
go-version: [1.24.x]
1515
os: [ubuntu-latest]
1616
steps:
1717
- uses: actions/checkout@v4

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v5
1818
with:
19-
go-version: 1.22.7
19+
go-version: 1.24.6
2020
id: go
2121
- name: Check out code into the Go module directory
2222
uses: actions/checkout@v4

buildscripts/cross-compile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function _build() {
3737

3838
# go build -trimpath to build the binary.
3939
if [ "${CAN_BUILD_WITHOUT_DOCKER}" == "false" ]; then
40-
docker run --name runner -d -v $PWD:$PWD --workdir $PWD golang:1.22 sleep infinity
40+
docker run --name runner -d -v $PWD:$PWD --workdir $PWD golang:1.24.6 sleep infinity
4141
docker exec -t runner git config --global --add safe.directory $PWD
4242
docker exec -t runner go build -trimpath -tags kqueue --ldflags "${LDFLAGS}" -o "./bin/minio_${os}_${arch}" 1>/dev/null
4343
MUID=$(id -u)

cmd/config-encrypted.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/minio/minio/cmd/logger"
2828
"github.com/minio/minio/pkg/auth"
2929
"github.com/minio/minio/pkg/madmin"
30-
etcd "go.etcd.io/etcd/clientv3"
30+
etcd "go.etcd.io/etcd/client/v3"
3131
)
3232

3333
func handleEncryptedConfigBackend(objAPI ObjectLayer) error {

cmd/config/dns/etcd_dns.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828

2929
"github.com/coredns/coredns/plugin/etcd/msg"
3030
"github.com/minio/minio-go/v7/pkg/set"
31-
"go.etcd.io/etcd/clientv3"
31+
"go.etcd.io/etcd/client/v3"
3232
)
3333

3434
// ErrNoEntriesFound - Indicates no entries were found for the given key (directory)

cmd/config/dns/operator_dns.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"strings"
3131
"time"
3232

33-
"github.com/dgrijalva/jwt-go"
33+
"github.com/golang-jwt/jwt/v4"
3434
"github.com/minio/minio/cmd/config"
3535
xhttp "github.com/minio/minio/cmd/http"
3636
)

cmd/config/etcd/etcd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"github.com/minio/minio/cmd/config"
2626
"github.com/minio/minio/pkg/env"
2727
xnet "github.com/minio/minio/pkg/net"
28-
"go.etcd.io/etcd/clientv3"
29-
"go.etcd.io/etcd/clientv3/namespace"
28+
"go.etcd.io/etcd/client/v3"
29+
"go.etcd.io/etcd/client/v3/namespace"
3030
"go.uber.org/zap"
3131
)
3232

cmd/config/identity/openid/ecdsa-sha3.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package openid
1919
import (
2020
"crypto"
2121

22-
"github.com/dgrijalva/jwt-go"
22+
"github.com/golang-jwt/jwt/v4"
2323

2424
// Needed for SHA3 to work - See: https://golang.org/src/crypto/crypto.go?s=1034:1288
2525
_ "golang.org/x/crypto/sha3" // There is no SHA-3 FIPS-140 2 compliant implementation

cmd/config/identity/openid/jwt.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"sync"
2929
"time"
3030

31-
jwtgo "github.com/dgrijalva/jwt-go"
31+
jwtgo "github.com/golang-jwt/jwt/v4"
3232
"github.com/minio/minio/cmd/config"
3333
"github.com/minio/minio/pkg/auth"
3434
"github.com/minio/minio/pkg/env"

cmd/config/identity/openid/rsa-sha3.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package openid
1919
import (
2020
"crypto"
2121

22-
"github.com/dgrijalva/jwt-go"
22+
"github.com/golang-jwt/jwt/v4"
2323

2424
// Needed for SHA3 to work - See: https://golang.org/src/crypto/crypto.go?s=1034:1288
2525
_ "golang.org/x/crypto/sha3" // There is no SHA-3 FIPS-140 2 compliant implementation

0 commit comments

Comments
 (0)