From 033f94e58a1d74eabbf18710f6cd8b6c7fb7a399 Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Tue, 21 Apr 2020 11:21:40 -0400 Subject: [PATCH] [Provider/aws] use strings.TrimPrefix() --- staging/src/k8s.io/legacy-cloud-providers/aws/aws.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/staging/src/k8s.io/legacy-cloud-providers/aws/aws.go b/staging/src/k8s.io/legacy-cloud-providers/aws/aws.go index 3a972b6a8f9..89c529d4bc2 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/aws/aws.go +++ b/staging/src/k8s.io/legacy-cloud-providers/aws/aws.go @@ -1884,12 +1884,8 @@ func (c *Cloud) getMountDevice( volumeStatus := map[EBSVolumeID]string{} // for better logging of volume status for _, blockDevice := range info.BlockDeviceMappings { name := aws.StringValue(blockDevice.DeviceName) - if strings.HasPrefix(name, "/dev/sd") { - name = name[7:] - } - if strings.HasPrefix(name, "/dev/xvd") { - name = name[8:] - } + name = strings.TrimPrefix(name, "/dev/sd") + name = strings.TrimPrefix(name, "/dev/xvd") if len(name) < 1 || len(name) > 2 { klog.Warningf("Unexpected EBS DeviceName: %q", aws.StringValue(blockDevice.DeviceName)) }