Merge pull request #160 from mhofstetter/feature/golangci-lint

k8s-ci-robot · web-flow · commit d68bd4b6f90c · 2022-09-14T10:11:03.000-07:00
build: fix golangci-lint SA1019 io/ioutil
diff --git a/klient/conf/main_test.go b/klient/conf/main_test.go
@@ -18,7 +18,6 @@ package conf
 
 import (
 	"flag"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -77,7 +76,7 @@ func setup() {
 }
 
 func createFile(path, data string) error {
-	return ioutil.WriteFile(path, []byte(data), 0o644)
+	return os.WriteFile(path, []byte(data), 0o644)
 }
 
 // genKubeconfig used to genearte kube config file
diff --git a/support/kind/kind.go b/support/kind/kind.go
@@ -20,7 +20,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"strings"
 
@@ -63,7 +62,7 @@ func (k *Cluster) getKubeconfig() (string, error) {
 		return "", fmt.Errorf("kind get kubeconfig: %s: %w", p.Result(), p.Err())
 	}
 
-	file, err := ioutil.TempFile("", fmt.Sprintf("kind-cluser-%s", kubecfg))
+	file, err := os.CreateTemp("", fmt.Sprintf("kind-cluser-%s", kubecfg))
 	if err != nil {
 		return "", fmt.Errorf("kind kubeconfig file: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ package conf`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"flag"`
`21`		`- "io/ioutil"`
`22`	`21`	`"os"`
`23`	`22`	`"path/filepath"`
`24`	`23`	`"strings"`
`@@ -77,7 +76,7 @@ func setup() {`
`77`	`76`	`}`
`78`	`77`
`79`	`78`	`func createFile(path, data string) error {`
`80`		`- return ioutil.WriteFile(path, []byte(data), 0o644)`
	`79`	`+ return os.WriteFile(path, []byte(data), 0o644)`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`// genKubeconfig used to genearte kube config file`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ import (`
`20`	`20`	`"bytes"`
`21`	`21`	`"fmt"`
`22`	`22`	`"io"`
`23`		`- "io/ioutil"`
`24`	`23`	`"os"`
`25`	`24`	`"strings"`
`26`	`25`
`@@ -63,7 +62,7 @@ func (k *Cluster) getKubeconfig() (string, error) {`
`63`	`62`	`return "", fmt.Errorf("kind get kubeconfig: %s: %w", p.Result(), p.Err())`
`64`	`63`	`}`
`65`	`64`
`66`		`- file, err := ioutil.TempFile("", fmt.Sprintf("kind-cluser-%s", kubecfg))`
	`65`	`+ file, err := os.CreateTemp("", fmt.Sprintf("kind-cluser-%s", kubecfg))`
`67`	`66`	`if err != nil {`
`68`	`67`	`return "", fmt.Errorf("kind kubeconfig file: %w", err)`
`69`	`68`	`}`