Remove uses of deprecated io/ioutil library

Author: ncw

chunk.go

@@ -3,7 +3,6 @@ package gofakes3
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 )
 
 type chunkedReader struct {
@@ -42,7 +41,7 @@ func (r *chunkedReader) Read(p []byte) (n int, err error) {
 				r.notFirstChunk = true
 			} else {
 				// skip last chunk's b"\r\n"
-				_, err = io.CopyN(ioutil.Discard, r.inner, 2)
+				_, err = io.CopyN(io.Discard, r.inner, 2)
 				if err != nil {
 					return n, err
 				}
@@ -54,7 +53,7 @@ func (r *chunkedReader) Read(p []byte) (n int, err error) {
 				return n, err
 			}
 			r.chunkRemain = chunkSize
-			_, err = io.CopyN(ioutil.Discard, r.inner, 16+64+2) // "chunk-signature=" + sizeOfHash + "\r\n"
+			_, err = io.CopyN(io.Discard, r.inner, 16+64+2) // "chunk-signature=" + sizeOfHash + "\r\n"
 			if err != nil {
 				return n, err
 			}

chunk_test.go

@@ -3,7 +3,6 @@ package gofakes3
 import (
 	"errors"
 	"io"
-	"io/ioutil"
 	"strings"
 	"testing"
 
@@ -30,7 +29,7 @@ func TestChunkedUploadSuccess(t *testing.T) {
 
 	inner := strings.NewReader(payload)
 	chunkedReader := newChunkedReader(inner)
-	buf, err := ioutil.ReadAll(chunkedReader)
+	buf, err := io.ReadAll(chunkedReader)
 	assert.Equal(t, nil, err)
 	assert.Equal(t, string(buf), strings.Repeat("a", 65536+1024))
 }
@@ -43,23 +42,23 @@ func (errReader) Read(p []byte) (n int, err error) {
 
 func TestChunkedUploadFail(t *testing.T) {
 	chunkedReader := newChunkedReader(errReader{})
-	buf, err := ioutil.ReadAll(chunkedReader)
+	buf, err := io.ReadAll(chunkedReader)
 	assert.Equal(t, errors.New("err"), err)
 	assert.Equal(t, "", string(buf))
 
 	chunkedReader = newChunkedReader(io.MultiReader(
 		strings.NewReader("10000;chunk-signature=ad80c730a21e5b8d04586a2213dd63b9a0e99e0e2307b0ade35a65485a288648\r\n"),
 		errReader{},
 	))
-	buf, err = ioutil.ReadAll(chunkedReader)
+	buf, err = io.ReadAll(chunkedReader)
 	assert.Equal(t, errors.New("err"), err)
 	assert.Equal(t, "", string(buf))
 
 	chunkedReader = newChunkedReader(io.MultiReader(
 		strings.NewReader("incorrect_data"),
 		errReader{},
 	))
-	buf, err = ioutil.ReadAll(chunkedReader)
+	buf, err = io.ReadAll(chunkedReader)
 	assert.Equal(t, errors.New("expected integer"), err)
 	assert.Equal(t, "", string(buf))
 
@@ -69,7 +68,7 @@ func TestChunkedUploadFail(t *testing.T) {
 		strings.NewReader(payload),
 		errReader{},
 	))
-	buf, err = ioutil.ReadAll(chunkedReader)
+	buf, err = io.ReadAll(chunkedReader)
 	assert.Equal(t, errors.New("err"), err)
 	assert.Equal(t, strings.Repeat("a", 200), string(buf))
 

gofakes3.go

@@ -6,7 +6,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math"
 	"net/http"
 	"net/textproto"
@@ -1121,7 +1120,7 @@ func (g *GoFakeS3) xmlEncoder(w http.ResponseWriter) *xml.Encoder {
 }
 
 func (g *GoFakeS3) xmlDecodeBody(rdr io.ReadCloser, into interface{}) (err error) {
-	body, err := ioutil.ReadAll(rdr)
+	body, err := io.ReadAll(rdr)
 	defer CheckClose(rdr, &err)
 	if err != nil {
 		return err

gofakes3_test.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"mime/multipart"
 	"net/http"
 	"net/http/httputil"
@@ -402,7 +401,7 @@ func TestCopyObject(t *testing.T) {
 			t.Error(err)
 		}
 	}()
-	data, err := ioutil.ReadAll(obj.Contents)
+	data, err := io.ReadAll(obj.Contents)
 	ts.OK(err)
 
 	if string(data) != "content" {
@@ -449,7 +448,7 @@ func TestCopyObjectWithSpecialChars(t *testing.T) {
 	if err != nil {
 		t.Fatalf("object not found with key %v", srcKey)
 	}
-	objContent, err := ioutil.ReadAll(obj.Body)
+	objContent, err := io.ReadAll(obj.Body)
 	ts.OK(err)
 	if !bytes.Equal([]byte(content), objContent) {
 		ts.Fatalf("object contents are different %v!=%v", content, objContent)
@@ -617,7 +616,7 @@ func TestGetObjectRange(t *testing.T) {
 				}
 			}()
 
-			out, err := ioutil.ReadAll(obj.Body)
+			out, err := io.ReadAll(obj.Body)
 			ts.OK(err)
 			if !bytes.Equal(expected, out) {
 				ts.Fatal("range failed", hdr, err)
@@ -943,7 +942,7 @@ func TestObjectVersions(t *testing.T) {
 				ts.Error(err)
 			}
 		}()
-		bts, err := ioutil.ReadAll(out.Body)
+		bts, err := io.ReadAll(out.Body)
 		ts.OK(err)
 		if !bytes.Equal(bts, contents) {
 			ts.Fatal("body mismatch. found:", string(bts), "expected:", string(contents))

init_internal_test.go

@@ -4,7 +4,7 @@ package gofakes3
 // tests that use struct internals, etc go in this package.
 
 import (
-	"io/ioutil"
+	"io"
 	"log"
 	"testing"
 )
@@ -32,5 +32,5 @@ func (t TT) OKAll(vs ...interface{}) {
 func init() {
 	// Tests that may cause log output that merits inspection belong in
 	// gofakes3_test.
-	log.SetOutput(ioutil.Discard)
+	log.SetOutput(io.Discard)
 }

init_test.go

@@ -15,7 +15,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -75,7 +74,7 @@ func runTestMain(m *testing.M) (err error) {
 	var logOutput *os.File
 
 	if logFile == "" {
-		logOutput, err = ioutil.TempFile("", "gofakes3-*.log")
+		logOutput, err = os.CreateTemp("", "gofakes3-*.log")
 	} else {
 		logOutput, err = os.Create(logFile)
 	}
@@ -267,7 +266,7 @@ func (ts *testServer) backendGetString(bucket, key string, rnge *gofakes3.Object
 			ts.Error(err)
 		}
 	}()
-	data, err := ioutil.ReadAll(obj.Contents)
+	data, err := io.ReadAll(obj.Contents)
 	ts.OK(err)
 
 	return string(data)
@@ -818,7 +817,7 @@ func readBody(tt gofakes3.TT, body interface{}) []byte {
 	case []byte:
 		return body
 	case io.Reader:
-		out, err := ioutil.ReadAll(body)
+		out, err := io.ReadAll(body)
 		tt.OK(err)
 		return out
 	default:

internal/s3assumer/s300001_get_version_after_versioning_suspended.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
@@ -82,7 +81,7 @@ func (t *S300001GetVersionAfterVersioningSuspended) Run(ctx *Context) error {
 				err = closeErr
 			}
 		}()
-		return ioutil.ReadAll(rdr)
+		return io.ReadAll(rdr)
 	}
 
 	for ver, body := range versions {

util.go

@@ -2,7 +2,6 @@ package gofakes3
 
 import (
 	"io"
-	"io/ioutil"
 	"strconv"
 )
 
@@ -27,7 +26,7 @@ func parseClampedInt(in string, defaultValue, min, max int64) (int64, error) {
 	return v, nil
 }
 
-// ReadAll is a fakeS3-centric replacement for ioutil.ReadAll(), for use when
+// ReadAll is a fakeS3-centric replacement for io.ReadAll(), for use when
 // the size of the result is known ahead of time. It is considerably faster to
 // preallocate the entire slice than to allow growslice to be triggered
 // repeatedly, especially with larger buffers.
@@ -48,7 +47,7 @@ func ReadAll(r io.Reader, size int64) (b []byte, err error) {
 		return nil, ErrIncompleteBody
 	}
 
-	if extra, err := ioutil.ReadAll(r); err != nil {
+	if extra, err := io.ReadAll(r); err != nil {
 		return nil, err
 	} else if len(extra) > 0 {
 		return nil, ErrIncompleteBody