From 72c74f5f8ad05ba358e2c0509d698cda58afaa62 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 25 Jun 2020 10:35:19 +0200 Subject: [PATCH] cleanup: use errors.As() in cephfs.NodeStageVolume() See-also: https://github.com/golang/go/wiki/ErrorValueFAQ#how-should-i-change-my-error-handling-code-to-work-with-the-new-features Signed-off-by: Niels de Vos --- internal/cephfs/nodeserver.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/internal/cephfs/nodeserver.go b/internal/cephfs/nodeserver.go index 81c491527..c96a1022c 100644 --- a/internal/cephfs/nodeserver.go +++ b/internal/cephfs/nodeserver.go @@ -18,6 +18,7 @@ package cephfs import ( "context" + "errors" "fmt" "os" "strings" @@ -88,14 +89,16 @@ func (ns *NodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol volOptions, _, err := newVolumeOptionsFromVolID(ctx, string(volID), req.GetVolumeContext(), req.GetSecrets()) if err != nil { - if _, ok := err.(ErrInvalidVolID); !ok { + var eivi ErrInvalidVolID + if !errors.As(err, &eivi) { return nil, status.Error(codes.Internal, err.Error()) } // check for pre-provisioned volumes (plugin versions > 1.0.0) volOptions, _, err = newVolumeOptionsFromStaticVolume(string(volID), req.GetVolumeContext()) if err != nil { - if _, ok := err.(ErrNonStaticVolume); !ok { + var ensv ErrNonStaticVolume + if !errors.As(err, &ensv) { return nil, status.Error(codes.Internal, err.Error()) }