diff options
author | Nathan Dench <ndenc2@gmail.com> | 2019-05-24 15:16:44 +1000 |
---|---|---|
committer | Nathan Dench <ndenc2@gmail.com> | 2019-05-24 15:16:44 +1000 |
commit | 107c1cdb09c575aa2f61d97f48d8587eb6bada4c (patch) | |
tree | ca7d008643efc555c388baeaf1d986e0b6b3e28c /vendor/github.com/hashicorp/go-getter/helper | |
parent | 844b5a68d8af4791755b8f0ad293cc99f5959183 (diff) | |
download | terraform-provider-statuscake-107c1cdb09c575aa2f61d97f48d8587eb6bada4c.tar.gz terraform-provider-statuscake-107c1cdb09c575aa2f61d97f48d8587eb6bada4c.tar.zst terraform-provider-statuscake-107c1cdb09c575aa2f61d97f48d8587eb6bada4c.zip |
Upgrade to 0.12
Diffstat (limited to 'vendor/github.com/hashicorp/go-getter/helper')
-rw-r--r-- | vendor/github.com/hashicorp/go-getter/helper/url/url_windows.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/vendor/github.com/hashicorp/go-getter/helper/url/url_windows.go b/vendor/github.com/hashicorp/go-getter/helper/url/url_windows.go index 4655226..4280ec5 100644 --- a/vendor/github.com/hashicorp/go-getter/helper/url/url_windows.go +++ b/vendor/github.com/hashicorp/go-getter/helper/url/url_windows.go | |||
@@ -11,19 +11,18 @@ func parse(rawURL string) (*url.URL, error) { | |||
11 | // Make sure we're using "/" since URLs are "/"-based. | 11 | // Make sure we're using "/" since URLs are "/"-based. |
12 | rawURL = filepath.ToSlash(rawURL) | 12 | rawURL = filepath.ToSlash(rawURL) |
13 | 13 | ||
14 | if len(rawURL) > 1 && rawURL[1] == ':' { | ||
15 | // Assume we're dealing with a drive letter. In which case we | ||
16 | // force the 'file' scheme to avoid "net/url" URL.String() prepending | ||
17 | // our url with "./". | ||
18 | rawURL = "file://" + rawURL | ||
19 | } | ||
20 | |||
14 | u, err := url.Parse(rawURL) | 21 | u, err := url.Parse(rawURL) |
15 | if err != nil { | 22 | if err != nil { |
16 | return nil, err | 23 | return nil, err |
17 | } | 24 | } |
18 | 25 | ||
19 | if len(rawURL) > 1 && rawURL[1] == ':' { | ||
20 | // Assume we're dealing with a drive letter file path where the drive | ||
21 | // letter has been parsed into the URL Scheme, and the rest of the path | ||
22 | // has been parsed into the URL Path without the leading ':' character. | ||
23 | u.Path = fmt.Sprintf("%s:%s", string(rawURL[0]), u.Path) | ||
24 | u.Scheme = "" | ||
25 | } | ||
26 | |||
27 | if len(u.Host) > 1 && u.Host[1] == ':' && strings.HasPrefix(rawURL, "file://") { | 26 | if len(u.Host) > 1 && u.Host[1] == ':' && strings.HasPrefix(rawURL, "file://") { |
28 | // Assume we're dealing with a drive letter file path where the drive | 27 | // Assume we're dealing with a drive letter file path where the drive |
29 | // letter has been parsed into the URL Host. | 28 | // letter has been parsed into the URL Host. |