From 810f525531acb600578d0a6ac774a31d4f46938a Mon Sep 17 00:00:00 2001
From: Louis PERDEREAU <leolouis.perdereau@gmail.com>
Date: Sat, 24 Jun 2023 21:13:52 +0200
Subject: [PATCH] fix: Update auth yaml config

---
 pkg/acquisition/modules/loki/loki.go      | 12 +++++++-----
 pkg/acquisition/modules/loki/loki_test.go | 17 ++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkg/acquisition/modules/loki/loki.go b/pkg/acquisition/modules/loki/loki.go
index c21967520..5124af5c9 100644
--- a/pkg/acquisition/modules/loki/loki.go
+++ b/pkg/acquisition/modules/loki/loki.go
@@ -119,11 +119,13 @@ func (l *LokiSource) Configure(config []byte, logger *log.Entry) error {
 	l.logger.Infof("Since value: %s", l.Config.Since.String())
 
 	clientConfig := lokiclient.Config{
-		LokiURL: l.Config.URL,
-		Headers: l.Config.Headers,
-		Limit:   l.Config.Limit,
-		Query:   l.Config.Query,
-		Since:   l.Config.Since,
+		LokiURL:  l.Config.URL,
+		Headers:  l.Config.Headers,
+		Limit:    l.Config.Limit,
+		Query:    l.Config.Query,
+		Since:    l.Config.Since,
+		Username: l.Config.Auth.Username,
+		Password: l.Config.Auth.Password,
 	}
 
 	l.Client = lokiclient.NewLokiClient(clientConfig)
diff --git a/pkg/acquisition/modules/loki/loki_test.go b/pkg/acquisition/modules/loki/loki_test.go
index 03245a6b1..d879a70c6 100644
--- a/pkg/acquisition/modules/loki/loki_test.go
+++ b/pkg/acquisition/modules/loki/loki_test.go
@@ -82,7 +82,10 @@ query: >
 			config: `
 mode: tail
 source: loki
-url: http://foo:bar@localhost:3100/
+url: http://@localhost:3100/
+auth:
+  username: foo
+  password: bar
 query: >
         {server="demo"}
 `,
@@ -99,16 +102,12 @@ query: >
 			lokiSource := loki.LokiSource{}
 			err := lokiSource.Configure([]byte(test.config), subLogger)
 			cstest.AssertErrorContains(t, err, test.expectedErr)
-			/*if test.password == "" {
-				if lokiSource.auth != nil {
-					t.Fatalf("No auth should be here : %v", lokiSource.auth)
-				}
-			} else {
-				p, _ := lokiSource.auth.Password()
+			if test.password != "" {
+				p := lokiSource.Config.Auth.Password
 				if test.password != p {
-					t.Fatalf("Bad password %s != %s", test.password, p)
+					t.Fatalf("Password mismatch : %s != %s", test.password, p)
 				}
-			}*/
+			}
 			if test.waitForReady != 0 {
 				if lokiSource.Config.WaitForReady != test.waitForReady {
 					t.Fatalf("Wrong WaitForReady %v != %v", lokiSource.Config.WaitForReady, test.waitForReady)