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

Remove the logrus logger wrapper

Browse Source
This commit is contained in:
Mark Sagi-Kazar
2019-02-22 21:31:46 +01:00
parent aec2edb441
commit 06521ffa49
14 changed files with 34 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
storage/etcd/etcd_test.go
View File

@@ -3,7 +3,6 @@ package etcd
import (
"context"
"fmt"
"github.com/dexidp/dex/pkg/log"
"os"
"runtime"
"strings"
@@ -54,11 +53,11 @@ func cleanDB(c *conn) error {
return nil
}
var logger = log.NewLogrusLogger(&logrus.Logger{
var logger = &logrus.Logger{
Out: os.Stderr,
Formatter: &logrus.TextFormatter{DisableColors: true},
Level: logrus.DebugLevel,
})
}
func TestEtcd(t *testing.T) {
testEtcdEnv := "DEX_ETCD_ENDPOINTS"

5
storage/kubernetes/storage_test.go
View File

@@ -7,7 +7,6 @@ import (
"github.com/sirupsen/logrus"
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
"github.com/dexidp/dex/storage/conformance"
)
@@ -25,11 +24,11 @@ func loadClient(t *testing.T) *client {
if config.KubeConfigFile == "" {
t.Skipf("test environment variable %q not set, skipping", testKubeConfigEnv)
}
logger := log.NewLogrusLogger(&logrus.Logger{
logger := &logrus.Logger{
Out: os.Stderr,
Formatter: &logrus.TextFormatter{DisableColors: true},
Level: logrus.DebugLevel,
})
}
s, err := config.open(logger, true)
if err != nil {
t.Fatal(err)

5
storage/memory/memory_test.go
View File

@@ -6,17 +6,16 @@ import (
"github.com/sirupsen/logrus"
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
"github.com/dexidp/dex/storage/conformance"
)
func TestStorage(t *testing.T) {
logger := log.NewLogrusLogger(&logrus.Logger{
logger := &logrus.Logger{
Out: os.Stderr,
Formatter: &logrus.TextFormatter{DisableColors: true},
Level: logrus.DebugLevel,
})
}
newStorage := func() storage.Storage {
return New(logger)

13
storage/memory/static_test.go
View File

@@ -8,16 +8,15 @@ import (
"github.com/sirupsen/logrus"
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
)
func TestStaticClients(t *testing.T) {
logger := log.NewLogrusLogger(&logrus.Logger{
logger := &logrus.Logger{
Out: os.Stderr,
Formatter: &logrus.TextFormatter{DisableColors: true},
Level: logrus.DebugLevel,
})
}
backing := New(logger)
c1 := storage.Client{ID: "foo", Secret: "foo_secret"}
@@ -100,11 +99,11 @@ func TestStaticClients(t *testing.T) {
}
func TestStaticPasswords(t *testing.T) {
logger := log.NewLogrusLogger(&logrus.Logger{
logger := &logrus.Logger{
Out: os.Stderr,
Formatter: &logrus.TextFormatter{DisableColors: true},
Level: logrus.DebugLevel,
})
}
backing := New(logger)
p1 := storage.Password{Email: "foo@example.com", Username: "foo_secret"}
@@ -212,11 +211,11 @@ func TestStaticPasswords(t *testing.T) {
}
func TestStaticConnectors(t *testing.T) {
logger := log.NewLogrusLogger(&logrus.Logger{
logger := &logrus.Logger{
Out: os.Stderr,
Formatter: &logrus.TextFormatter{DisableColors: true},
Level: logrus.DebugLevel,
})
}
backing := New(logger)
config1 := []byte(`{"issuer": "https://accounts.google.com"}`)

5
storage/sql/config_test.go
View File

@@ -9,7 +9,6 @@ import (
"github.com/sirupsen/logrus"
"github.com/dexidp/dex/pkg/log"
"github.com/dexidp/dex/storage"
"github.com/dexidp/dex/storage/conformance"
)
@@ -44,11 +43,11 @@ func cleanDB(c *conn) error {
return err
}
var logger = log.NewLogrusLogger(&logrus.Logger{
var logger = &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,8 +7,6 @@ import (
sqlite3 "github.com/mattn/go-sqlite3"
"github.com/sirupsen/logrus"
"github.com/dexidp/dex/pkg/log"
)
func TestMigrate(t *testing.T) {
@@ -18,11 +16,11 @@ func TestMigrate(t *testing.T) {
}
defer db.Close()
logger := log.NewLogrusLogger(&logrus.Logger{
logger := &logrus.Logger{
Out: os.Stderr,
Formatter: &logrus.TextFormatter{DisableColors: true},
Level: logrus.DebugLevel,
})
}
errCheck := func(err error) bool {
sqlErr, ok := err.(sqlite3.Error)