diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml index e2a698b75..66a95a115 100644 --- a/.github/workflows/lints.yml +++ b/.github/workflows/lints.yml @@ -28,10 +28,10 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: 1.21 + go-version: 1.24 - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.55.1 + version: v1.64.4 args: --timeout=5m diff --git a/mantle/cmd/ore/azure/delete-blob.go b/mantle/cmd/ore/azure/delete-blob.go index 7553d16ae..5cc515077 100644 --- a/mantle/cmd/ore/azure/delete-blob.go +++ b/mantle/cmd/ore/azure/delete-blob.go @@ -52,7 +52,7 @@ func runDeleteBlob(cmd *cobra.Command, args []string) { if err != nil { plog.Fatalf("Fetching storage service keys failed: %v", err) } - if kr.Keys == nil || len(kr.Keys) == 0 { + if len(kr.Keys) == 0 { plog.Fatalf("No storage service keys found") } k := kr.Keys diff --git a/mantle/cmd/ore/azure/upload-blob.go b/mantle/cmd/ore/azure/upload-blob.go index cdaca61d6..d99b95c5a 100644 --- a/mantle/cmd/ore/azure/upload-blob.go +++ b/mantle/cmd/ore/azure/upload-blob.go @@ -86,7 +86,7 @@ func runUploadBlob(cmd *cobra.Command, args []string) { if err != nil { plog.Fatalf("Fetching storage service keys failed: %v", err) } - if kr.Keys == nil || len(kr.Keys) == 0 { + if len(kr.Keys) == 0 { plog.Fatalf("No storage service keys found") } k := kr.Keys diff --git a/mantle/kola/tests/ignition/kdump.go b/mantle/kola/tests/ignition/kdump.go index e7266b2aa..55cf7a4cf 100644 --- a/mantle/kola/tests/ignition/kdump.go +++ b/mantle/kola/tests/ignition/kdump.go @@ -189,7 +189,7 @@ kernel_arguments: if err != nil { return err } else if string(kdump_status) == "inactive" { - return fmt.Errorf(fmt.Sprintf("Kdump.service is not ready: %s.", string(kdump_status))) + return fmt.Errorf("kdump.service is not ready: %s", string(kdump_status)) } return nil }) diff --git a/mantle/kola/tests/misc/network.go b/mantle/kola/tests/misc/network.go index d131e9f0a..49506acba 100644 --- a/mantle/kola/tests/misc/network.go +++ b/mantle/kola/tests/misc/network.go @@ -612,7 +612,8 @@ func checkExpectedInterfacesStatus(c cluster.TestCluster, m platform.Machine, ma } if len(failedConnections) != 0 { - return fmt.Errorf(strings.Join(failedConnections, ",")) + failed := strings.Join(failedConnections, ",") + return fmt.Errorf("failed connections: %s", failed) } return nil } @@ -642,7 +643,8 @@ func checkExpectedInterfacesIPAddress(c cluster.TestCluster, m platform.Machine, } if len(failedConnections) != 0 { - return fmt.Errorf(strings.Join(failedConnections, ",")) + failed := strings.Join(failedConnections, ",") + return fmt.Errorf("failed connections: %s", failed) } return nil }