kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error for invalid vfs paths 

We should be printing the path when it fails validation
This commit is contained in:
Justin Santa Barbara 2017-03-13 10:41:03 -04:00
parent f489c15342
commit 32b9e1b5b1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/pkg/vfs/context.go
View File

@ -204,15 +204,15 @@ func RetryWithBackoff(backoff wait.Backoff, condition func() (bool, error)) (boo
func (c *VFSContext) buildS3Path(p string) (*S3Path, error) {
u, err := url.Parse(p)
if err != nil {
return nil, fmt.Errorf("invalid s3 path: %q", err)
return nil, fmt.Errorf("invalid s3 path: %q", p)
}
if u.Scheme != "s3" {
return nil, fmt.Errorf("invalid s3 path: %q", err)
return nil, fmt.Errorf("invalid s3 path: %q", p)
}
bucket := strings.TrimSuffix(u.Host, "/")
if bucket == "" {
return nil, fmt.Errorf("invalid s3 path: %q", err)
return nil, fmt.Errorf("invalid s3 path: %q", p)
}
s3path := newS3Path(c.s3Context, bucket, u.Path)
@ -242,11 +242,11 @@ func (c *VFSContext) ResetMemfsContext(clusterReadable bool) {
func (c *VFSContext) buildGCSPath(p string) (*GSPath, error) {
u, err := url.Parse(p)
if err != nil {
return nil, fmt.Errorf("invalid google cloud storage path: %q", err)
return nil, fmt.Errorf("invalid google cloud storage path: %q", p)
}
if u.Scheme != "gs" {
return nil, fmt.Errorf("invalid google cloud storage path: %q", err)
return nil, fmt.Errorf("invalid google cloud storage path: %q", p)
}
bucket := strings.TrimSuffix(u.Host, "/")