Remove references to io/ioutil package (#2547)

austinvazquez · web-flow · commit 959861361f1d · 2022-11-07T08:41:12.000-08:00
diff --git a/example/commitpr/main.go b/example/commitpr/main.go
@@ -25,7 +25,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"strings"
@@ -118,7 +117,7 @@ func getFileContent(fileArg string) (targetName string, b []byte, err error) {
 		targetName = files[1]
 	}
 
-	b, err = ioutil.ReadFile(localFile)
+	b, err = os.ReadFile(localFile)
 	return targetName, b, err
 }
 
diff --git a/example/newfilewithappauth/main.go b/example/newfilewithappauth/main.go
@@ -10,9 +10,9 @@ package main
 
 import (
 	"context"
-	"io/ioutil"
 	"log"
 	"net/http"
+	"os"
 	"time"
 
 	"github.com/bradleyfalzon/ghinstallation/v2"
@@ -23,7 +23,7 @@ import (
 func main() {
 	const gitHost = "https://git.api.com"
 
-	privatePem, err := ioutil.ReadFile("path/to/pem")
+	privatePem, err := os.ReadFile("path/to/pem")
 	if err != nil {
 		log.Fatalf("failed to read pem: %v", err)
 	}
diff --git a/github/gen-accessors.go b/github/gen-accessors.go
@@ -21,7 +21,6 @@ import (
 	"go/format"
 	"go/parser"
 	"go/token"
-	"io/ioutil"
 	"log"
 	"os"
 	"sort"
@@ -190,7 +189,7 @@ func (t *templateData) dump() error {
 			return fmt.Errorf("os.Chmod(%q, 0644): %v", filename, err)
 		}
 
-		if err := ioutil.WriteFile(filename, clean, 0444); err != nil {
+		if err := os.WriteFile(filename, clean, 0444); err != nil {
 			return err
 		}
 
diff --git a/github/gen-stringify-test.go b/github/gen-stringify-test.go
@@ -24,7 +24,6 @@ import (
 	"go/format"
 	"go/parser"
 	"go/token"
-	"io/ioutil"
 	"log"
 	"os"
 	"strings"
@@ -356,7 +355,7 @@ func (t *templateData) dump() error {
 		return fmt.Errorf("os.Chmod(%q, 0644): %v", t.filename, err)
 	}
 
-	if err := ioutil.WriteFile(t.filename, clean, 0444); err != nil {
+	if err := os.WriteFile(t.filename, clean, 0444); err != nil {
 		return err
 	}
 
diff --git a/github/git_trees_test.go b/github/git_trees_test.go
@@ -9,7 +9,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 
@@ -106,7 +106,7 @@ func TestGitService_CreateTree(t *testing.T) {
 	}
 
 	mux.HandleFunc("/repos/o/r/git/trees", func(w http.ResponseWriter, r *http.Request) {
-		got, err := ioutil.ReadAll(r.Body)
+		got, err := io.ReadAll(r.Body)
 		if err != nil {
 			t.Fatalf("unable to read body: %v", err)
 		}
@@ -184,7 +184,7 @@ func TestGitService_CreateTree_Content(t *testing.T) {
 	}
 
 	mux.HandleFunc("/repos/o/r/git/trees", func(w http.ResponseWriter, r *http.Request) {
-		got, err := ioutil.ReadAll(r.Body)
+		got, err := io.ReadAll(r.Body)
 		if err != nil {
 			t.Fatalf("unable to read body: %v", err)
 		}
@@ -264,7 +264,7 @@ func TestGitService_CreateTree_Delete(t *testing.T) {
 	}
 
 	mux.HandleFunc("/repos/o/r/git/trees", func(w http.ResponseWriter, r *http.Request) {
-		got, err := ioutil.ReadAll(r.Body)
+		got, err := io.ReadAll(r.Body)
 		if err != nil {
 			t.Fatalf("unable to read body: %v", err)
 		}
diff --git a/github/github.go b/github/github.go
@@ -15,7 +15,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"reflect"
@@ -710,7 +709,7 @@ func (c *Client) BareDo(ctx context.Context, req *http.Request) (*Response, erro
 		// Issue #1022
 		aerr, ok := err.(*AcceptedError)
 		if ok {
-			b, readErr := ioutil.ReadAll(resp.Body)
+			b, readErr := io.ReadAll(resp.Body)
 			if readErr != nil {
 				return response, readErr
 			}
@@ -770,7 +769,7 @@ func (c *Client) checkRateLimitBeforeDo(req *http.Request, rateLimitCategory rat
 			StatusCode: http.StatusForbidden,
 			Request:    req,
 			Header:     make(http.Header),
-			Body:       ioutil.NopCloser(strings.NewReader("")),
+			Body:       io.NopCloser(strings.NewReader("")),
 		}
 		return &RateLimitError{
 			Rate:     rate,
@@ -1032,14 +1031,14 @@ func CheckResponse(r *http.Response) error {
 	}
 
 	errorResponse := &ErrorResponse{Response: r}
-	data, err := ioutil.ReadAll(r.Body)
+	data, err := io.ReadAll(r.Body)
 	if err == nil && data != nil {
 		json.Unmarshal(data, errorResponse)
 	}
 	// Re-populate error response body because GitHub error responses are often
 	// undocumented and inconsistent.
 	// Issue #1136, #540.
-	r.Body = ioutil.NopCloser(bytes.NewBuffer(data))
+	r.Body = io.NopCloser(bytes.NewBuffer(data))
 	switch {
 	case r.StatusCode == http.StatusUnauthorized && strings.HasPrefix(r.Header.Get(headerOTP), "required"):
 		return (*TwoFactorAuthError)(errorResponse)
diff --git a/github/github_test.go b/github/github_test.go
@@ -10,7 +10,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -70,7 +70,7 @@ func setup() (client *Client, mux *http.ServeMux, serverURL string, teardown fun
 // directory, and create the file in that directory. It is the caller's
 // responsibility to remove the directory and its contents when no longer needed.
 func openTestFile(name, content string) (file *os.File, dir string, err error) {
-	dir, err = ioutil.TempDir("", "go-github")
+	dir, err = os.MkdirTemp("", "go-github")
 	if err != nil {
 		return nil, dir, err
 	}
@@ -133,7 +133,7 @@ func testURLParseError(t *testing.T, err error) {
 
 func testBody(t *testing.T, r *http.Request, want string) {
 	t.Helper()
-	b, err := ioutil.ReadAll(r.Body)
+	b, err := io.ReadAll(r.Body)
 	if err != nil {
 		t.Errorf("Error reading request body: %v", err)
 	}
@@ -502,7 +502,7 @@ func TestNewRequest(t *testing.T) {
 	}
 
 	// test that body was JSON encoded
-	body, _ := ioutil.ReadAll(req.Body)
+	body, _ := io.ReadAll(req.Body)
 	if got, want := string(body), outBody; got != want {
 		t.Errorf("NewRequest(%q) Body is %v, want %v", inBody, got, want)
 	}
@@ -617,7 +617,7 @@ func TestNewFormRequest(t *testing.T) {
 	}
 
 	// test that body was form encoded
-	body, _ := ioutil.ReadAll(req.Body)
+	body, _ := io.ReadAll(req.Body)
 	if got, want := string(body), outBody; got != want {
 		t.Errorf("NewFormRequest(%q) Body is %v, want %v", inBody, got, want)
 	}
@@ -1398,7 +1398,7 @@ func TestCheckResponse(t *testing.T) {
 	res := &http.Response{
 		Request:    &http.Request{},
 		StatusCode: http.StatusBadRequest,
-		Body: ioutil.NopCloser(strings.NewReader(`{"message":"m",
+		Body: io.NopCloser(strings.NewReader(`{"message":"m",
 			"errors": [{"resource": "r", "field": "f", "code": "c"}],
 			"block": {"reason": "dmca", "created_at": "2016-03-17T15:39:46Z"}}`)),
 	}
@@ -1427,7 +1427,7 @@ func TestCheckResponse_RateLimit(t *testing.T) {
 		Request:    &http.Request{},
 		StatusCode: http.StatusForbidden,
 		Header:     http.Header{},
-		Body: ioutil.NopCloser(strings.NewReader(`{"message":"m",
+		Body: io.NopCloser(strings.NewReader(`{"message":"m",
 			"documentation_url": "url"}`)),
 	}
 	res.Header.Set(headerRateLimit, "60")
@@ -1454,7 +1454,7 @@ func TestCheckResponse_AbuseRateLimit(t *testing.T) {
 	res := &http.Response{
 		Request:    &http.Request{},
 		StatusCode: http.StatusForbidden,
-		Body: ioutil.NopCloser(strings.NewReader(`{"message":"m",
+		Body: io.NopCloser(strings.NewReader(`{"message":"m",
 			"documentation_url": "docs.github.com/en/rest/overview/resources-in-the-rest-api#abuse-rate-limits"}`)),
 	}
 	err := CheckResponse(res).(*AbuseRateLimitError)
@@ -1847,7 +1847,7 @@ func TestCheckResponse_noBody(t *testing.T) {
 	res := &http.Response{
 		Request:    &http.Request{},
 		StatusCode: http.StatusBadRequest,
-		Body:       ioutil.NopCloser(strings.NewReader("")),
+		Body:       io.NopCloser(strings.NewReader("")),
 	}
 	err := CheckResponse(res).(*ErrorResponse)
 
@@ -1868,7 +1868,7 @@ func TestCheckResponse_unexpectedErrorStructure(t *testing.T) {
 	res := &http.Response{
 		Request:    &http.Request{},
 		StatusCode: http.StatusBadRequest,
-		Body:       ioutil.NopCloser(strings.NewReader(httpBody)),
+		Body:       io.NopCloser(strings.NewReader(httpBody)),
 	}
 	err := CheckResponse(res).(*ErrorResponse)
 
@@ -1884,7 +1884,7 @@ func TestCheckResponse_unexpectedErrorStructure(t *testing.T) {
 	if !errors.Is(err, want) {
 		t.Errorf("Error = %#v, want %#v", err, want)
 	}
-	data, err2 := ioutil.ReadAll(err.Response.Body)
+	data, err2 := io.ReadAll(err.Response.Body)
 	if err2 != nil {
 		t.Fatalf("failed to read response body: %v", err)
 	}
@@ -2373,9 +2373,9 @@ func TestBareDo_returnsOpenBody(t *testing.T) {
 		t.Fatalf("client.BareDo returned error: %v", err)
 	}
 
-	got, err := ioutil.ReadAll(resp.Body)
+	got, err := io.ReadAll(resp.Body)
 	if err != nil {
-		t.Fatalf("ioutil.ReadAll returned error: %v", err)
+		t.Fatalf("io.ReadAll returned error: %v", err)
 	}
 	if string(got) != expectedBody {
 		t.Fatalf("Expected %q, got %q", expectedBody, string(got))
diff --git a/github/messages.go b/github/messages.go
@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"hash"
 	"io"
-	"io/ioutil"
 	"mime"
 	"net/http"
 	"net/url"
@@ -171,7 +170,7 @@ func ValidatePayloadFromBody(contentType string, readable io.Reader, signature s
 	switch contentType {
 	case "application/json":
 		var err error
-		if body, err = ioutil.ReadAll(readable); err != nil {
+		if body, err = io.ReadAll(readable); err != nil {
 			return nil, err
 		}
 
@@ -185,7 +184,7 @@ func ValidatePayloadFromBody(contentType string, readable io.Reader, signature s
 		const payloadFormParam = "payload"
 
 		var err error
-		if body, err = ioutil.ReadAll(readable); err != nil {
+		if body, err = io.ReadAll(readable); err != nil {
 			return nil, err
 		}
 
diff --git a/github/repos_contents_test.go b/github/repos_contents_test.go
@@ -9,7 +9,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"testing"
@@ -146,7 +146,7 @@ func TestRepositoriesService_DownloadContents_Success(t *testing.T) {
 		t.Errorf("Repositories.DownloadContents returned status code %v, want %v", got, want)
 	}
 
-	bytes, err := ioutil.ReadAll(r)
+	bytes, err := io.ReadAll(r)
 	if err != nil {
 		t.Errorf("Error reading response body: %v", err)
 	}
@@ -198,7 +198,7 @@ func TestRepositoriesService_DownloadContents_FailedResponse(t *testing.T) {
 		t.Errorf("Repositories.DownloadContents returned status code %v, want %v", got, want)
 	}
 
-	bytes, err := ioutil.ReadAll(r)
+	bytes, err := io.ReadAll(r)
 	if err != nil {
 		t.Errorf("Error reading response body: %v", err)
 	}
@@ -276,7 +276,7 @@ func TestRepositoriesService_DownloadContentsWithMeta_Success(t *testing.T) {
 		t.Errorf("Repositories.DownloadContentsWithMeta returned status code %v, want %v", got, want)
 	}
 
-	bytes, err := ioutil.ReadAll(r)
+	bytes, err := io.ReadAll(r)
 	if err != nil {
 		t.Errorf("Error reading response body: %v", err)
 	}
@@ -339,7 +339,7 @@ func TestRepositoriesService_DownloadContentsWithMeta_FailedResponse(t *testing.
 		t.Errorf("Repositories.DownloadContentsWithMeta returned status code %v, want %v", got, want)
 	}
 
-	bytes, err := ioutil.ReadAll(r)
+	bytes, err := io.ReadAll(r)
 	if err != nil {
 		t.Errorf("Error reading response body: %v", err)
 	}
diff --git a/github/repos_pages_test.go b/github/repos_pages_test.go
@@ -10,7 +10,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 
@@ -118,7 +118,7 @@ func TestRepositoriesService_UpdatePages_NullCNAME(t *testing.T) {
 	}
 
 	mux.HandleFunc("/repos/o/r/pages", func(w http.ResponseWriter, r *http.Request) {
-		got, err := ioutil.ReadAll(r.Body)
+		got, err := io.ReadAll(r.Body)
 		if err != nil {
 			t.Fatalf("unable to read body: %v", err)
 		}
diff --git a/github/repos_releases_test.go b/github/repos_releases_test.go
@@ -10,7 +10,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"strings"
@@ -442,7 +442,7 @@ func TestRepositoriesService_DownloadReleaseAsset_Stream(t *testing.T) {
 		t.Errorf("Repositories.DownloadReleaseAsset returned error: %v", err)
 	}
 	want := []byte("Hello World")
-	content, err := ioutil.ReadAll(reader)
+	content, err := io.ReadAll(reader)
 	if err != nil {
 		t.Errorf("Repositories.DownloadReleaseAsset returned bad reader: %v", err)
 	}
@@ -498,7 +498,7 @@ func TestRepositoriesService_DownloadReleaseAsset_FollowRedirect(t *testing.T) {
 
 	ctx := context.Background()
 	reader, _, err := client.Repositories.DownloadReleaseAsset(ctx, "o", "r", 1, http.DefaultClient)
-	content, err := ioutil.ReadAll(reader)
+	content, err := io.ReadAll(reader)
 	if err != nil {
 		t.Errorf("Repositories.DownloadReleaseAsset returned error: %v", err)
 	}
diff --git a/github/teams_test.go b/github/teams_test.go
diff --git a/test/integration/repos_test.go b/test/integration/repos_test.go
diff --git a/update-urls/main.go b/update-urls/main.go

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ import (`
`25`	`25`	`"errors"`
`26`	`26`	`"flag"`
`27`	`27`	`"fmt"`
`28`		`- "io/ioutil"`
`29`	`28`	`"log"`
`30`	`29`	`"os"`
`31`	`30`	`"strings"`
`@@ -118,7 +117,7 @@ func getFileContent(fileArg string) (targetName string, b []byte, err error) {`
`118`	`117`	`targetName = files[1]`
`119`	`118`	`}`
`120`	`119`
`121`		`- b, err = ioutil.ReadFile(localFile)`
	`120`	`+ b, err = os.ReadFile(localFile)`
`122`	`121`	`return targetName, b, err`
`123`	`122`	`}`
`124`	`123`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ import (`
`21`	`21`	`"go/format"`
`22`	`22`	`"go/parser"`
`23`	`23`	`"go/token"`
`24`		`- "io/ioutil"`
`25`	`24`	`"log"`
`26`	`25`	`"os"`
`27`	`26`	`"sort"`
`@@ -190,7 +189,7 @@ func (t *templateData) dump() error {`
`190`	`189`	`return fmt.Errorf("os.Chmod(%q, 0644): %v", filename, err)`
`191`	`190`	`}`
`192`	`191`
`193`		`- if err := ioutil.WriteFile(filename, clean, 0444); err != nil {`
	`192`	`+ if err := os.WriteFile(filename, clean, 0444); err != nil {`
`194`	`193`	`return err`
`195`	`194`	`}`
`196`	`195`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ import (`
`24`	`24`	`"go/format"`
`25`	`25`	`"go/parser"`
`26`	`26`	`"go/token"`
`27`		`- "io/ioutil"`
`28`	`27`	`"log"`
`29`	`28`	`"os"`
`30`	`29`	`"strings"`
`@@ -356,7 +355,7 @@ func (t *templateData) dump() error {`
`356`	`355`	`return fmt.Errorf("os.Chmod(%q, 0644): %v", t.filename, err)`
`357`	`356`	`}`
`358`	`357`
`359`		`- if err := ioutil.WriteFile(t.filename, clean, 0444); err != nil {`
	`358`	`+ if err := os.WriteFile(t.filename, clean, 0444); err != nil {`
`360`	`359`	`return err`
`361`	`360`	`}`
`362`	`361`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"bytes"`
`10`	`10`	`"context"`
`11`	`11`	`"fmt"`
`12`		`- "io/ioutil"`
	`12`	`+ "io"`
`13`	`13`	`"net/http"`
`14`	`14`	`"testing"`
`15`	`15`
`@@ -106,7 +106,7 @@ func TestGitService_CreateTree(t *testing.T) {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`mux.HandleFunc("/repos/o/r/git/trees", func(w http.ResponseWriter, r *http.Request) {`
`109`		`- got, err := ioutil.ReadAll(r.Body)`
	`109`	`+ got, err := io.ReadAll(r.Body)`
`110`	`110`	`if err != nil {`
`111`	`111`	`t.Fatalf("unable to read body: %v", err)`
`112`	`112`	`}`
`@@ -184,7 +184,7 @@ func TestGitService_CreateTree_Content(t *testing.T) {`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`mux.HandleFunc("/repos/o/r/git/trees", func(w http.ResponseWriter, r *http.Request) {`
`187`		`- got, err := ioutil.ReadAll(r.Body)`
	`187`	`+ got, err := io.ReadAll(r.Body)`
`188`	`188`	`if err != nil {`
`189`	`189`	`t.Fatalf("unable to read body: %v", err)`
`190`	`190`	`}`
`@@ -264,7 +264,7 @@ func TestGitService_CreateTree_Delete(t *testing.T) {`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`mux.HandleFunc("/repos/o/r/git/trees", func(w http.ResponseWriter, r *http.Request) {`
`267`		`- got, err := ioutil.ReadAll(r.Body)`
	`267`	`+ got, err := io.ReadAll(r.Body)`
`268`	`268`	`if err != nil {`
`269`	`269`	`t.Fatalf("unable to read body: %v", err)`
`270`	`270`	`}`