From 2fb5b89d9223e9f302c01bfee3ae510c6aff5a38 Mon Sep 17 00:00:00 2001 From: Dinifarb Date: Mon, 31 Jul 2023 18:22:05 +0200 Subject: [PATCH 1/2] fix: #1263 Signed-off-by: Dinifarb --- config/config.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/config/config.go b/config/config.go index 53e6115d..cae98d7d 100644 --- a/config/config.go +++ b/config/config.go @@ -18,8 +18,8 @@ import ( "fmt" "io" "net/http" - "net/url" "os" + "strings" "github.com/alecthomas/kingpin/v2" "github.com/go-kit/log" @@ -40,11 +40,8 @@ type Resolver struct { func NewResolver(file string, logger log.Logger, insecure_skip_verify bool) (*Resolver, error) { flags := map[string]string{} var fileBytes []byte - url, err := url.ParseRequestURI(file) - if err != nil { - return nil, err - } - if url.Scheme == "http" || url.Scheme == "https" { + var err error + if strings.HasPrefix(file, "http") || strings.HasPrefix(file, "https") { _ = level.Info(logger).Log("msg", fmt.Sprintf("Loading configuration file from URL: %v", file)) tr := &http.Transport{ TLSClientConfig: &tls.Config{InsecureSkipVerify: insecure_skip_verify}, From f77bdcfa097acd876d0121b3b35e737324414c7f Mon Sep 17 00:00:00 2001 From: Dinifarb Date: Tue, 1 Aug 2023 12:36:11 +0200 Subject: [PATCH 2/2] fix: include :// for better http/s recogitation Signed-off-by: Dinifarb --- config/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.go b/config/config.go index cae98d7d..eeb53581 100644 --- a/config/config.go +++ b/config/config.go @@ -41,7 +41,7 @@ func NewResolver(file string, logger log.Logger, insecure_skip_verify bool) (*Re flags := map[string]string{} var fileBytes []byte var err error - if strings.HasPrefix(file, "http") || strings.HasPrefix(file, "https") { + if strings.HasPrefix(file, "http://") || strings.HasPrefix(file, "https://") { _ = level.Info(logger).Log("msg", fmt.Sprintf("Loading configuration file from URL: %v", file)) tr := &http.Transport{ TLSClientConfig: &tls.Config{InsecureSkipVerify: insecure_skip_verify},