k-space/dex
Archived
11
0
Fork 0
Code Issues Pull Requests Packages Projects Activity

Add logger interface and stop relying on Logrus directly

Browse Source
This commit is contained in:
Mark Sagi-Kazar
2019-02-22 13:19:23 +01:00
parent ca66289077
commit be581fa7ff
38 changed files with 203 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
storage/sql/config.go
View File

@@ -11,8 +11,8 @@ import (
"github.com/lib/pq"
sqlite3 "github.com/mattn/go-sqlite3"
"github.com/sirupsen/logrus"
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
)
@@ -28,7 +28,7 @@ type SQLite3 struct {
}
// Open creates a new storage implementation backed by SQLite3
func (s *SQLite3) Open(logger logrus.FieldLogger) (storage.Storage, error) {
func (s *SQLite3) Open(logger log.Logger) (storage.Storage, error) {
conn, err := s.open(logger)
if err != nil {
return nil, err
@@ -36,7 +36,7 @@ func (s *SQLite3) Open(logger logrus.FieldLogger) (storage.Storage, error) {
return conn, nil
}
func (s *SQLite3) open(logger logrus.FieldLogger) (*conn, error) {
func (s *SQLite3) open(logger log.Logger) (*conn, error) {
db, err := sql.Open("sqlite3", s.File)
if err != nil {
return nil, err
@@ -99,7 +99,7 @@ type Postgres struct {
}
// Open creates a new storage implementation backed by Postgres.
func (p *Postgres) Open(logger logrus.FieldLogger) (storage.Storage, error) {
func (p *Postgres) Open(logger log.Logger) (storage.Storage, error) {
conn, err := p.open(logger, p.createDataSourceName())
if err != nil {
return nil, err
@@ -179,7 +179,7 @@ func (p *Postgres) createDataSourceName() string {
return strings.Join(parameters, " ")
}
func (p *Postgres) open(logger logrus.FieldLogger, dataSourceName string) (*conn, error) {
func (p *Postgres) open(logger log.Logger, dataSourceName string) (*conn, error) {
db, err := sql.Open("postgres", dataSourceName)
if err != nil {
return nil, err

5
storage/sql/config_test.go
View File

@@ -9,6 +9,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
"github.com/dexidp/dex/storage/conformance"
)
@@ -43,11 +44,11 @@ func cleanDB(c *conn) error {
return err
}
var logger = &logrus.Logger{
var logger = log.NewLogrusLogger(&logrus.Logger{
Out: os.Stderr,
Formatter: &logrus.TextFormatter{DisableColors: true},
Level: logrus.DebugLevel,
}
})
func TestSQLite3(t *testing.T) {
newStorage := func() storage.Storage {

6
storage/sql/migrate_test.go
View File

@@ -7,6 +7,8 @@ import (
sqlite3 "github.com/mattn/go-sqlite3"
"github.com/sirupsen/logrus"
"github.com/dexidp/dex/pkg/log"
)
func TestMigrate(t *testing.T) {
@@ -16,11 +18,11 @@ func TestMigrate(t *testing.T) {
}
defer db.Close()
logger := &logrus.Logger{
logger := log.NewLogrusLogger(&logrus.Logger{
Out: os.Stderr,
Formatter: &logrus.TextFormatter{DisableColors: true},
Level: logrus.DebugLevel,
}
})
errCheck := func(err error) bool {
sqlErr, ok := err.(sqlite3.Error)

5
storage/sql/sql.go
View File

@@ -3,11 +3,10 @@ package sql
import (
"database/sql"
"github.com/dexidp/dex/pkg/log"
"regexp"
"time"
"github.com/sirupsen/logrus"
// import third party drivers
_ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3"
@@ -113,7 +112,7 @@ func (c *conn) translateArgs(args []interface{}) []interface{} {
type conn struct {
db *sql.DB
flavor flavor
logger logrus.FieldLogger
logger log.Logger
alreadyExistsCheck func(err error) bool
}