chore(storage): remove references to ioutil (googleapis#11953)

BrennaEpp · web-flow · commit 9ad50a31c404 · 2025-04-03T17:34:21.000Z
diff --git a/storage/conformance_test.go b/storage/conformance_test.go
@@ -19,7 +19,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"net/url"
 	"os"
 	"strconv"
@@ -230,7 +229,7 @@ func headersAsSlice(m map[string]string) []string {
 func parseFiles(t *testing.T) (googleAccessID, privateKey string, testFiles []*storage_v1_tests.TestFile) {
 	dir := "internal/test/conformance"
 
-	inBytes, err := ioutil.ReadFile(dir + "/service-account")
+	inBytes, err := os.ReadFile(dir + "/service-account")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/storage/example_test.go b/storage/example_test.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"hash/crc32"
 	"io"
-	"io/ioutil"
 	"log"
 	"mime/multipart"
 	"net/http"
@@ -273,7 +272,7 @@ func ExampleObjectIterator_Next() {
 }
 
 func ExampleSignedURL() {
-	pkey, err := ioutil.ReadFile("my-private-key.pem")
+	pkey, err := os.ReadFile("my-private-key.pem")
 	if err != nil {
 		// TODO: handle error.
 	}
@@ -351,7 +350,7 @@ func ExampleObjectHandle_NewReader() {
 	if err != nil {
 		// TODO: handle error.
 	}
-	slurp, err := ioutil.ReadAll(rc)
+	slurp, err := io.ReadAll(rc)
 	rc.Close()
 	if err != nil {
 		// TODO: handle error.
@@ -372,7 +371,7 @@ func ExampleObjectHandle_NewRangeReader() {
 	}
 	defer rc.Close()
 
-	slurp, err := ioutil.ReadAll(rc)
+	slurp, err := io.ReadAll(rc)
 	if err != nil {
 		// TODO: handle error.
 	}
@@ -392,7 +391,7 @@ func ExampleObjectHandle_NewRangeReader_lastNBytes() {
 	}
 	defer rc.Close()
 
-	slurp, err := ioutil.ReadAll(rc)
+	slurp, err := io.ReadAll(rc)
 	if err != nil {
 		// TODO: handle error.
 	}
@@ -412,7 +411,7 @@ func ExampleObjectHandle_NewRangeReader_untilEnd() {
 	}
 	defer rc.Close()
 
-	slurp, err := ioutil.ReadAll(rc)
+	slurp, err := io.ReadAll(rc)
 	if err != nil {
 		// TODO: handle error.
 	}
diff --git a/storage/http_client.go b/storage/http_client.go
@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"hash/crc32"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"net/url"
@@ -1428,7 +1427,7 @@ func readerReopen(ctx context.Context, header http.Header, params *newRangeReade
 			//      https://cloud.google.com/storage/docs/transcoding#range,
 			// thus we have to manually move the body forward by seen bytes.
 			if decompressiveTranscoding(res) && seen > 0 {
-				_, _ = io.CopyN(ioutil.Discard, res.Body, seen)
+				_, _ = io.CopyN(io.Discard, res.Body, seen)
 			}
 
 			// If a generation hasn't been specified, and this is the first response we get, let's record the
diff --git a/storage/mock_test.go b/storage/mock_test.go
@@ -19,7 +19,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"strings"
 	"testing"
@@ -46,7 +45,7 @@ func (t *mockTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	t.gotReq = req
 	t.gotBody = nil
 	if req.Body != nil {
-		bytes, err := ioutil.ReadAll(req.Body)
+		bytes, err := io.ReadAll(req.Body)
 		if err != nil {
 			return nil, err
 		}
@@ -78,5 +77,5 @@ func mockClient(t *testing.T, m *mockTransport, opts ...option.ClientOption) *Cl
 }
 
 func bodyReader(s string) io.ReadCloser {
-	return ioutil.NopCloser(strings.NewReader(s))
+	return io.NopCloser(strings.NewReader(s))
 }
diff --git a/storage/reader_test.go b/storage/reader_test.go
@@ -21,7 +21,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -60,7 +59,7 @@ func TestRangeReader(t *testing.T) {
 				t.Errorf("%d/%d: %v", test.offset, test.length, err)
 				continue
 			}
-			gotb, err := ioutil.ReadAll(r)
+			gotb, err := io.ReadAll(r)
 			if err != nil {
 				t.Errorf("%d/%d: %v", test.offset, test.length, err)
 				continue
@@ -472,7 +471,7 @@ func TestContentEncodingGzipWithReader(t *testing.T) {
 				}
 				defer rd.Close()
 
-				got, err := ioutil.ReadAll(rd)
+				got, err := io.ReadAll(rd)
 				if err != nil {
 					t.Fatal(err)
 				}
@@ -540,7 +539,7 @@ func TestMetadataParsingWithReader(t *testing.T) {
 			t.Fatalf("metadata mismatch diff got vs want: %v", diff)
 		}
 
-		got, err := ioutil.ReadAll(rd)
+		got, err := io.ReadAll(rd)
 		if err != nil {
 			t.Fatal(err)
 		}
diff --git a/storage/retry_test.go b/storage/retry_test.go
@@ -17,7 +17,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -100,7 +100,7 @@ func TestIndefiniteRetries(t *testing.T) {
 			}
 
 			// Consume the body since we can accept this body.
-			ioutil.ReadAll(r.Body)
+			io.ReadAll(r.Body)
 			w.Header().Set("X-Http-Status-Code-Override", "308")
 			return
 
diff --git a/storage/storage_test.go b/storage/storage_test.go
@@ -20,7 +20,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -697,7 +696,7 @@ func TestPathEncodeV4(t *testing.T) {
 }
 
 func dummyKey(kind string) []byte {
-	slurp, err := ioutil.ReadFile(fmt.Sprintf("./internal/test/dummy_%s", kind))
+	slurp, err := os.ReadFile(fmt.Sprintf("./internal/test/dummy_%s", kind))
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -793,7 +792,7 @@ func TestCondition(t *testing.T) {
 	t.Parallel()
 	gotReq := make(chan *http.Request, 1)
 	hc, close := newTestServer(func(w http.ResponseWriter, r *http.Request) {
-		io.Copy(ioutil.Discard, r.Body)
+		io.Copy(io.Discard, r.Body)
 		gotReq <- r
 		w.WriteHeader(200)
 	})
@@ -1441,7 +1440,7 @@ func TestObjectCompose(t *testing.T) {
 	gotURL := make(chan string, 1)
 	gotBody := make(chan []byte, 1)
 	hc, close := newTestServer(func(w http.ResponseWriter, r *http.Request) {
-		body, _ := ioutil.ReadAll(r.Body)
+		body, _ := io.ReadAll(r.Body)
 		gotURL <- r.URL.String()
 		gotBody <- body
 		w.Write([]byte("{}"))
@@ -1640,7 +1639,7 @@ func TestObjectCompose(t *testing.T) {
 func TestEmptyObjectIterator(t *testing.T) {
 	t.Parallel()
 	hClient, close := newTestServer(func(w http.ResponseWriter, r *http.Request) {
-		io.Copy(ioutil.Discard, r.Body)
+		io.Copy(io.Discard, r.Body)
 		fmt.Fprintf(w, "{}")
 	})
 	defer close()
@@ -1661,7 +1660,7 @@ func TestEmptyObjectIterator(t *testing.T) {
 func TestEmptyBucketIterator(t *testing.T) {
 	t.Parallel()
 	hClient, close := newTestServer(func(w http.ResponseWriter, r *http.Request) {
-		io.Copy(ioutil.Discard, r.Body)
+		io.Copy(io.Discard, r.Body)
 		fmt.Fprintf(w, "{}")
 	})
 	defer close()
@@ -1698,7 +1697,7 @@ func TestUserProject(t *testing.T) {
 	ctx := context.Background()
 	gotURL := make(chan *url.URL, 1)
 	hClient, close := newTestServer(func(w http.ResponseWriter, r *http.Request) {
-		io.Copy(ioutil.Discard, r.Body)
+		io.Copy(io.Discard, r.Body)
 		gotURL <- r.URL
 		if strings.Contains(r.URL.String(), "/rewriteTo/") {
 			res := &raw.RewriteResponse{Done: true}
@@ -2202,7 +2201,7 @@ func TestOperationsWithEndpoint(t *testing.T) {
 
 	hClient, closeServer := newTestServer(func(w http.ResponseWriter, r *http.Request) {
 		done := make(chan bool, 1)
-		io.Copy(ioutil.Discard, r.Body)
+		io.Copy(io.Discard, r.Body)
 		fmt.Fprintf(w, "{}")
 		go func() {
 			gotHost <- r.Host
@@ -2308,7 +2307,7 @@ func TestOperationsWithEndpoint(t *testing.T) {
 								return err
 							}
 
-							_, err = io.Copy(ioutil.Discard, rc)
+							_, err = io.Copy(io.Discard, rc)
 							if err != nil {
 								return err
 							}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import (`
`21`	`21`	`"fmt"`
`22`	`22`	`"hash/crc32"`
`23`	`23`	`"io"`
`24`		`- "io/ioutil"`
`25`	`24`	`"log"`
`26`	`25`	`"mime/multipart"`
`27`	`26`	`"net/http"`
`@@ -273,7 +272,7 @@ func ExampleObjectIterator_Next() {`
`273`	`272`	`}`
`274`	`273`
`275`	`274`	`func ExampleSignedURL() {`
`276`		`- pkey, err := ioutil.ReadFile("my-private-key.pem")`
	`275`	`+ pkey, err := os.ReadFile("my-private-key.pem")`
`277`	`276`	`if err != nil {`
`278`	`277`	`// TODO: handle error.`
`279`	`278`	`}`
`@@ -351,7 +350,7 @@ func ExampleObjectHandle_NewReader() {`
`351`	`350`	`if err != nil {`
`352`	`351`	`// TODO: handle error.`
`353`	`352`	`}`
`354`		`- slurp, err := ioutil.ReadAll(rc)`
	`353`	`+ slurp, err := io.ReadAll(rc)`
`355`	`354`	`rc.Close()`
`356`	`355`	`if err != nil {`
`357`	`356`	`// TODO: handle error.`
`@@ -372,7 +371,7 @@ func ExampleObjectHandle_NewRangeReader() {`
`372`	`371`	`}`
`373`	`372`	`defer rc.Close()`
`374`	`373`
`375`		`- slurp, err := ioutil.ReadAll(rc)`
	`374`	`+ slurp, err := io.ReadAll(rc)`
`376`	`375`	`if err != nil {`
`377`	`376`	`// TODO: handle error.`
`378`	`377`	`}`
`@@ -392,7 +391,7 @@ func ExampleObjectHandle_NewRangeReader_lastNBytes() {`
`392`	`391`	`}`
`393`	`392`	`defer rc.Close()`
`394`	`393`
`395`		`- slurp, err := ioutil.ReadAll(rc)`
	`394`	`+ slurp, err := io.ReadAll(rc)`
`396`	`395`	`if err != nil {`
`397`	`396`	`// TODO: handle error.`
`398`	`397`	`}`
`@@ -412,7 +411,7 @@ func ExampleObjectHandle_NewRangeReader_untilEnd() {`
`412`	`411`	`}`
`413`	`412`	`defer rc.Close()`
`414`	`413`
`415`		`- slurp, err := ioutil.ReadAll(rc)`
	`414`	`+ slurp, err := io.ReadAll(rc)`
`416`	`415`	`if err != nil {`
`417`	`416`	`// TODO: handle error.`
`418`	`417`	`}`