Update to use io instead of ioutil

This replaces the usage of ioutil.Discard with io.Discard since ioutil has been deprecated.
grafana · Nov 2, 2023 · bebb4ae · bebb4ae
1 parent c0584af
commit bebb4ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/log/logger.go b/log/logger.go
@@ -3,7 +3,7 @@ package log
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"regexp"
 	"runtime"
 	"strings"
@@ -25,7 +25,7 @@ type Logger struct {
 // be discarded and not logged anywhere.
 func NewNullLogger() *Logger {
 	log := logrus.New()
-	log.SetOutput(ioutil.Discard)
+	log.SetOutput(io.Discard)
 	return New(log, "")
 }
 

diff --git a/tests/logrus_hook.go b/tests/logrus_hook.go
@@ -1,7 +1,7 @@
 package tests
 
 import (
-	"io/ioutil"
+	"io"
 	"strings"
 	"sync"
 	"testing"
@@ -86,7 +86,7 @@ func attachLogCache(tb testing.TB, fl logrus.FieldLogger) *logCache {
 	lc := &logCache{HookedLevels: []logrus.Level{logrus.DebugLevel, logrus.WarnLevel}}
 	logger.SetLevel(logrus.DebugLevel)
 	logger.AddHook(lc)
-	logger.SetOutput(ioutil.Discard)
+	logger.SetOutput(io.Discard)
 
 	return lc
 }