From e56e2ee46a2e41ae3bf8a64df555d071297ea625 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Thu, 2 Apr 2015 10:23:41 -0700 Subject: [PATCH] Strip leading slash from url path when parsing aws volume --- pkg/cloudprovider/aws/aws.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/cloudprovider/aws/aws.go b/pkg/cloudprovider/aws/aws.go index 3248a9aa4a5..c001702a35e 100644 --- a/pkg/cloudprovider/aws/aws.go +++ b/pkg/cloudprovider/aws/aws.go @@ -733,7 +733,12 @@ func newAwsDisk(ec2 EC2, name string) (*awsDisk, error) { if url.Scheme != "aws" { return nil, fmt.Errorf("Invalid scheme for AWS volume (%s)", name) } + awsId := url.Path + if len(awsId) > 1 && awsId[0] == '/' { + awsId = awsId[1:] + } + // TODO: Regex match? if strings.Contains(awsId, "/") || !strings.HasPrefix(awsId, "vol-") { return nil, fmt.Errorf("Invalid format for AWS volume (%s)", name)