Skip to content

K
k3s
Commit e56e2ee4 authored by Justin Santa Barbara's avatar Justin Santa Barbara
Browse files
Options

Strip leading slash from url path when parsing aws volume

parent 743f2edb
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
pkg/cloudprovider/aws/aws.go
View file @ e56e2ee4
...@@ -733,7 +733,12 @@ func newAwsDisk(ec2 EC2, name string) (*awsDisk, error) { ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment