refactor: move from io/ioutil to io and os package (#17109)

The io/ioutil package has been deprecated as of Go 1.16, see
https://golang.org/doc/go1.16#ioutil. This commit replaces the existing
io/ioutil functions with their new definitions in io and os packages.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>

2 files changed, 6 insertions, 8 deletions

diff --git a/modules/lfs/http_client_test.go b/modules/lfs/http_client_test.go
index 589773e45b..5b514a1230 100644
--- a/modules/lfs/http_client_test.go
+++ b/modules/lfs/http_client_test.go
@@ -8,7 +8,6 @@ import (
 	"bytes"
 	"context"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"strings"
 	"testing"
@@ -32,7 +31,7 @@ func (a *DummyTransferAdapter) Name() string {
 }
 
 func (a *DummyTransferAdapter) Download(ctx context.Context, l *Link) (io.ReadCloser, error) {
-	return ioutil.NopCloser(bytes.NewBufferString("dummy")), nil
+	return io.NopCloser(bytes.NewBufferString("dummy")), nil
 }
 
 func (a *DummyTransferAdapter) Upload(ctx context.Context, l *Link, p Pointer, r io.Reader) error {
@@ -50,7 +49,7 @@ func lfsTestRoundtripHandler(req *http.Request) *http.Response {
 	if strings.Contains(url, "status-not-ok") {
 		return &http.Response{StatusCode: http.StatusBadRequest}
 	} else if strings.Contains(url, "invalid-json-response") {
-		return &http.Response{StatusCode: http.StatusOK, Body: ioutil.NopCloser(bytes.NewBufferString("invalid json"))}
+		return &http.Response{StatusCode: http.StatusOK, Body: io.NopCloser(bytes.NewBufferString("invalid json"))}
 	} else if strings.Contains(url, "valid-batch-request-download") {
 		batchResponse = &BatchResponse{
 			Transfer: "dummy",
@@ -149,7 +148,7 @@ func lfsTestRoundtripHandler(req *http.Request) *http.Response {
 	payload := new(bytes.Buffer)
 	json.NewEncoder(payload).Encode(batchResponse)
 
-	return &http.Response{StatusCode: http.StatusOK, Body: ioutil.NopCloser(payload)}
+	return &http.Response{StatusCode: http.StatusOK, Body: io.NopCloser(payload)}
 }
 
 func TestHTTPClientDownload(t *testing.T) {
@@ -350,7 +349,7 @@ func TestHTTPClientUpload(t *testing.T) {
 		client.transfers["dummy"] = dummy
 
 		err := client.Upload(context.Background(), []Pointer{p}, func(p Pointer, objectError error) (io.ReadCloser, error) {
-			return ioutil.NopCloser(new(bytes.Buffer)), objectError
+			return io.NopCloser(new(bytes.Buffer)), objectError
 		})
 		if len(c.expectederror) > 0 {
 			assert.True(t, strings.Contains(err.Error(), c.expectederror), "case %d: '%s' should contain '%s'", n, err.Error(), c.expectederror)
diff --git a/modules/lfs/transferadapter_test.go b/modules/lfs/transferadapter_test.go
index 9192b486ed..b26d516c68 100644
--- a/modules/lfs/transferadapter_test.go
+++ b/modules/lfs/transferadapter_test.go
@@ -8,7 +8,6 @@ import (
 	"bytes"
 	"context"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"strings"
 	"testing"
@@ -35,7 +34,7 @@ func TestBasicTransferAdapter(t *testing.T) {
 		if strings.Contains(url, "download-request") {
 			assert.Equal(t, "GET", req.Method)
 
-			return &http.Response{StatusCode: http.StatusOK, Body: ioutil.NopCloser(bytes.NewBufferString("dummy"))}
+			return &http.Response{StatusCode: http.StatusOK, Body: io.NopCloser(bytes.NewBufferString("dummy"))}
 		} else if strings.Contains(url, "upload-request") {
 			assert.Equal(t, "PUT", req.Method)
 			assert.Equal(t, "application/octet-stream", req.Header.Get("Content-Type"))
@@ -63,7 +62,7 @@ func TestBasicTransferAdapter(t *testing.T) {
 			payload := new(bytes.Buffer)
 			json.NewEncoder(payload).Encode(er)
 
-			return &http.Response{StatusCode: http.StatusNotFound, Body: ioutil.NopCloser(payload)}
+			return &http.Response{StatusCode: http.StatusNotFound, Body: io.NopCloser(payload)}
 		} else {
 			t.Errorf("Unknown test case: %s", url)
 			return nil