github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strip leading slash from url path when parsing aws volume

Browse Source
This commit is contained in:
Justin Santa Barbara 2015-04-02 10:23:41 -07:00
parent 743f2edb56
commit e56e2ee46a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/cloudprovider/aws/aws.go
View File

@ -733,7 +733,12 @@ func newAwsDisk(ec2 EC2, name string) (*awsDisk, error) {
if url.Scheme != "aws" { if url.Scheme != "aws" {
return nil, fmt.Errorf("Invalid scheme for AWS volume (%s)", name) return nil, fmt.Errorf("Invalid scheme for AWS volume (%s)", name)
} }
awsId := url.Path awsId := url.Path
if len(awsId) > 1 && awsId[0] == '/' {
awsId = awsId[1:]
}
// TODO: Regex match? // TODO: Regex match?
if strings.Contains(awsId, "/") || !strings.HasPrefix(awsId, "vol-") { if strings.Contains(awsId, "/") || !strings.HasPrefix(awsId, "vol-") {
return nil, fmt.Errorf("Invalid format for AWS volume (%s)", name) return nil, fmt.Errorf("Invalid format for AWS volume (%s)", name)