Skip to content

Commit 168f391

Browse files
fix windows url parse
1 parent bb6ad0a commit 168f391

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

detect_gcs.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ package getter
55

66
import (
77
"fmt"
8-
"net/url"
98
"strings"
9+
10+
urlhelper "github.com/hashicorp/go-getter/helper/url"
1011
)
1112

1213
// GCSDetector implements Detector to detect GCS URLs and turn
@@ -22,7 +23,7 @@ func (d *GCSDetector) Detect(src, _ string) (string, bool, error) {
2223
src = "https://" + src
2324
}
2425

25-
parsedURL, err := url.Parse(src)
26+
parsedURL, err := urlhelper.Parse(src)
2627
if err != nil {
2728
return "", false, fmt.Errorf("error parsing GCS URL")
2829
}
@@ -45,7 +46,7 @@ func (d *GCSDetector) detectHTTP(src string) (string, bool, error) {
4546
bucket := parts[3]
4647
object := strings.Join(parts[4:], "/")
4748

48-
url, err := url.Parse(fmt.Sprintf("https://www.googleapis.com/storage/%s/%s/%s",
49+
url, err := urlhelper.Parse(fmt.Sprintf("https://www.googleapis.com/storage/%s/%s/%s",
4950
version, bucket, object))
5051
if err != nil {
5152
return "", false, fmt.Errorf("error parsing GCS URL: %s", err)

detect_s3.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ package getter
55

66
import (
77
"fmt"
8-
"net/url"
98
"strings"
9+
10+
urlhelper "github.com/hashicorp/go-getter/helper/url"
1011
)
1112

1213
// S3Detector implements Detector to detect S3 URLs and turn
@@ -22,7 +23,7 @@ func (d *S3Detector) Detect(src, _ string) (string, bool, error) {
2223
src = "https://" + src
2324
}
2425

25-
parsedURL, err := url.Parse(src)
26+
parsedURL, err := urlhelper.Parse(src)
2627
if err != nil {
2728
return "", false, fmt.Errorf("error parsing S3 URL")
2829
}
@@ -56,7 +57,7 @@ func (d *S3Detector) detectHTTP(src string) (string, bool, error) {
5657

5758
func (d *S3Detector) detectPathStyle(region string, parts []string) (string, bool, error) {
5859
urlStr := fmt.Sprintf("https://%s.amazonaws.com/%s", region, strings.Join(parts, "/"))
59-
url, err := url.Parse(urlStr)
60+
url, err := urlhelper.Parse(urlStr)
6061
if err != nil {
6162
return "", false, fmt.Errorf("error parsing S3 URL: %s", err)
6263
}
@@ -66,7 +67,7 @@ func (d *S3Detector) detectPathStyle(region string, parts []string) (string, boo
6667

6768
func (d *S3Detector) detectVhostStyle(region, bucket string, parts []string) (string, bool, error) {
6869
urlStr := fmt.Sprintf("https://%s.amazonaws.com/%s/%s", region, bucket, strings.Join(parts, "/"))
69-
url, err := url.Parse(urlStr)
70+
url, err := urlhelper.Parse(urlStr)
7071
if err != nil {
7172
return "", false, fmt.Errorf("error parsing S3 URL: %s", err)
7273
}
@@ -76,7 +77,7 @@ func (d *S3Detector) detectVhostStyle(region, bucket string, parts []string) (st
7677

7778
func (d *S3Detector) detectNewVhostStyle(region, bucket string, parts []string) (string, bool, error) {
7879
urlStr := fmt.Sprintf("https://s3.%s.amazonaws.com/%s/%s", region, bucket, strings.Join(parts, "/"))
79-
url, err := url.Parse(urlStr)
80+
url, err := urlhelper.Parse(urlStr)
8081
if err != nil {
8182
return "", false, fmt.Errorf("error parsing S3 URL: %s", err)
8283
}

0 commit comments

Comments
 (0)