Merge pull request #1265 from DiniFarb/fix_configfile

fix: config file CLI argument for relative paths -> v0.23.1
This commit is contained in:
Ben Reedy
2023-08-01 20:56:52 +10:00
committed by GitHub

View File

@@ -18,8 +18,8 @@ import (
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
"net/url"
"os" "os"
"strings"
"github.com/alecthomas/kingpin/v2" "github.com/alecthomas/kingpin/v2"
"github.com/go-kit/log" "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) { func NewResolver(file string, logger log.Logger, insecure_skip_verify bool) (*Resolver, error) {
flags := map[string]string{} flags := map[string]string{}
var fileBytes []byte var fileBytes []byte
url, err := url.ParseRequestURI(file) var err error
if err != nil { if strings.HasPrefix(file, "http://") || strings.HasPrefix(file, "https://") {
return nil, err
}
if url.Scheme == "http" || url.Scheme == "https" {
_ = level.Info(logger).Log("msg", fmt.Sprintf("Loading configuration file from URL: %v", file)) _ = level.Info(logger).Log("msg", fmt.Sprintf("Loading configuration file from URL: %v", file))
tr := &http.Transport{ tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: insecure_skip_verify}, TLSClientConfig: &tls.Config{InsecureSkipVerify: insecure_skip_verify},