From 242dddfcb7cfab1d21c1658828d94f603809a5c7 Mon Sep 17 00:00:00 2001
From: Gusted <williamzijl7@hotmail.com>
Date: Mon, 10 Jan 2022 01:48:13 +0000
Subject: [PATCH] Remove `ioutil` (#18222)

- Don't use `ioutil` package anymore as it doesn't anything special
anymore since Go 1.16:

```
// As of Go 1.16, the same functionality is now provided
// by package io or package os, and those implementations
// should be preferred in new code.
```

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
---
 models/asymkey/ssh_key_test.go          | 6 +++---
 models/migrations/migrations_test.go    | 3 +--
 modules/updatechecker/update_checker.go | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/models/asymkey/ssh_key_test.go b/models/asymkey/ssh_key_test.go
index 54d299056..71c8860f1 100644
--- a/models/asymkey/ssh_key_test.go
+++ b/models/asymkey/ssh_key_test.go
@@ -7,7 +7,7 @@ package asymkey
 
 import (
 	"bytes"
-	"io/ioutil"
+	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
@@ -325,7 +325,7 @@ func TestFromOpenSSH(t *testing.T) {
 			sigPath := dataPath + ".sig"
 			run(t, nil, "ssh-keygen", "-Y", "sign", "-n", "file", "-f", privPath, dataPath)
 
-			sigBytes, err := ioutil.ReadFile(sigPath)
+			sigBytes, err := os.ReadFile(sigPath)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -467,7 +467,7 @@ func TestRoundTrip(t *testing.T) {
 
 func write(t *testing.T, d []byte, fp ...string) string {
 	p := filepath.Join(fp...)
-	if err := ioutil.WriteFile(p, d, 0o600); err != nil {
+	if err := os.WriteFile(p, d, 0o600); err != nil {
 		t.Fatal(err)
 	}
 	return p
diff --git a/models/migrations/migrations_test.go b/models/migrations/migrations_test.go
index ceef0954e..33d589ddb 100644
--- a/models/migrations/migrations_test.go
+++ b/models/migrations/migrations_test.go
@@ -8,7 +8,6 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -58,7 +57,7 @@ func TestMain(m *testing.M) {
 		setting.CustomConf = giteaConf
 	}
 
-	tmpDataPath, err := ioutil.TempDir("", "data")
+	tmpDataPath, err := os.MkdirTemp("", "data")
 	if err != nil {
 		fmt.Printf("Unable to create temporary data path %v\n", err)
 		os.Exit(1)
diff --git a/modules/updatechecker/update_checker.go b/modules/updatechecker/update_checker.go
index 6c43309c1..149a8462f 100644
--- a/modules/updatechecker/update_checker.go
+++ b/modules/updatechecker/update_checker.go
@@ -5,7 +5,7 @@
 package updatechecker
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"code.gitea.io/gitea/modules/appstate"
@@ -43,7 +43,7 @@ func GiteaUpdateChecker(httpEndpoint string) error {
 		return err
 	}
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}