tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #371 from docker/azure-volume-errors 

Clean up volume parsing functions
This commit is contained in:
Ulysses Souza 2020-07-08 15:13:33 +02:00 committed by GitHub
parent b881f16085 42a756f7d3
commit f62ab26714
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
azure/convert/volume.go
View File

@ -70,13 +70,13 @@ type volumeInput struct {
func escapeKeySlashes(rawURL string) (string, error) { func escapeKeySlashes(rawURL string) (string, error) {
urlSplit := strings.Split(rawURL, "@") urlSplit := strings.Split(rawURL, "@")
if len(urlSplit) < 1 { if len(urlSplit) < 1 {
return "", errors.Wrap(errdefs.ErrParsingFailed, "invalid url format "+rawURL) return "", fmt.Errorf("invalid URL format: %s", rawURL)
} }
userPasswd := strings.ReplaceAll(urlSplit[0], "/", "_") userPasswd := strings.ReplaceAll(urlSplit[0], "/", "_")
atIndex := strings.Index(rawURL, "@") atIndex := strings.Index(rawURL, "@")
if atIndex < 0 { if atIndex < 0 {
return "", errors.Wrap(errdefs.ErrParsingFailed, "no share specified in "+rawURL) return "", fmt.Errorf("no share specified in: %s", rawURL)
} }
scaped := userPasswd + rawURL[atIndex:] scaped := userPasswd + rawURL[atIndex:]
@ -98,7 +98,7 @@ func volumeURL(pathURL string) (*url.URL, error) {
count := strings.Count(pathURL, ":") count := strings.Count(pathURL, ":")
if count > 2 { if count > 2 {
return nil, errors.Wrap(errdefs.ErrParsingFailed, fmt.Sprintf("unable to parse volume mount %q", pathURL)) return nil, fmt.Errorf("invalid path URL: %s", pathURL)
} }
if count == 2 { if count == 2 {
tokens := strings.Split(pathURL, ":") tokens := strings.Split(pathURL, ":")
@ -110,20 +110,20 @@ func volumeURL(pathURL string) (*url.URL, error) {
func (v *volumeInput) parse(name string, s string) error { func (v *volumeInput) parse(name string, s string) error {
volumeURL, err := volumeURL(s) volumeURL, err := volumeURL(s)
if err != nil { if err != nil {
return errors.Wrap(errdefs.ErrParsingFailed, fmt.Sprintf("volume specification %q could not be parsed %q", s, err)) return errors.Wrapf(errdefs.ErrParsingFailed, "unable to parse volume specification: %s", err.Error())
} }
v.username = volumeURL.User.Username() v.username = volumeURL.User.Username()
if v.username == "" { if v.username == "" {
return errors.Wrap(errdefs.ErrParsingFailed, fmt.Sprintf("volume specification %q does not include a storage username", v)) return errors.Wrapf(errdefs.ErrParsingFailed, "volume specification %q does not include a storage username", v)
} }
key, ok := volumeURL.User.Password() key, ok := volumeURL.User.Password()
if !ok || key == "" { if !ok || key == "" {
return errors.Wrap(errdefs.ErrParsingFailed, fmt.Sprintf("volume specification %q does not include a storage key", v)) return errors.Wrapf(errdefs.ErrParsingFailed, "volume specification %q does not include a storage key", v)
} }
v.key = unescapeKey(key) v.key = unescapeKey(key)
v.share = volumeURL.Host v.share = volumeURL.Host
if v.share == "" { if v.share == "" {
return errors.Wrap(errdefs.ErrParsingFailed, fmt.Sprintf("volume specification %q does not include a storage file share", v)) return errors.Wrapf(errdefs.ErrParsingFailed, "volume specification %q does not include a storage file share", v)
} }
v.name = name v.name = name
v.target = volumeURL.Path v.target = volumeURL.Path