cmd/dex: add logging config and serve logger for different modules.

server/api_test.go

@@ -2,15 +2,23 @@ package server
 
 import (
 	"context"
+	"os"
 	"testing"
 
+	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/api"
 	"github.com/coreos/dex/storage/memory"
 )
 
 // Attempts to create, update and delete a test Password
 func TestPassword(t *testing.T) {
-	s := memory.New()
+	logger := &logrus.Logger{
+		Out:       os.Stderr,
+		Formatter: &logrus.TextFormatter{DisableColors: true},
+		Level:     logrus.DebugLevel,
+	}
+
+	s := memory.New(logger)
 	serv := NewAPI(s)
 
 	ctx := context.Background()

server/server.go

@@ -13,6 +13,7 @@ import (
 	"golang.org/x/crypto/bcrypt"
 	"golang.org/x/net/context"
 
+	"github.com/Sirupsen/logrus"
 	"github.com/gorilla/mux"
 
 	"github.com/coreos/dex/connector"
@@ -57,6 +58,8 @@ type Config struct {
 	EnablePasswordDB bool
 
 	Web WebConfig
+
+	Logger logrus.FieldLogger
 }
 
 // WebConfig holds the server's frontend templates and asset configuration.
@@ -112,6 +115,8 @@ type Server struct {
 	now func() time.Time
 
 	idTokensValidFor time.Duration
+
+	logger logrus.FieldLogger
 }
 
 // NewServer constructs a server from the provided config.
@@ -182,6 +187,7 @@ func newServer(ctx context.Context, c Config, rotationStrategy rotationStrategy)
 		skipApproval:           c.SkipApprovalScreen,
 		now:                    now,
 		templates:              tmpls,
+		logger:                 c.Logger,
 	}
 
 	for _, conn := range c.Connectors {

server/server_test.go

@@ -20,6 +20,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/Sirupsen/logrus"
 	oidc "github.com/coreos/go-oidc"
 	"github.com/kylelemons/godebug/pretty"
 	"golang.org/x/crypto/bcrypt"
@@ -72,19 +73,26 @@ FDWV28nTP9sqbtsmU8Tem2jzMvZ7C/Q0AuDoKELFUpux8shm8wfIhyaPnXUGZoAZ
 Np4vUwMSYV5mopESLWOg3loBxKyLGFtgGKVCjGiQvy6zISQ4fQo=
 -----END RSA PRIVATE KEY-----`)
 
+var logger = &logrus.Logger{
+	Out:       os.Stderr,
+	Formatter: &logrus.TextFormatter{DisableColors: true},
+	Level:     logrus.DebugLevel,
+}
+
 func newTestServer(ctx context.Context, t *testing.T, updateConfig func(c *Config)) (*httptest.Server, *Server) {
 	var server *Server
 	s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		server.ServeHTTP(w, r)
 	}))
+
 	config := Config{
 		Issuer:  s.URL,
-		Storage: memory.New(),
+		Storage: memory.New(logger),
 		Connectors: []Connector{
 			{
 				ID:          "mock",
 				DisplayName: "Mock",
-				Connector:   mock.NewCallbackConnector(),
+				Connector:   mock.NewCallbackConnector(logger),
 			},
 		},
 		Web: WebConfig{
@@ -367,12 +375,17 @@ func TestOAuth2CodeFlow(t *testing.T) {
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 
+			logger := &logrus.Logger{
+				Out:       os.Stderr,
+				Formatter: &logrus.TextFormatter{DisableColors: true},
+				Level:     logrus.DebugLevel,
+			}
 			httpServer, s := newTestServer(ctx, t, func(c *Config) {
 				c.Issuer = c.Issuer + "/non-root-path"
 				c.Now = now
 				c.IDTokensValidFor = idTokensValidFor
 				// Create a new mock callback connector for each test case.
-				conn = mock.NewCallbackConnector().(*mock.Callback)
+				conn = mock.NewCallbackConnector(logger).(*mock.Callback)
 				c.Connectors = []Connector{
 					{
 						ID:          "mock",
@@ -743,7 +756,7 @@ func TestCrossClientScopes(t *testing.T) {
 }
 
 func TestPasswordDB(t *testing.T) {
-	s := memory.New()
+	s := memory.New(logger)
 	conn := newPasswordDB(s)
 
 	pw := "hi"
@@ -840,7 +853,7 @@ func TestKeyCacher(t *testing.T) {
 	tNow := time.Now()
 	now := func() time.Time { return tNow }
 
-	s := memory.New()
+	s := memory.New(logger)
 
 	tests := []struct {
 		before            func()