From 8cbb1a43572d9e8d2809a827e9cda72b16a96490 Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Thu, 21 Aug 2025 15:17:00 +0100 Subject: [PATCH] runtime: Fix non constant Errorf formatting As part of the go 1.24.6 bump there are errors about the incorrect use of a errorf, so switch to the non-formatting version, or add the format string as appropriate Signed-off-by: stevenhorsman --- src/runtime/pkg/containerd-shim-v2/errors.go | 4 ++-- src/runtime/virtcontainers/remote.go | 2 +- src/tools/csi-kata-directvolume/pkg/utils/safe_formater.go | 4 ++-- src/tools/csi-kata-directvolume/pkg/utils/utils.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/runtime/pkg/containerd-shim-v2/errors.go b/src/runtime/pkg/containerd-shim-v2/errors.go index 77ad23897b..232838bf0a 100644 --- a/src/runtime/pkg/containerd-shim-v2/errors.go +++ b/src/runtime/pkg/containerd-shim-v2/errors.go @@ -31,9 +31,9 @@ func toGRPC(err error) error { err = errors.Cause(err) switch { case isInvalidArgument(err): - return status.Errorf(codes.InvalidArgument, err.Error()) + return status.Error(codes.InvalidArgument, err.Error()) case isNotFound(err): - return status.Errorf(codes.NotFound, err.Error()) + return status.Error(codes.NotFound, err.Error()) } return err diff --git a/src/runtime/virtcontainers/remote.go b/src/runtime/virtcontainers/remote.go index 0e583ed9ee..d88a3ca4e9 100644 --- a/src/runtime/virtcontainers/remote.go +++ b/src/runtime/virtcontainers/remote.go @@ -178,7 +178,7 @@ func notImplemented(name string) error { err := errors.Errorf("%s: not implemented", name) - hvLogger.Errorf(err.Error()) + hvLogger.Error(err.Error()) if tracer, ok := err.(interface{ StackTrace() errors.StackTrace }); ok { for _, f := range tracer.StackTrace() { diff --git a/src/tools/csi-kata-directvolume/pkg/utils/safe_formater.go b/src/tools/csi-kata-directvolume/pkg/utils/safe_formater.go index 654a574d4a..b2f9ea9566 100644 --- a/src/tools/csi-kata-directvolume/pkg/utils/safe_formater.go +++ b/src/tools/csi-kata-directvolume/pkg/utils/safe_formater.go @@ -96,14 +96,14 @@ func (mounter *SafeMountFormater) SafeFormatWithFstype(source string, fstype str if output, err := doSafeCommand(mkfsCmd, args...); err != nil { detailedErr := fmt.Sprintf("format disk %q failed: type:(%q) errcode:(%v) output:(%v) ", source, fstype, err, string(output)) klog.Error(detailedErr) - return mountutils.NewMountError(mountutils.FormatFailed, detailedErr) + return mountutils.NewMountError(mountutils.FormatFailed, "%s", detailedErr) } klog.Infof("Disk successfully formatted (mkfs): %s - %s", fstype, source) } else { if fstype != existingFormat { // Do verify the disk formatted with expected fs type. - return mountutils.NewMountError(mountutils.FilesystemMismatch, err.Error()) + return mountutils.NewMountError(mountutils.FilesystemMismatch, "%s", err.Error()) } if !readOnly { diff --git a/src/tools/csi-kata-directvolume/pkg/utils/utils.go b/src/tools/csi-kata-directvolume/pkg/utils/utils.go index cdd80147a4..27c148c8e1 100644 --- a/src/tools/csi-kata-directvolume/pkg/utils/utils.go +++ b/src/tools/csi-kata-directvolume/pkg/utils/utils.go @@ -202,7 +202,7 @@ func CreateDirectBlockDevice(volID, capacityInBytesStr, storagePath string) (*st // create raw disk if _, err = diskfs.Create(devicePath, capacityInBytes, diskfs.Raw, diskfs.SectorSizeDefault); err != nil { errMsg := fmt.Errorf("diskfs create disk failed: %v", err) - klog.Errorf(errMsg.Error()) + klog.Error(errMsg.Error()) return nil, errMsg }