fixed password endline bug

pkg/configs/db/db.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/url"
 	"os"
+	"strings"
 
 	"github.com/cortexproject/cortex/pkg/configs/db/memory"
 	"github.com/cortexproject/cortex/pkg/configs/db/postgres"
@@ -58,6 +59,21 @@ type DB interface {
 	Close() error
 }
 
+func SetUserPassword(u *url.URL, passwordFilePath string) (*url.URL, error) {
+	if u.User == nil {
+		return nil, fmt.Errorf("--database.password-file requires username in --database.uri")
+	}
+
+	passwordBytes, err := os.ReadFile(passwordFilePath)
+	if err != nil {
+		return nil, fmt.Errorf("Could not read database password file: %v", err)
+	}
+
+	password := strings.TrimSpace(string(passwordBytes))
+	u.User = url.UserPassword(u.User.Username(), password)
+	return u, nil
+}
+
 // New creates a new database.
 func New(cfg Config) (DB, error) {
 	if cfg.Mock != nil {
@@ -70,14 +86,11 @@ func New(cfg Config) (DB, error) {
 	}
 
 	if len(cfg.PasswordFile) != 0 {
-		if u.User == nil {
-			return nil, fmt.Errorf("--database.password-file requires username in --database.uri")
-		}
-		passwordBytes, err := os.ReadFile(cfg.PasswordFile)
+		updatedURL, err := SetUserPassword(u, cfg.PasswordFile)
 		if err != nil {
-			return nil, fmt.Errorf("Could not read database password file: %v", err)
+			return nil, err
 		}
-		u.User = url.UserPassword(u.User.Username(), string(passwordBytes))
+		u = updatedURL
 	}
 
 	var d DB

pkg/configs/db/db_test.go

@@ -0,0 +1,52 @@
+package db
+
+import (
+	"net/url"
+	"os"
+	"testing"
+)
+
+func TestUserPasswordFromPasswordFile(t *testing.T) {
+
+	tempFile, _ := os.CreateTemp("", "testpassword")
+	defer os.Remove(tempFile.Name())
+	defer tempFile.Close()
+
+	_, writeErr := tempFile.WriteString("   testpassword   ")
+	if writeErr != nil {
+		t.Fatalf("Error writing to temporary file: %v", writeErr)
+	}
+
+	testCases := []struct {
+		testName         string
+		url              string
+		expectedUsername string
+		expectedPassword string
+	}{
+		{
+			testName:         "set username and password correctly from url and password file",
+			url:              "testscheme://[email protected]",
+			expectedUsername: "testuser",
+			expectedPassword: "testpassword",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.testName, func(t *testing.T) {
+			u, _ := url.Parse(tc.url)
+
+			updatedURL, err := SetUserPassword(u, tempFile.Name())
+			if err != nil {
+				t.Errorf("Unexpected error: %v", err)
+			}
+
+			if u.User == nil || updatedURL.User.Username() != tc.expectedUsername {
+				t.Errorf("Username not set as expected. Got: %v, Expected: %v", updatedURL.User.Username(), tc.expectedUsername)
+			}
+
+			if trimmedPassword, _ := updatedURL.User.Password(); trimmedPassword != tc.expectedPassword {
+				t.Errorf("Password not set as expected. Got: %v, Expected: %v", trimmedPassword, tc.expectedPassword)
+			}
+		})
+	}
+}

pkg/configs/db/dbtest/unit.go

@@ -26,3 +26,4 @@ func Setup(t *testing.T) db.DB {
 func Cleanup(t *testing.T, database db.DB) {
 	require.NoError(t, database.Close())
 }
+