refactor: simplify tests by using slog.DiscardHandler (#4058)

alexandear · web-flow · commit 9891daa58549 · 2025-04-03T09:56:18.000+02:00
Signed-off-by: Oleksandr Redko &lt;oleksandr.red+github@gmail.com&gt;
diff --git a/connector/atlassiancrowd/atlassiancrowd_test.go b/connector/atlassiancrowd/atlassiancrowd_test.go
@@ -6,7 +6,6 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"io"
 	"log/slog"
 	"net/http"
 	"net/http/httptest"
@@ -150,7 +149,7 @@ type TestServerResponse struct {
 func newTestCrowdConnector(baseURL string) crowdConnector {
 	connector := crowdConnector{}
 	connector.BaseURL = baseURL
-	connector.logger = slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	connector.logger = slog.New(slog.DiscardHandler)
 	return connector
 }
 
diff --git a/connector/authproxy/authproxy_test.go b/connector/authproxy/authproxy_test.go
@@ -1,7 +1,6 @@
 package authproxy
 
 import (
-	"io"
 	"log/slog"
 	"net/http"
 	"reflect"
@@ -23,7 +22,7 @@ const (
 	testUserID            = "1234567890"
 )
 
-var logger = slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+var logger = slog.New(slog.DiscardHandler)
 
 func TestUser(t *testing.T) {
 	config := Config{
diff --git a/connector/github/github_test.go b/connector/github/github_test.go
@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 	"log/slog"
 	"net/http"
 	"net/http/httptest"
@@ -451,7 +450,7 @@ func Test_isPreferredEmailDomain(t *testing.T) {
 }
 
 func Test_Open_PreferredDomainConfig(t *testing.T) {
-	log := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	log := slog.New(slog.DiscardHandler)
 	tests := []struct {
 		preferredEmailDomain string
 		email                string
diff --git a/connector/google/google_test.go b/connector/google/google_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"log/slog"
 	"net/http"
 	"net/http/httptest"
@@ -52,7 +51,7 @@ func testSetup() *httptest.Server {
 }
 
 func newConnector(config *Config) (*googleConnector, error) {
-	log := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	log := slog.New(slog.DiscardHandler)
 	conn, err := config.Open("id", log)
 	if err != nil {
 		return nil, err
diff --git a/connector/ldap/ldap_test.go b/connector/ldap/ldap_test.go
@@ -3,7 +3,6 @@ package ldap
 import (
 	"context"
 	"fmt"
-	"io"
 	"log/slog"
 	"os"
 	"testing"
@@ -567,7 +566,7 @@ func runTests(t *testing.T, connMethod connectionMethod, config *Config, tests [
 	c.BindDN = "cn=admin,dc=example,dc=org"
 	c.BindPW = "admin"
 
-	l := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	l := slog.New(slog.DiscardHandler)
 
 	conn, err := c.openConnector(l)
 	if err != nil {
diff --git a/connector/oauth/oauth_test.go b/connector/oauth/oauth_test.go
@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 	"log/slog"
 	"net/http"
 	"net/http/httptest"
@@ -271,7 +270,7 @@ func newConnector(t *testing.T, serverURL string) *oauthConnector {
 	testConfig.ClaimMapping.EmailKey = "mail"
 	testConfig.ClaimMapping.EmailVerifiedKey = "has_verified_email"
 
-	log := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	log := slog.New(slog.DiscardHandler)
 
 	conn, err := testConfig.Open("id", log)
 	if err != nil {
diff --git a/connector/oidc/oidc_test.go b/connector/oidc/oidc_test.go
@@ -10,7 +10,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 	"log/slog"
 	"net/http"
 	"net/http/httptest"
@@ -834,7 +833,7 @@ func newToken(key *jose.JSONWebKey, claims map[string]interface{}) (string, erro
 }
 
 func newConnector(config Config) (*oidcConnector, error) {
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 	conn, err := config.Open("id", logger)
 	if err != nil {
 		return nil, fmt.Errorf("unable to open: %v", err)
diff --git a/connector/openshift/openshift_test.go b/connector/openshift/openshift_test.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"log/slog"
 	"net/http"
 	"net/http/httptest"
@@ -38,7 +37,7 @@ func TestOpen(t *testing.T) {
 		InsecureCA:   true,
 	}
 
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	oconfig, err := c.Open("id", logger)
 
diff --git a/connector/saml/saml_test.go b/connector/saml/saml_test.go
@@ -5,7 +5,6 @@ import (
 	"encoding/base64"
 	"encoding/pem"
 	"errors"
-	"io"
 	"log/slog"
 	"os"
 	"sort"
@@ -421,7 +420,7 @@ func (r responseTest) run(t *testing.T) {
 		t.Fatalf("parse test time: %v", err)
 	}
 
-	conn, err := c.openConnector(slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{})))
+	conn, err := c.openConnector(slog.New(slog.DiscardHandler))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -455,7 +454,7 @@ func (r responseTest) run(t *testing.T) {
 }
 
 func TestConfigCAData(t *testing.T) {
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 	validPEM, err := os.ReadFile("testdata/ca.crt")
 	if err != nil {
 		t.Fatal(err)
diff --git a/server/api_test.go b/server/api_test.go
@@ -2,7 +2,6 @@ package server
 
 import (
 	"context"
-	"io"
 	"log/slog"
 	"net"
 	"os"
@@ -60,7 +59,7 @@ func newAPI(s storage.Storage, logger *slog.Logger, t *testing.T) *apiClient {
 
 // Attempts to create, update and delete a test Password
 func TestPassword(t *testing.T) {
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t)
@@ -169,7 +168,7 @@ func TestPassword(t *testing.T) {
 
 // Ensures checkCost returns expected values
 func TestCheckCost(t *testing.T) {
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t)
@@ -222,7 +221,7 @@ func TestCheckCost(t *testing.T) {
 
 // Attempts to list and revoke an existing refresh token.
 func TestRefreshToken(t *testing.T) {
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t)
@@ -331,7 +330,7 @@ func TestRefreshToken(t *testing.T) {
 }
 
 func TestUpdateClient(t *testing.T) {
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t)
@@ -497,7 +496,7 @@ func TestCreateConnector(t *testing.T) {
 	os.Setenv("DEX_API_CONNECTORS_CRUD", "true")
 	defer os.Unsetenv("DEX_API_CONNECTORS_CRUD")
 
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t)
@@ -547,7 +546,7 @@ func TestUpdateConnector(t *testing.T) {
 	os.Setenv("DEX_API_CONNECTORS_CRUD", "true")
 	defer os.Unsetenv("DEX_API_CONNECTORS_CRUD")
 
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t)
@@ -615,7 +614,7 @@ func TestDeleteConnector(t *testing.T) {
 	os.Setenv("DEX_API_CONNECTORS_CRUD", "true")
 	defer os.Unsetenv("DEX_API_CONNECTORS_CRUD")
 
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t)
@@ -659,7 +658,7 @@ func TestListConnectors(t *testing.T) {
 	os.Setenv("DEX_API_CONNECTORS_CRUD", "true")
 	defer os.Unsetenv("DEX_API_CONNECTORS_CRUD")
 
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t)
@@ -699,7 +698,7 @@ func TestListConnectors(t *testing.T) {
 }
 
 func TestMissingConnectorsCRUDFeatureFlag(t *testing.T) {
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	s := memory.New(logger)
 	client := newAPI(s, logger, t)
diff --git a/server/rotation_test.go b/server/rotation_test.go
@@ -2,7 +2,6 @@ package server
 
 import (
 	"context"
-	"io"
 	"log/slog"
 	"sort"
 	"testing"
@@ -69,7 +68,7 @@ func TestKeyRotator(t *testing.T) {
 	// Only the last 5 verification keys are expected to be kept around.
 	maxVerificationKeys := 5
 
-	l := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	l := slog.New(slog.DiscardHandler)
 
 	r := &keyRotator{
 		Storage:  memory.New(l),
@@ -101,7 +100,7 @@ func TestKeyRotator(t *testing.T) {
 
 func TestRefreshTokenPolicy(t *testing.T) {
 	lastTime := time.Now()
-	l := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	l := slog.New(slog.DiscardHandler)
 
 	r, err := NewRefreshTokenPolicy(l, true, "1m", "1m", "1m")
 	require.NoError(t, err)
diff --git a/server/server_test.go b/server/server_test.go
@@ -76,7 +76,7 @@ FDWV28nTP9sqbtsmU8Tem2jzMvZ7C/Q0AuDoKELFUpux8shm8wfIhyaPnXUGZoAZ
 Np4vUwMSYV5mopESLWOg3loBxKyLGFtgGKVCjGiQvy6zISQ4fQo=
 -----END RSA PRIVATE KEY-----`)
 
-var logger = slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+var logger = slog.New(slog.DiscardHandler)
 
 func newTestServer(ctx context.Context, t *testing.T, updateConfig func(c *Config)) (*httptest.Server, *Server) {
 	var server *Server
diff --git a/storage/ent/mysql_test.go b/storage/ent/mysql_test.go
@@ -1,7 +1,6 @@
 package ent
 
 import (
-	"io"
 	"log/slog"
 	"os"
 	"strconv"
@@ -42,7 +41,7 @@ func mysqlTestConfig(host string, port uint64) *MySQL {
 }
 
 func newMySQLStorage(host string, port uint64) storage.Storage {
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	cfg := mysqlTestConfig(host, port)
 	s, err := cfg.Open(logger)
diff --git a/storage/ent/postgres_test.go b/storage/ent/postgres_test.go
@@ -1,7 +1,6 @@
 package ent
 
 import (
-	"io"
 	"log/slog"
 	"os"
 	"strconv"
@@ -37,7 +36,7 @@ func postgresTestConfig(host string, port uint64) *Postgres {
 }
 
 func newPostgresStorage(host string, port uint64) storage.Storage {
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	cfg := postgresTestConfig(host, port)
 	s, err := cfg.Open(logger)
diff --git a/storage/ent/sqlite_test.go b/storage/ent/sqlite_test.go
@@ -1,7 +1,6 @@
 package ent
 
 import (
-	"io"
 	"log/slog"
 	"testing"
 
@@ -10,7 +9,7 @@ import (
 )
 
 func newSQLiteStorage() storage.Storage {
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	cfg := SQLite3{File: ":memory:"}
 	s, err := cfg.Open(logger)
diff --git a/storage/etcd/etcd_test.go b/storage/etcd/etcd_test.go
@@ -3,7 +3,6 @@ package etcd
 import (
 	"context"
 	"fmt"
-	"io"
 	"log/slog"
 	"os"
 	"runtime"
@@ -56,7 +55,7 @@ func cleanDB(c *conn) error {
 	return nil
 }
 
-var logger = slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+var logger = slog.New(slog.DiscardHandler)
 
 func TestEtcd(t *testing.T) {
 	testEtcdEnv := "DEX_ETCD_ENDPOINTS"
diff --git a/storage/kubernetes/client_test.go b/storage/kubernetes/client_test.go
@@ -3,7 +3,6 @@ package kubernetes
 import (
 	"hash"
 	"hash/fnv"
-	"io"
 	"log/slog"
 	"net/http"
 	"os"
@@ -53,7 +52,7 @@ func TestOfflineTokenName(t *testing.T) {
 }
 
 func TestInClusterTransport(t *testing.T) {
-	logger := slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{}))
+	logger := slog.New(slog.DiscardHandler)
 
 	user := k8sapi.AuthInfo{Token: "abc"}
 	cli, err := newClient(
diff --git a/storage/kubernetes/storage_test.go b/storage/kubernetes/storage_test.go
diff --git a/storage/memory/memory_test.go b/storage/memory/memory_test.go
diff --git a/storage/memory/static_test.go b/storage/memory/static_test.go
diff --git a/storage/sql/config_test.go b/storage/sql/config_test.go
diff --git a/storage/sql/migrate_test.go b/storage/sql/migrate_test.go
