@@ -5,8 +5,9 @@ package getter
5
5
6
6
import (
7
7
"fmt"
8
- "net/url"
9
8
"strings"
9
+
10
+ urlhelper "github.com/hashicorp/go-getter/helper/url"
10
11
)
11
12
12
13
// S3Detector implements Detector to detect S3 URLs and turn
@@ -22,7 +23,7 @@ func (d *S3Detector) Detect(src, _ string) (string, bool, error) {
22
23
src = "https://" + src
23
24
}
24
25
25
- parsedURL , err := url .Parse (src )
26
+ parsedURL , err := urlhelper .Parse (src )
26
27
if err != nil {
27
28
return "" , false , fmt .Errorf ("error parsing S3 URL" )
28
29
}
@@ -56,7 +57,7 @@ func (d *S3Detector) detectHTTP(src string) (string, bool, error) {
56
57
57
58
func (d * S3Detector ) detectPathStyle (region string , parts []string ) (string , bool , error ) {
58
59
urlStr := fmt .Sprintf ("https://%s.amazonaws.com/%s" , region , strings .Join (parts , "/" ))
59
- url , err := url .Parse (urlStr )
60
+ url , err := urlhelper .Parse (urlStr )
60
61
if err != nil {
61
62
return "" , false , fmt .Errorf ("error parsing S3 URL: %s" , err )
62
63
}
@@ -66,7 +67,7 @@ func (d *S3Detector) detectPathStyle(region string, parts []string) (string, boo
66
67
67
68
func (d * S3Detector ) detectVhostStyle (region , bucket string , parts []string ) (string , bool , error ) {
68
69
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 )
70
71
if err != nil {
71
72
return "" , false , fmt .Errorf ("error parsing S3 URL: %s" , err )
72
73
}
@@ -76,7 +77,7 @@ func (d *S3Detector) detectVhostStyle(region, bucket string, parts []string) (st
76
77
77
78
func (d * S3Detector ) detectNewVhostStyle (region , bucket string , parts []string ) (string , bool , error ) {
78
79
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 )
80
81
if err != nil {
81
82
return "" , false , fmt .Errorf ("error parsing S3 URL: %s" , err )
82
83
}
0 commit comments