Skip to content

Commit 95e7151

Browse files
authored
Upgrade go v1.24.1 (#990)
Signed-off-by: Bala.FA <[email protected]>
1 parent fb09291 commit 95e7151

20 files changed

+87
-108
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v4
2121
- uses: actions/setup-go@v5
2222
with:
23-
go-version: 1.23.x
23+
go-version: 1.24.x
2424
check-latest: true
2525
- name: Set environment
2626
run: |

.github/workflows/functests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/checkout@v4
2828
- uses: actions/setup-go@v5
2929
with:
30-
go-version: 1.23.x
30+
go-version: 1.24.x
3131
check-latest: true
3232

3333
- name: Install dependencies

.github/workflows/linters.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
- uses: actions/checkout@v4
2121
- uses: actions/setup-go@v5
2222
with:
23-
go-version: 1.23.x
23+
go-version: 1.24.x
2424
check-latest: true
2525
- uses: ludeeus/action-shellcheck@master
2626
- uses: golangci/golangci-lint-action@v6
2727
with:
28-
version: v1.62.0
28+
version: v1.64.8
2929
args: --config ./.golangci.yml --timeout=60m

.github/workflows/vulncheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Set up Go
2424
uses: actions/setup-go@v5
2525
with:
26-
go-version: 1.23.x
26+
go-version: 1.24.x
2727
check-latest: true
2828
- name: Install govulncheck
2929
run: go install golang.org/x/vuln/cmd/govulncheck@latest

.golangci.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
linters-settings:
2-
run:
3-
go: "1.23"
4-
52
misspell:
63
locale: US
74

5+
run:
6+
go: "1.24"
7+
88
linters:
99
disable-all: true
1010
enable:
@@ -20,7 +20,7 @@ linters:
2020
- unused
2121
- gocritic
2222
- gofumpt
23-
- tenv
23+
- usetesting
2424
- durationcheck
2525
- staticcheck
2626

@@ -30,6 +30,3 @@ issues:
3030
- should have a package comment
3131
- exitAfterDefer
3232
- redefines-builtin-id
33-
34-
service:
35-
golangci-lint-version: 1.62.0 # use the fixed version to not introduce new linters unexpectedly

.goreleaser.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ release:
1717

1818
before:
1919
hooks:
20-
- go mod tidy -compat=1.23
20+
- go mod tidy -compat=1.24
2121
- go mod download
2222

2323
builds:
@@ -64,7 +64,7 @@ builds:
6464

6565
archives:
6666
- allow_different_binary_count: true
67-
format: binary
67+
formats: [ 'binary' ]
6868

6969
changelog:
7070
sort: asc

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/minio/directpv
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
toolchain go1.23.3
5+
toolchain go1.24.1
66

77
require (
88
github.com/charmbracelet/bubbles v0.20.0

pkg/admin/installer/installer_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package installer
1818

1919
import (
20-
"context"
2120
"io"
2221
"testing"
2322

@@ -125,7 +124,7 @@ func TestInstallUinstall(t *testing.T) {
125124
client := client.GetClient()
126125
legacyClient := legacyclient.GetClient()
127126
client.K8sClient.DiscoveryClient = k8s.NewFakeDiscovery(getDiscoveryGroupsAndMethods, &testVersion)
128-
ctx := context.TODO()
127+
ctx := t.Context()
129128
args := args
130129
tasks := GetDefaultTasks(client, legacyClient)
131130
if err := Install(ctx, &args, tasks); err != nil {

pkg/admin/installer/migrate_test.go

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package installer
1818

1919
import (
20-
"context"
2120
"reflect"
2221
"testing"
2322

@@ -42,7 +41,7 @@ func TestMigrateDrivesError(t *testing.T) {
4241

4342
legacyclient.SetDriveClient(legacyclientsetfake.NewSimpleClientset(drive))
4443
task := migrateTask{client.GetClient(), legacyclient.GetClient()}
45-
driveMap, legacyDriveErrors, driveErrors, err := task.migrateDrives(context.TODO(), false, nil)
44+
driveMap, legacyDriveErrors, driveErrors, err := task.migrateDrives(t.Context(), false, nil)
4645
if len(driveMap) == 0 && len(legacyDriveErrors) == 0 && len(driveErrors) == 0 && err == nil {
4746
t.Fatalf("expected error, but succeeded\n")
4847
}
@@ -56,7 +55,7 @@ func TestMigrateDrivesError(t *testing.T) {
5655
},
5756
}
5857
legacyclient.SetDriveClient(legacyclientsetfake.NewSimpleClientset(drive))
59-
driveMap, legacyDriveErrors, driveErrors, err = task.migrateDrives(context.TODO(), false, nil)
58+
driveMap, legacyDriveErrors, driveErrors, err = task.migrateDrives(t.Context(), false, nil)
6059
if len(driveMap) == 0 && len(legacyDriveErrors) == 0 && len(driveErrors) == 0 && err == nil {
6160
t.Fatalf("expected error, but succeeded\n")
6261
}
@@ -79,7 +78,7 @@ func TestMigrateDrivesError(t *testing.T) {
7978
},
8079
}
8180
legacyclient.SetDriveClient(legacyclientsetfake.NewSimpleClientset(drive1, drive2))
82-
driveMap, legacyDriveErrors, driveErrors, err = task.migrateDrives(context.TODO(), false, nil)
81+
driveMap, legacyDriveErrors, driveErrors, err = task.migrateDrives(t.Context(), false, nil)
8382
if len(driveMap) == 0 && len(legacyDriveErrors) == 0 && len(driveErrors) == 0 && err == nil {
8483
t.Fatalf("expected error, but succeeded\n")
8584
}
@@ -90,11 +89,11 @@ func TestMigrateNoDrives(t *testing.T) {
9089
clientset := types.NewExtFakeClientset(clientsetfake.NewSimpleClientset())
9190
client.SetDriveInterface(clientset.DirectpvLatest().DirectPVDrives())
9291
task := migrateTask{client.GetClient(), legacyclient.GetClient()}
93-
_, legacyDriveErrors, driveErrors, err := task.migrateDrives(context.TODO(), false, nil)
92+
_, legacyDriveErrors, driveErrors, err := task.migrateDrives(t.Context(), false, nil)
9493
if len(legacyDriveErrors) != 0 || len(driveErrors) != 0 || err != nil {
9594
t.Fatalf("unexpected error; %v\n", err)
9695
}
97-
driveList, err := client.DriveClient().List(context.TODO(), metav1.ListOptions{})
96+
driveList, err := client.DriveClient().List(t.Context(), metav1.ListOptions{})
9897
if err != nil && !apierrors.IsNotFound(err) {
9998
t.Fatalf("unexpected error; %v\n", err)
10099
}
@@ -116,11 +115,11 @@ func TestMigrateNoDrives(t *testing.T) {
116115
clientset = types.NewExtFakeClientset(clientsetfake.NewSimpleClientset())
117116
client.SetDriveInterface(clientset.DirectpvLatest().DirectPVDrives())
118117

119-
_, legacyDriveErrors, driveErrors, err = task.migrateDrives(context.TODO(), false, nil)
118+
_, legacyDriveErrors, driveErrors, err = task.migrateDrives(t.Context(), false, nil)
120119
if len(legacyDriveErrors) != 0 || len(driveErrors) != 0 || err != nil {
121120
t.Fatalf("unexpected error; %v\n", err)
122121
}
123-
driveList, err = client.DriveClient().List(context.TODO(), metav1.ListOptions{})
122+
driveList, err = client.DriveClient().List(t.Context(), metav1.ListOptions{})
124123
if err != nil && !apierrors.IsNotFound(err) {
125124
t.Fatalf("unexpected error; %v\n", err)
126125
}
@@ -206,15 +205,15 @@ func TestMigrateReadyDrive(t *testing.T) {
206205
clientset := types.NewExtFakeClientset(clientsetfake.NewSimpleClientset())
207206
client.SetDriveInterface(clientset.DirectpvLatest().DirectPVDrives())
208207
task := migrateTask{client.GetClient(), legacyclient.GetClient()}
209-
driveMap, legacyDriveErrors, driveErrors, err := task.migrateDrives(context.TODO(), false, nil)
208+
driveMap, legacyDriveErrors, driveErrors, err := task.migrateDrives(t.Context(), false, nil)
210209
if len(legacyDriveErrors) != 0 || len(driveErrors) != 0 || err != nil {
211210
t.Fatalf("unexpected error; %v, %v, %v\n", legacyDriveErrors, driveErrors, err)
212211
}
213212
if len(driveMap) == 0 {
214213
t.Fatalf("empty drive map\n")
215214
}
216215

217-
result, err := client.DriveClient().Get(context.TODO(), "08450612-7ab3-40f9-ab83-38645fba6d29", metav1.GetOptions{})
216+
result, err := client.DriveClient().Get(t.Context(), "08450612-7ab3-40f9-ab83-38645fba6d29", metav1.GetOptions{})
218217
if err != nil {
219218
t.Fatalf("unexpected error; %v\n", err)
220219
}
@@ -342,15 +341,15 @@ func TestMigrateInUseDrive(t *testing.T) {
342341
clientset := types.NewExtFakeClientset(clientsetfake.NewSimpleClientset())
343342
client.SetDriveInterface(clientset.DirectpvLatest().DirectPVDrives())
344343
task := migrateTask{client.GetClient(), legacyclient.GetClient()}
345-
driveMap, legacyDriveErrors, driveErrors, err := task.migrateDrives(context.TODO(), false, nil)
344+
driveMap, legacyDriveErrors, driveErrors, err := task.migrateDrives(t.Context(), false, nil)
346345
if len(legacyDriveErrors) != 0 || len(driveErrors) != 0 || err != nil {
347346
t.Fatalf("unexpected error; %v, %v, %v\n", legacyDriveErrors, driveErrors, err)
348347
}
349348
if len(driveMap) == 0 {
350349
t.Fatalf("empty drive map\n")
351350
}
352351

353-
result, err := client.DriveClient().Get(context.TODO(), "08450612-7ab3-40f9-ab83-38645fba6d29", metav1.GetOptions{})
352+
result, err := client.DriveClient().Get(t.Context(), "08450612-7ab3-40f9-ab83-38645fba6d29", metav1.GetOptions{})
354353
if err != nil {
355354
t.Fatalf("unexpected error; %v\n", err)
356355
}
@@ -454,7 +453,7 @@ func TestMigrateVolumes(t *testing.T) {
454453
client.SetVolumeInterface(clientset.DirectpvLatest().DirectPVVolumes())
455454
task := migrateTask{client.GetClient(), legacyclient.GetClient()}
456455
legacyVolumeErrors, volumeErrors, err := task.migrateVolumes(
457-
context.TODO(),
456+
t.Context(),
458457
map[string]string{"08450612-7ab3-40f9-ab83-38645fba6d29": "a9908089-96dd-4e8b-8f06-0c0b5e391f39"},
459458
false,
460459
nil,
@@ -463,7 +462,7 @@ func TestMigrateVolumes(t *testing.T) {
463462
t.Fatalf("unexpected error; %v, %v, %v\n", legacyVolumeErrors, volumeErrors, err)
464463
}
465464

466-
result, err := client.VolumeClient().Get(context.TODO(), "pvc-009bfc49-4a66-4055-9f19-bd039cc3b4f5", metav1.GetOptions{})
465+
result, err := client.VolumeClient().Get(t.Context(), "pvc-009bfc49-4a66-4055-9f19-bd039cc3b4f5", metav1.GetOptions{})
467466
if err != nil {
468467
t.Fatalf("unexpected error; %v\n", err)
469468
}
@@ -493,7 +492,7 @@ func TestMigrateVolumes(t *testing.T) {
493492

494493
// no fsuuid found error
495494
legacyclient.SetVolumeClient(legacyclientsetfake.NewSimpleClientset(volume))
496-
legacyVolumeErrors, volumeErrors, err = task.migrateVolumes(context.TODO(), map[string]string{}, false, nil)
495+
legacyVolumeErrors, volumeErrors, err = task.migrateVolumes(t.Context(), map[string]string{}, false, nil)
497496
if len(legacyVolumeErrors) == 0 && len(volumeErrors) == 0 && err == nil {
498497
t.Fatalf("expected error; but succeeded\n")
499498
}

pkg/client/drive_lister_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package client
1818

1919
import (
20-
"context"
2120
"fmt"
2221
"testing"
2322

@@ -30,7 +29,7 @@ import (
3029
func TestGetDriveList(t *testing.T) {
3130
clientset := types.NewExtFakeClientset(clientsetfake.NewSimpleClientset())
3231
SetDriveInterface(clientset.DirectpvLatest().DirectPVDrives())
33-
drives, err := client.NewDriveLister().Get(context.TODO())
32+
drives, err := client.NewDriveLister().Get(t.Context())
3433
if err != nil {
3534
t.Fatalf("unexpected error: %v", err)
3635
}
@@ -47,7 +46,7 @@ func TestGetDriveList(t *testing.T) {
4746

4847
clientset = types.NewExtFakeClientset(clientsetfake.NewSimpleClientset(objects...))
4948
SetDriveInterface(clientset.DirectpvLatest().DirectPVDrives())
50-
drives, err = client.NewDriveLister().Get(context.TODO())
49+
drives, err = client.NewDriveLister().Get(t.Context())
5150
if err != nil {
5251
t.Fatalf("unexpected error: %v", err)
5352
}

0 commit comments

Comments
 (0)