fix: Add https to dsn
This commit is contained in:
parent
810f525531
commit
2017e6b113
|
@ -152,12 +152,10 @@ func (l *LokiSource) ConfigureByDSN(dsn string, labels map[string]string, logger
|
||||||
}
|
}
|
||||||
scheme := "http"
|
scheme := "http"
|
||||||
|
|
||||||
l.Config.URL = fmt.Sprintf("%s://%s", scheme, u.Host)
|
|
||||||
if u.User != nil {
|
|
||||||
l.Config.Auth.Username = u.User.Username()
|
|
||||||
l.Config.Auth.Password, _ = u.User.Password()
|
|
||||||
}
|
|
||||||
params := u.Query()
|
params := u.Query()
|
||||||
|
if q := params.Get("ssl"); q != "" {
|
||||||
|
scheme = "https"
|
||||||
|
}
|
||||||
if q := params.Get("query"); q != "" {
|
if q := params.Get("query"); q != "" {
|
||||||
l.Config.Query = q
|
l.Config.Query = q
|
||||||
}
|
}
|
||||||
|
@ -202,6 +200,12 @@ func (l *LokiSource) ConfigureByDSN(dsn string, labels map[string]string, logger
|
||||||
l.logger.Logger.SetLevel(level)
|
l.logger.Logger.SetLevel(level)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
l.Config.URL = fmt.Sprintf("%s://%s", scheme, u.Host)
|
||||||
|
if u.User != nil {
|
||||||
|
l.Config.Auth.Username = u.User.Username()
|
||||||
|
l.Config.Auth.Password, _ = u.User.Password()
|
||||||
|
}
|
||||||
|
|
||||||
clientConfig := lokiclient.Config{
|
clientConfig := lokiclient.Config{
|
||||||
LokiURL: l.Config.URL,
|
LokiURL: l.Config.URL,
|
||||||
Headers: l.Config.Headers,
|
Headers: l.Config.Headers,
|
||||||
|
|
|
@ -6,6 +6,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
@ -82,7 +83,7 @@ query: >
|
||||||
config: `
|
config: `
|
||||||
mode: tail
|
mode: tail
|
||||||
source: loki
|
source: loki
|
||||||
url: http://@localhost:3100/
|
url: http://localhost:3100/
|
||||||
auth:
|
auth:
|
||||||
username: foo
|
username: foo
|
||||||
password: bar
|
password: bar
|
||||||
|
@ -125,6 +126,7 @@ func TestConfigureDSN(t *testing.T) {
|
||||||
expectedErr string
|
expectedErr string
|
||||||
since time.Time
|
since time.Time
|
||||||
password string
|
password string
|
||||||
|
scheme string
|
||||||
waitForReady time.Duration
|
waitForReady time.Duration
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
|
@ -163,6 +165,11 @@ func TestConfigureDSN(t *testing.T) {
|
||||||
expectedErr: "",
|
expectedErr: "",
|
||||||
waitForReady: 5 * time.Second,
|
waitForReady: 5 * time.Second,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "SSL DSN",
|
||||||
|
dsn: `loki://localhost:3100/?ssl=true`,
|
||||||
|
scheme: "https",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, test := range tests {
|
for _, test := range tests {
|
||||||
|
@ -186,6 +193,12 @@ func TestConfigureDSN(t *testing.T) {
|
||||||
t.Fatalf("Password mismatch : %s != %s", test.password, p)
|
t.Fatalf("Password mismatch : %s != %s", test.password, p)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if test.scheme != "" {
|
||||||
|
url, _ := url.Parse(lokiSource.Config.URL)
|
||||||
|
if test.scheme != url.Scheme {
|
||||||
|
t.Fatalf("Schema mismatch : %s != %s", test.scheme, url.Scheme)
|
||||||
|
}
|
||||||
|
}
|
||||||
if test.waitForReady != 0 {
|
if test.waitForReady != 0 {
|
||||||
if lokiSource.Config.WaitForReady != test.waitForReady {
|
if lokiSource.Config.WaitForReady != test.waitForReady {
|
||||||
t.Fatalf("Wrong WaitForReady %v != %v", lokiSource.Config.WaitForReady, test.waitForReady)
|
t.Fatalf("Wrong WaitForReady %v != %v", lokiSource.Config.WaitForReady, test.waitForReady)
|
||||||
|
|
Loading…
Reference in a new issue