*: remove io/ioutil as changed in Go 1.16

Makefile

@@ -69,6 +69,7 @@ check-static: tools/bin/golangci-lint
 
 lint: tools/bin/revive
 	@echo "linting"
+	./tools/check/check-lint.sh
 	@tools/bin/revive -formatter friendly -config tools/check/revive.toml $(FILES)
 
 vet:

cmd/clean.go

@@ -15,7 +15,6 @@ package cmd
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -49,7 +48,7 @@ func cleanData(env *environment.Environment, names []string, all bool) error {
 	if utils.IsNotExist(dataDir) {
 		return nil
 	}
-	dirs, err := ioutil.ReadDir(dataDir)
+	dirs, err := os.ReadDir(dataDir)
 	if err != nil {
 		return err
 	}

cmd/mirror.go

@@ -17,7 +17,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -117,7 +116,7 @@ func newMirrorSignCmd() *cobra.Command {
 				return nil
 			}
 
-			data, err := ioutil.ReadFile(args[0])
+			data, err := os.ReadFile(args[0])
 			if err != nil {
 				return errors.Annotatef(err, "open manifest file %s", args[0])
 			}
@@ -126,7 +125,7 @@ func newMirrorSignCmd() *cobra.Command {
 				return err
 			}
 
-			if err = ioutil.WriteFile(args[0], data, 0664); err != nil {
+			if err = os.WriteFile(args[0], data, 0664); err != nil {
 				return errors.Annotatef(err, "write manifest file %s", args[0])
 			}
 
@@ -318,7 +317,7 @@ func editLatestRootManifest() (*v1manifest.Root, error) {
 		return nil, err
 	}
 
-	file, err := ioutil.TempFile(os.TempDir(), "*.root.json")
+	file, err := os.CreateTemp(os.TempDir(), "*.root.json")
 	if err != nil {
 		return nil, errors.Annotate(err, "create temp file for root.json")
 	}

cmd/status.go

@@ -14,7 +14,6 @@
 package cmd
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -47,7 +46,7 @@ func showStatus(env *environment.Environment) error {
 	var table [][]string
 	table = append(table, []string{"Name", "Component", "PID", "Status", "Created Time", "Directory", "Binary", "Args"})
 	if dataDir := env.LocalPath(localdata.DataParentDir); utils.IsExist(dataDir) {
-		dirs, err := ioutil.ReadDir(dataDir)
+		dirs, err := os.ReadDir(dataDir)
 		if err != nil {
 			return err
 		}

cmd/uninstall.go

@@ -15,7 +15,6 @@ package cmd
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 
@@ -87,7 +86,7 @@ func removeComponents(env *environment.Environment, specs []string, all bool) er
 		if strings.Contains(spec, ":") {
 			parts := strings.SplitN(spec, ":", 2)
 			// after this version is deleted, component will have no version left. delete the whole component dir directly
-			dir, err := ioutil.ReadDir(env.LocalPath(localdata.ComponentParentDir, parts[0]))
+			dir, err := os.ReadDir(env.LocalPath(localdata.ComponentParentDir, parts[0]))
 			if err != nil {
 				return errors.Trace(err)
 			}

components/client/main.go

@@ -18,7 +18,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/user"
@@ -107,7 +106,7 @@ func connect(target string) error {
 func scanEndpoint(tiupHome string) ([]*endpoint, error) {
 	endpoints := []*endpoint{}
 
-	files, err := ioutil.ReadDir(path.Join(tiupHome, localdata.DataParentDir))
+	files, err := os.ReadDir(path.Join(tiupHome, localdata.DataParentDir))
 	if err != nil {
 		return nil, err
 	}
@@ -203,7 +202,7 @@ func selectEndpoint(endpoints []*endpoint) *endpoint {
 	uiEvents := ui.PollEvents()
 	for {
 		e := <-uiEvents
-		_ = ioutil.WriteFile("/tmp/log", []byte(e.ID+"\n"), 0664)
+		_ = os.WriteFile("/tmp/log", []byte(e.ID+"\n"), 0664)
 		switch e.ID {
 		case "q", "<C-c>":
 			return nil

components/cluster/command/deploy.go

@@ -15,7 +15,7 @@ package command
 
 import (
 	"context"
-	"io/ioutil"
+	"os"
 	"path"
 
 	"github.com/pingcap/tiup/pkg/cliutil"
@@ -76,7 +76,7 @@ func newDeploy() *cobra.Command {
 			teleCommand = append(teleCommand, version)
 
 			topoFile := args[2]
-			if data, err := ioutil.ReadFile(topoFile); err == nil {
+			if data, err := os.ReadFile(topoFile); err == nil {
 				teleTopology = string(data)
 			}
 

components/cluster/command/scale_out.go

@@ -14,7 +14,7 @@
 package command
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 
 	"github.com/pingcap/tiup/pkg/cluster/executor"
@@ -47,7 +47,7 @@ func newScaleOutCmd() *cobra.Command {
 			teleCommand = append(teleCommand, scrubClusterName(clusterName))
 
 			topoFile := args[1]
-			if data, err := ioutil.ReadFile(topoFile); err == nil {
+			if data, err := os.ReadFile(topoFile); err == nil {
 				teleTopology = string(data)
 			}
 

components/dm/ansible/import.go

@@ -18,7 +18,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -173,7 +172,7 @@ func (im *Importer) fetchFile(ctx context.Context, host string, port int, fname
 		return nil, errors.Annotatef(err, "failed to get executor, target: %s:%d", host, port)
 	}
 
-	tmp, err := ioutil.TempDir("", "tiup")
+	tmp, err := os.MkdirTemp("", "tiup")
 	if err != nil {
 		return nil, errors.AddStack(err)
 	}
@@ -186,7 +185,7 @@ func (im *Importer) fetchFile(ctx context.Context, host string, port int, fname
 		return nil, errors.Annotatef(err, "transfer %s from %s:%d", fname, host, port)
 	}
 
-	data, err = ioutil.ReadFile(tmp)
+	data, err = os.ReadFile(tmp)
 	if err != nil {
 		return nil, errors.AddStack(err)
 	}
@@ -240,7 +239,7 @@ func (im *Importer) ScpSourceToMaster(ctx context.Context, topo *spec.Specificat
 		}
 
 		for addr, source := range im.sources {
-			f, err := ioutil.TempFile("", "tiup-dm-*")
+			f, err := os.CreateTemp("", "tiup-dm-*")
 			if err != nil {
 				return errors.AddStack(err)
 			}

components/dm/ansible/import_test.go

@@ -15,7 +15,7 @@ package ansible
 
 import (
 	"context"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -61,7 +61,7 @@ func TestParseRunScript(t *testing.T) {
 	assert := require.New(t)
 
 	// parse run_dm-master.sh
-	data, err := ioutil.ReadFile("./testdata/deploy_dir/172.19.0.101/scripts/run_dm-master.sh")
+	data, err := os.ReadFile("./testdata/deploy_dir/172.19.0.101/scripts/run_dm-master.sh")
 	assert.Nil(err)
 	dir, flags, err := parseRunScript(data)
 	assert.Nil(err)
@@ -75,7 +75,7 @@ func TestParseRunScript(t *testing.T) {
 	assert.Equal(expectedFlags, flags)
 
 	// parse run_dm-worker.sh
-	data, err = ioutil.ReadFile("./testdata/deploy_dir/172.19.0.101/scripts/run_dm-worker.sh")
+	data, err = os.ReadFile("./testdata/deploy_dir/172.19.0.101/scripts/run_dm-worker.sh")
 	assert.Nil(err)
 	dir, flags, err = parseRunScript(data)
 	assert.Nil(err)
@@ -90,7 +90,7 @@ func TestParseRunScript(t *testing.T) {
 	assert.Equal(expectedFlags, flags)
 
 	// parse run_prometheus.sh
-	data, err = ioutil.ReadFile("./testdata/deploy_dir/172.19.0.101/scripts/run_prometheus.sh")
+	data, err = os.ReadFile("./testdata/deploy_dir/172.19.0.101/scripts/run_prometheus.sh")
 	assert.Nil(err)
 	dir, flags, err = parseRunScript(data)
 	assert.Nil(err)
@@ -107,7 +107,7 @@ func TestParseRunScript(t *testing.T) {
 	assert.Equal(expectedFlags, flags)
 
 	// parse run_grafana.sh
-	data, err = ioutil.ReadFile("./testdata/deploy_dir/172.19.0.101/scripts/run_grafana.sh")
+	data, err = os.ReadFile("./testdata/deploy_dir/172.19.0.101/scripts/run_grafana.sh")
 	assert.Nil(err)
 	dir, flags, err = parseRunScript(data)
 	assert.Nil(err)
@@ -119,7 +119,7 @@ func TestParseRunScript(t *testing.T) {
 	assert.Equal(expectedFlags, flags)
 
 	// parse run_alertmanager.sh
-	data, err = ioutil.ReadFile("./testdata/deploy_dir/172.19.0.101/scripts/run_alertmanager.sh")
+	data, err = os.ReadFile("./testdata/deploy_dir/172.19.0.101/scripts/run_alertmanager.sh")
 	assert.Nil(err)
 	dir, flags, err = parseRunScript(data)
 	assert.Nil(err)

components/dm/command/import.go

@@ -16,7 +16,7 @@ package command
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"github.com/fatih/color"
 	"github.com/pingcap/errors"
@@ -69,7 +69,7 @@ func newImportCmd() *cobra.Command {
 				return errors.AddStack(err)
 			}
 
-			f, err := ioutil.TempFile("", "tiup-*")
+			f, err := os.CreateTemp("", "tiup-*")
 			if err != nil {
 				return errors.AddStack(err)
 			}

components/dm/spec/topology_dm_test.go

@@ -15,7 +15,6 @@ package spec
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -273,7 +272,7 @@ worker_servers:
 }
 
 func withTempFile(content string, fn func(string)) {
-	file, err := ioutil.TempFile("/tmp", "topology-test")
+	file, err := os.CreateTemp("/tmp", "topology-test")
 	if err != nil {
 		panic(fmt.Sprintf("create temp file: %s", err))
 	}

components/errdoc/errdoc-gen/main.go

@@ -95,7 +95,6 @@ package main
 import (
 	"bytes"
 	"flag"
-	"io/ioutil"
 	"os"
 	"reflect"
 	"fmt"
@@ -120,7 +119,7 @@ func main() {
 
 	// Read-in the exists file and merge the description/workaround from exists file
 	existDefinition := map[string]spec{}
-	if file, err := ioutil.ReadFile(outpath); err == nil {
+	if file, err := os.ReadFile(outpath); err == nil {
 		err = toml.Unmarshal(file, &existDefinition)
 		if err != nil {
 			println(fmt.Sprintf("Invalid toml file %s when merging exists description/workaround: %v", outpath, err))
@@ -187,7 +186,7 @@ func main() {
 		}
 		buffer.WriteString("\n")
 	}
-	if err := ioutil.WriteFile(outpath, buffer.Bytes(), os.ModePerm); err != nil {
+	if err := os.WriteFile(outpath, buffer.Bytes(), os.ModePerm); err != nil {
 		panic(err)
 	}
 }

components/playground/grafana.go

@@ -16,7 +16,6 @@ package main
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path"
@@ -74,7 +73,7 @@ datasources:
 `
 
 	s := fmt.Sprintf(tpl, clusterName, clusterName, p8sURL)
-	err = ioutil.WriteFile(fname, []byte(s), 0644)
+	err = os.WriteFile(fname, []byte(s), 0644)
 	if err != nil {
 		return errors.AddStack(err)
 	}
@@ -98,7 +97,7 @@ func replaceDatasource(dashboardDir string, datasourceName string) error {
 			return nil
 		}
 
-		data, err := ioutil.ReadFile(path)
+		data, err := os.ReadFile(path)
 		if err != nil {
 			return errors.AddStack(err)
 		}
@@ -109,7 +108,7 @@ func replaceDatasource(dashboardDir string, datasourceName string) error {
 		s = strings.Replace(s, "${DS_LIGHTNING}", datasourceName, -1)
 		s = re.ReplaceAllLiteralString(s, datasourceName)
 
-		return ioutil.WriteFile(path, []byte(s), 0644)
+		return os.WriteFile(path, []byte(s), 0644)
 	})
 
 	if err != nil {
@@ -138,7 +137,7 @@ providers:
 `
 	s := fmt.Sprintf(tpl, clusterName, clusterName, dir)
 
-	err = ioutil.WriteFile(fname, []byte(s), 0644)
+	err = os.WriteFile(fname, []byte(s), 0644)
 	if err != nil {
 		return errors.AddStack(err)
 	}
@@ -188,7 +187,7 @@ http_port = %d
 	custome := fmt.Sprintf(tpl, g.host, g.port)
 	customeFName := filepath.Join(dir, "conf", "custom.ini")
 
-	err = ioutil.WriteFile(customeFName, []byte(custome), 0644)
+	err = os.WriteFile(customeFName, []byte(custome), 0644)
 	if err != nil {
 		return errors.AddStack(err)
 	}

components/playground/grafana_test.go

@@ -14,7 +14,6 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -31,19 +30,19 @@ c: Test-Cluster
 d: ${DS_LIGHTNING}
 	`
 
-	dir, err := ioutil.TempDir("", "play_replace_test_*")
+	dir, err := os.MkdirTemp("", "play_replace_test_*")
 	assert.Nil(t, err)
 	defer os.RemoveAll(dir)
 
 	fname := filepath.Join(dir, "a.json")
-	err = ioutil.WriteFile(fname, []byte(origin), 0644)
+	err = os.WriteFile(fname, []byte(origin), 0644)
 	assert.Nil(t, err)
 
 	name := "myname"
 	err = replaceDatasource(dir, name)
 	assert.Nil(t, err)
 
-	data, err := ioutil.ReadFile(fname)
+	data, err := os.ReadFile(fname)
 	assert.Nil(t, err)
 	replaced := string(data)