CSI mock driver: fix faulty error message

Caught by verify-typecheck.sh after importing the code into
Kubernetes:

ERROR(linux/arm): /home/prow/go/src/k8s.io/kubernetes/_output/local/go/src/k8s.io/kubernetes/test/e2e/storage/drivers/csi-test/mock/service/controller.go:404:20: math.MaxUint32 (untyped int constant 4294967295) overflows int
ERROR(linux/arm): /home/prow/go/src/k8s.io/kubernetes/_output/local/go/src/k8s.io/kubernetes/test/e2e/storage/drivers/csi-test/mock/service/controller.go:795:20: math.MaxUint32 (untyped int constant 4294967295) overflows int
ERROR(linux/386): /home/prow/go/src/k8s.io/kubernetes/_output/local/go/src/k8s.io/kubernetes/test/e2e/storage/drivers/csi-test/mock/service/controller.go:404:20: math.MaxUint32 (untyped int constant 4294967295) overflows int
ERROR(linux/386): /home/prow/go/src/k8s.io/kubernetes/_output/local/go/src/k8s.io/kubernetes/test/e2e/storage/drivers/csi-test/mock/service/controller.go:795:20: math.MaxUint32 (untyped int constant 4294967295) overflows int
ERROR(windows/386): /home/prow/go/src/k8s.io/kubernetes/_output/local/go/src/k8s.io/kubernetes/test/e2e/storage/drivers/csi-test/mock/service/controller.go:404:20: math.MaxUint32 (untyped int constant 4294967295) overflows int
ERROR(windows/386):
/home/prow/go/src/k8s.io/kubernetes/_output/local/go/src/k8s.io/kubernetes/test/e2e/storage/drivers/csi-test/mock/service/controller.go:795:20:
math.MaxUint32 (untyped int constant 4294967295) overflows int

Instead of producing our own error message, we can show the original
value and the error from strconv.
This commit is contained in:
Patrick Ohly 2020-12-04 15:20:45 +01:00
parent 7008196093
commit df6d3bc7dd

View File

@ -18,7 +18,6 @@ package service
import ( import (
"fmt" "fmt"
"math"
"path" "path"
"reflect" "reflect"
"strconv" "strconv"
@ -412,8 +411,8 @@ func (s *service) ListVolumes(
if err != nil { if err != nil {
return nil, status.Errorf( return nil, status.Errorf(
codes.Aborted, codes.Aborted,
"startingToken=%d !< int32=%d", "startingToken=%s: %v",
startingToken, math.MaxUint32) v, err)
} }
startingToken = int32(i) startingToken = int32(i)
} }
@ -801,8 +800,8 @@ func getAllSnapshots(s *service, req *csi.ListSnapshotsRequest) (*csi.ListSnapsh
if err != nil { if err != nil {
return nil, status.Errorf( return nil, status.Errorf(
codes.Aborted, codes.Aborted,
"startingToken=%d !< int32=%d", "startingToken=%s: %v",
startingToken, math.MaxUint32) v, err)
} }
startingToken = int32(i) startingToken = int32(i)
} }