gofumpted server/api.go

Signed-off-by: Giovanni Campeol <[email protected]>
dexidp · Jul 16, 2024 · abc5bd8 · abc5bd8
1 parent b6bb85f
commit abc5bd8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 30 deletions.
diff --git a/server/api.go b/server/api.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"slices"
 	"log/slog"
+	"slices"
 
 	"golang.org/x/crypto/bcrypt"
 
@@ -33,9 +33,9 @@ const (
 // NewAPI returns a server which implements the gRPC API interface.
 func NewAPI(s storage.Storage, logger *slog.Logger, version string, additionalFeatures []AdditionalFeature) api.DexServer {
 	return dexAPI{
-		s:       s,
-		logger:  logger.With("component", "api"),
-		version: version,
+		s:                  s,
+		logger:             logger.With("component", "api"),
+		version:            version,
 		additionalFeatures: additionalFeatures,
 	}
 }

diff --git a/server/api_test.go b/server/api_test.go
@@ -5,7 +5,6 @@ import (
 	"io"
 	"log/slog"
 	"net"
-	"os"
 	"strings"
 	"testing"
 	"time"
@@ -494,11 +493,7 @@ func find(item string, items []string) bool {
 }
 
 func TestCreateConnector(t *testing.T) {
-	logger := &logrus.Logger{
-		Out:       os.Stderr,
-		Formatter: &logrus.TextFormatter{DisableColors: true},
-		Level:     logrus.DebugLevel,
-	}
+	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t, []AdditionalFeature{ConnectorsCRUD})
@@ -545,11 +540,7 @@ func TestCreateConnector(t *testing.T) {
 }
 
 func TestUpdateConnector(t *testing.T) {
-	logger := &logrus.Logger{
-		Out:       os.Stderr,
-		Formatter: &logrus.TextFormatter{DisableColors: true},
-		Level:     logrus.DebugLevel,
-	}
+	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t, []AdditionalFeature{ConnectorsCRUD})
@@ -614,11 +605,7 @@ func TestUpdateConnector(t *testing.T) {
 }
 
 func TestDeleteConnector(t *testing.T) {
-	logger := &logrus.Logger{
-		Out:       os.Stderr,
-		Formatter: &logrus.TextFormatter{DisableColors: true},
-		Level:     logrus.DebugLevel,
-	}
+	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t, []AdditionalFeature{ConnectorsCRUD})
@@ -659,11 +646,7 @@ func TestDeleteConnector(t *testing.T) {
 }
 
 func TestListConnectors(t *testing.T) {
-	logger := &logrus.Logger{
-		Out:       os.Stderr,
-		Formatter: &logrus.TextFormatter{DisableColors: true},
-		Level:     logrus.DebugLevel,
-	}
+	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t, []AdditionalFeature{ConnectorsCRUD})
@@ -703,11 +686,7 @@ func TestListConnectors(t *testing.T) {
 }
 
 func TestMissingAdditionalFeature(t *testing.T) {
-	logger := &logrus.Logger{
-		Out:       os.Stderr,
-		Formatter: &logrus.TextFormatter{DisableColors: true},
-		Level:     logrus.DebugLevel,
-	}
+	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t, []AdditionalFeature{})