remove deprecated ioutil in load

commit_hash:70c948e7a85febf8f97cc9d55f57561b704452d4

Author: kositsyn-pa

cli/cli.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"os/signal"
@@ -221,7 +221,7 @@ func readConfig(args []string) *CliConfig {
 	log.Info("Pandora version", zap.String("version", Version))
 	if useStdinConfig {
 		v.SetConfigType("yaml")
-		configBuffer, err := ioutil.ReadAll(bufio.NewReader(os.Stdin))
+		configBuffer, err := io.ReadAll(bufio.NewReader(os.Stdin))
 		if err != nil {
 			log.Fatal("Cannot read from standard input", zap.Error(err))
 		}

components/guns/http/base.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/http/httptrace"
@@ -244,7 +243,7 @@ func (b *BaseGun) Shoot(ammo Ammo) {
 	sample.SetProtoCode(res.StatusCode)
 	defer res.Body.Close()
 	// TODO: measure body read time
-	_, err = io.Copy(ioutil.Discard, res.Body) // Buffers are pooled for ioutil.Discard
+	_, err = io.Copy(io.Discard, res.Body) // Buffers are pooled for io.Discard
 	if err != nil {
 		b.Log.Warn("Body read fail", zap.Error(err))
 		return
@@ -260,7 +259,7 @@ func (b *BaseGun) Close() error {
 
 func (b *BaseGun) verboseLogging(res *http.Response) {
 	if res.Request.Body != nil {
-		reqBody, err := ioutil.ReadAll(res.Request.Body)
+		reqBody, err := io.ReadAll(res.Request.Body)
 		if err != nil {
 			b.Log.Debug("Body read failed for verbose logging of Request")
 		} else {
@@ -275,7 +274,7 @@ func (b *BaseGun) verboseLogging(res *http.Response) {
 	)
 
 	if res.Body != nil {
-		respBody, err := ioutil.ReadAll(res.Body)
+		respBody, err := io.ReadAll(res.Body)
 		if err != nil {
 			b.Log.Debug("Body read failed for verbose logging of Response")
 		} else {
@@ -328,8 +327,8 @@ func autotag(depth int, URL *url.URL) string {
 
 func GetBody(req *http.Request) []byte {
 	if req.Body != nil && req.Body != http.NoBody {
-		bodyBytes, _ := ioutil.ReadAll(req.Body)
-		req.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBytes))
+		bodyBytes, _ := io.ReadAll(req.Body)
+		req.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
 		return bodyBytes
 	}
 

components/guns/http/base_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -160,7 +159,7 @@ func (s *BaseGunSuite) Test_Shoot() {
 		am.On("Request").Return(req, sample).Maybe()
 		res = &http.Response{
 			StatusCode: http.StatusNotFound,
-			Body:       ioutil.NopCloser(body),
+			Body:       io.NopCloser(body),
 			Request:    req,
 		}
 		s.base.Shoot(am)
@@ -170,15 +169,15 @@ func (s *BaseGunSuite) Test_Shoot() {
 
 	s.Run("Do ok", func() {
 		beforeEachDoOk := func() {
-			body = ioutil.NopCloser(strings.NewReader("aaaaaaa"))
+			body = io.NopCloser(strings.NewReader("aaaaaaa"))
 			s.base.AnswLog = answlog.NewNop()
 			s.base.Client = &testDecoratedClient{
 				before: func(doReq *http.Request) {
 					s.Require().Equal(req, doReq)
 				},
 				returnRes: &http.Response{
 					StatusCode: http.StatusNotFound,
-					Body:       ioutil.NopCloser(body),
+					Body:       io.NopCloser(body),
 					Request:    req,
 				},
 			}

core/coretest/sink.go

@@ -2,7 +2,6 @@ package coretest
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -13,7 +12,7 @@ import (
 )
 
 func AssertSinkEqualStdStream(t *testing.T, expectedPtr **os.File, getSink func() core.DataSink) {
-	temp, err := ioutil.TempFile("", "")
+	temp, err := os.CreateTemp("", "")
 	require.NoError(t, err)
 
 	backup := *expectedPtr
@@ -33,7 +32,7 @@ func AssertSinkEqualStdStream(t *testing.T, expectedPtr **os.File, getSink func(
 	require.NoError(t, err)
 
 	_, _ = temp.Seek(0, io.SeekStart)
-	data, _ := ioutil.ReadAll(temp)
+	data, _ := io.ReadAll(temp)
 	assert.Equal(t, testdata, string(data))
 }
 

core/coretest/source.go

@@ -2,7 +2,6 @@ package coretest
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -14,7 +13,7 @@ import (
 )
 
 func AssertSourceEqualStdStream(t *testing.T, expectedPtr **os.File, getSource func() core.DataSource) {
-	temp, err := ioutil.TempFile("", "")
+	temp, err := os.CreateTemp("", "")
 	require.NoError(t, err)
 
 	backup := *expectedPtr
@@ -33,7 +32,7 @@ func AssertSourceEqualStdStream(t *testing.T, expectedPtr **os.File, getSource f
 	require.NoError(t, err, "std stream should not be closed")
 
 	_, _ = temp.Seek(0, io.SeekStart)
-	data, _ := ioutil.ReadAll(temp)
+	data, _ := io.ReadAll(temp)
 	assert.Equal(t, testdata, string(data))
 }
 

core/datasource/std.go

@@ -3,7 +3,6 @@ package datasource
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"strings"
 
 	"github.com/yandex/pandora/core"
@@ -24,7 +23,7 @@ func (b buffer) OpenSource() (wc io.ReadCloser, err error) {
 }
 
 // NewReader returns dummy core.DataSource that returns it on OpenSource call, wrapping it
-// ioutil.NopCloser if r is not io.Closer.
+// io.NopCloser if r is not io.Closer.
 // NOTE(skipor): such wrapping hides Seek and other methods that can be used.
 func NewReader(r io.Reader) core.DataSource {
 	return &readerSource{r}
@@ -46,7 +45,7 @@ func (r *readerSource) OpenSource() (rc io.ReadCloser, err error) {
 			ioutil2.NopCloser
 		}{ReadSeeker: rs}, nil
 	}
-	return ioutil.NopCloser(r.source), nil
+	return io.NopCloser(r.source), nil
 }
 
 func NewString(s string) core.DataSource {

lib/confutil/property_var_resolver_test.go

@@ -1,7 +1,6 @@
 package confutil
 
 import (
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -12,7 +11,7 @@ func TestPropertyTokenResolver(t *testing.T) {
 	fileContent := []byte(`name=John Doe
 age=25
 email=johndoe@example.com`)
-	tmpFile, err := ioutil.TempFile("", "testfile*.txt")
+	tmpFile, err := os.CreateTemp("", "testfile*.txt")
 	assert.NoError(t, err)
 	defer os.Remove(tmpFile.Name())
 	defer tmpFile.Close()

lib/testutil/afero.go

@@ -2,15 +2,14 @@ package testutil
 
 import (
 	"io"
-	"io/ioutil"
 
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func ReadString(t TestingT, r io.Reader) string {
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	require.NoError(t, err)
 	return string(data)
 }