refactor: fix deprecated for ioutil

io/ringbuffer_test.go

@@ -3,7 +3,6 @@ package io
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"strconv"
 	"strings"
 	"testing"
@@ -449,7 +448,7 @@ func TestRingBufferWriteRead(t *testing.T) {
 				t.Errorf("expect %v, got %v", e, a)
 			}
 
-			actual, err := ioutil.ReadAll(ringBuffer)
+			actual, err := io.ReadAll(ringBuffer)
 			if err != nil {
 				t.Errorf("unexpected error, %v", err)
 				return

middleware/logging_test.go

@@ -2,7 +2,7 @@ package middleware_test
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"testing"
 
 	"github.com/aws/smithy-go/logging"
@@ -26,7 +26,7 @@ func TestGetLogger(t *testing.T) {
 		t.Fatal("expect GetLogger to fallback to Nop")
 	}
 
-	standardLogger := logging.NewStandardLogger(ioutil.Discard)
+	standardLogger := logging.NewStandardLogger(io.Discard)
 	ctx := middleware.SetLogger(context.Background(), standardLogger)
 
 	if logger := middleware.GetLogger(ctx); logger == nil {

private/protocol/middleware_capture_request_test.go

@@ -2,15 +2,15 @@ package protocol
 
 import (
 	"context"
-	"github.com/aws/smithy-go/middleware"
-	smithytesting "github.com/aws/smithy-go/testing"
-	smithyhttp "github.com/aws/smithy-go/transport/http"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
 	"testing"
+
+	"github.com/aws/smithy-go/middleware"
+	smithytesting "github.com/aws/smithy-go/testing"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
 // TestAddCaptureRequestMiddleware tests AddCaptureRequestMiddleware
@@ -45,7 +45,7 @@ func TestAddCaptureRequestMiddleware(t *testing.T) {
 					Path:    "test/path",
 					RawPath: "test/path",
 				},
-				Body: ioutil.NopCloser(strings.NewReader("hello world.")),
+				Body: io.NopCloser(strings.NewReader("hello world.")),
 			},
 			ExpectQuery: []smithytesting.QueryItem{
 				{
@@ -95,11 +95,11 @@ func TestAddCaptureRequestMiddleware(t *testing.T) {
 				t.Errorf("expect %v path, got %v", e, a)
 			}
 			if c.ExpectRequest.Body != nil {
-				expect, err := ioutil.ReadAll(c.ExpectRequest.Body)
+				expect, err := io.ReadAll(c.ExpectRequest.Body)
 				if capturedRequest.Body == nil {
 					t.Errorf("Expect request stream %v captured, get nil", string(expect))
 				}
-				actual, err := ioutil.ReadAll(capturedRequest.Body)
+				actual, err := io.ReadAll(capturedRequest.Body)
 				if err != nil {
 					t.Errorf("unable to read captured request body, %v", err)
 				}

testing/bytes.go

@@ -5,7 +5,6 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
-	"io/ioutil"
 )
 
 // Enumeration values for supported compress Algorithms.
@@ -25,7 +24,7 @@ func CompareReaderEmpty(r io.Reader) error {
 	if r == nil {
 		return nil
 	}
-	b, err := ioutil.ReadAll(r)
+	b, err := io.ReadAll(r)
 	if err != nil && err != io.EOF {
 		return fmt.Errorf("unable to read from reader, %v", err)
 	}
@@ -41,7 +40,7 @@ func CompareReaderBytes(r io.Reader, expect []byte) error {
 	if r == nil {
 		return fmt.Errorf("missing body")
 	}
-	actual, err := ioutil.ReadAll(r)
+	actual, err := io.ReadAll(r)
 	if err != nil {
 		return fmt.Errorf("unable to read, %v", err)
 	}
@@ -60,7 +59,7 @@ func CompareJSONReaderBytes(r io.Reader, expect []byte) error {
 	if r == nil {
 		return fmt.Errorf("missing body")
 	}
-	actual, err := ioutil.ReadAll(r)
+	actual, err := io.ReadAll(r)
 	if err != nil {
 		return fmt.Errorf("unable to read, %v", err)
 	}
@@ -77,7 +76,7 @@ func CompareXMLReaderBytes(r io.Reader, expect []byte) error {
 		return fmt.Errorf("missing body")
 	}
 
-	actual, err := ioutil.ReadAll(r)
+	actual, err := io.ReadAll(r)
 	if err != nil {
 		return err
 	}
@@ -95,7 +94,7 @@ func CompareURLFormReaderBytes(r io.Reader, expect []byte) error {
 	if r == nil {
 		return fmt.Errorf("missing body")
 	}
-	actual, err := ioutil.ReadAll(r)
+	actual, err := io.ReadAll(r)
 	if err != nil {
 		return fmt.Errorf("unable to read, %v", err)
 	}

testing/struct_test.go

@@ -3,7 +3,6 @@ package testing
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"math"
 	"strings"
 	"testing"
@@ -83,7 +82,7 @@ func TestCompareValues(t *testing.T) {
 				Foo io.Reader
 				Bar int
 			}{
-				Foo: ioutil.NopCloser(strings.NewReader("abc123")),
+				Foo: io.NopCloser(strings.NewReader("abc123")),
 				Bar: 123,
 			},
 		},
@@ -99,7 +98,7 @@ func TestCompareValues(t *testing.T) {
 				Foo io.Reader
 				Bar int
 			}{
-				Foo: ioutil.NopCloser(strings.NewReader("123abc")),
+				Foo: io.NopCloser(strings.NewReader("123abc")),
 				Bar: 123,
 			},
 			ExpectErr: "<root>.Foo: bytes do not match",

transport/http/middleware_close_response_body.go

@@ -2,10 +2,10 @@ package http
 
 import (
 	"context"
+	"io"
+
 	"github.com/aws/smithy-go/logging"
 	"github.com/aws/smithy-go/middleware"
-	"io"
-	"io/ioutil"
 )
 
 // AddErrorCloseResponseBodyMiddleware adds the middleware to automatically
@@ -30,7 +30,7 @@ func (m *errorCloseResponseBodyMiddleware) HandleDeserialize(
 	if err != nil {
 		if resp, ok := out.RawResponse.(*Response); ok && resp != nil && resp.Body != nil {
 			// Consume the full body to prevent TCP connection resets on some platforms
-			_, _ = io.Copy(ioutil.Discard, resp.Body)
+			_, _ = io.Copy(io.Discard, resp.Body)
 			// Do not validate that the response closes successfully.
 			resp.Body.Close()
 		}
@@ -64,7 +64,7 @@ func (m *closeResponseBody) HandleDeserialize(
 
 	if resp, ok := out.RawResponse.(*Response); ok {
 		// Consume the full body to prevent TCP connection resets on some platforms
-		_, copyErr := io.Copy(ioutil.Discard, resp.Body)
+		_, copyErr := io.Copy(io.Discard, resp.Body)
 		if copyErr != nil {
 			middleware.GetLogger(ctx).Logf(logging.Warn, "failed to discard remaining HTTP response body, this may affect connection reuse")
 		}

transport/http/middleware_http_logging_test.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"testing"
@@ -49,7 +48,7 @@ func TestRequestResponseLogger(t *testing.T) {
 					},
 				},
 			},
-			InputBody: ioutil.NopCloser(bytes.NewReader([]byte(`this is the body`))),
+			InputBody: io.NopCloser(bytes.NewReader([]byte(`this is the body`))),
 			ExpectedLog: "Request\n" +
 				"GET /foo HTTP/1.1\r\n" +
 				"Host: example.amazonaws.com\r\n" +
@@ -75,7 +74,7 @@ func TestRequestResponseLogger(t *testing.T) {
 					ContentLength: 16,
 				},
 			},
-			InputBody: ioutil.NopCloser(bytes.NewReader([]byte(`this is the body`))),
+			InputBody: io.NopCloser(bytes.NewReader([]byte(`this is the body`))),
 			ExpectedLog: "Request\n" +
 				"GET /foo HTTP/1.1\r\n" +
 				"Host: example.amazonaws.com\r\n" +
@@ -98,7 +97,7 @@ func TestRequestResponseLogger(t *testing.T) {
 					Header: map[string][]string{
 						"Foo": {"Bar"},
 					},
-					Body: ioutil.NopCloser(bytes.NewReader([]byte(`this is the body`))),
+					Body: io.NopCloser(bytes.NewReader([]byte(`this is the body`))),
 				},
 			},
 			ExpectedLog: "Response\n" +
@@ -119,7 +118,7 @@ func TestRequestResponseLogger(t *testing.T) {
 					Header: map[string][]string{
 						"Foo": {"Bar"},
 					},
-					Body: ioutil.NopCloser(bytes.NewReader([]byte(`this is the body`))),
+					Body: io.NopCloser(bytes.NewReader([]byte(`this is the body`))),
 				},
 			},
 			ExpectedLog: "Response\n" +

transport/http/request.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
@@ -167,15 +166,15 @@ func (r *Request) Build(ctx context.Context) *http.Request {
 
 	switch stream := r.stream.(type) {
 	case *io.PipeReader:
-		req.Body = ioutil.NopCloser(stream)
+		req.Body = io.NopCloser(stream)
 		req.ContentLength = -1
 	default:
 		// HTTP Client Request must only have a non-nil body if the
 		// ContentLength is explicitly unknown (-1) or non-zero. The HTTP
 		// Client will interpret a non-nil body and ContentLength 0 as
 		// "unknown". This is unwanted behavior.
 		if req.ContentLength != 0 && r.stream != nil {
-			req.Body = iointernal.NewSafeReadCloser(ioutil.NopCloser(stream))
+			req.Body = iointernal.NewSafeReadCloser(io.NopCloser(stream))
 		}
 	}