github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

io/ioutil has already been deprecated in golang 1.16, so replace all ioutil with io and os

Browse Source
This commit is contained in:
ahrtr
2021-10-30 06:41:02 +08:00
parent 2d0fa78f2f
commit fe95aa614c
96 changed files with 250 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/integration/client/cert_rotation_test.go
View File

@@ -23,7 +23,6 @@ import (
"crypto/x509"
"crypto/x509/pkix"
"encoding/pem"
"io/ioutil"
"math"
"math/big"
"os"
@@ -157,7 +156,7 @@ func writeCACertFiles(t *testing.T, certDir string) (string, *x509.Certificate,
clientCAFilename := path.Join(certDir, "ca.crt")
if err := ioutil.WriteFile(clientCAFilename, utils.EncodeCertPEM(clientSigningCert), 0644); err != nil {
if err := os.WriteFile(clientCAFilename, utils.EncodeCertPEM(clientSigningCert), 0644); err != nil {
t.Fatal(err)
}
@@ -175,7 +174,7 @@ func writeCerts(t *testing.T, clientSigningCert *x509.Certificate, clientSigning
t.Fatal(err)
}
if err := ioutil.WriteFile(path.Join(certDir, "client.key"), pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: privBytes}), 0666); err != nil {
if err := os.WriteFile(path.Join(certDir, "client.key"), pem.EncodeToMemory(&pem.Block{Type: "PRIVATE KEY", Bytes: privBytes}), 0666); err != nil {
t.Fatal(err)
}
@@ -201,7 +200,7 @@ func writeCerts(t *testing.T, clientSigningCert *x509.Certificate, clientSigning
t.Fatal(err)
}
if err := ioutil.WriteFile(path.Join(certDir, "client.crt"), pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: certDERBytes}), 0666); err != nil {
if err := os.WriteFile(path.Join(certDir, "client.crt"), pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: certDERBytes}), 0666); err != nil {
t.Fatal(err)
}

9
test/integration/client/exec_test.go
View File

@@ -23,7 +23,6 @@ import (
"encoding/base64"
"errors"
"fmt"
"io/ioutil"
"net"
"net/http"
"os"
@@ -700,7 +699,7 @@ type execPlugin struct {
func newExecPlugin(t *testing.T) *execPlugin {
t.Helper()
outputFile, err := ioutil.TempFile("", "kubernetes-client-exec-test-plugin-output-file-*")
outputFile, err := os.CreateTemp("", "kubernetes-client-exec-test-plugin-output-file-*")
if err != nil {
t.Fatal(err)
}
@@ -806,7 +805,7 @@ func TestExecPluginRotationViaInformer(t *testing.T) {
}
func startTestServer(t *testing.T) (result *kubeapiservertesting.TestServer, clientAuthorizedToken string, clientCertFileName string, clientKeyFileName string) {
certDir, err := ioutil.TempDir("", "kubernetes-client-exec-test-cert-dir-*")
certDir, err := os.MkdirTemp("", "kubernetes-client-exec-test-cert-dir-*")
if err != nil {
t.Fatal(err)
}
@@ -837,7 +836,7 @@ func startTestServer(t *testing.T) (result *kubeapiservertesting.TestServer, cli
func writeTokenFile(t *testing.T, goodToken string) string {
t.Helper()
tokenFile, err := ioutil.TempFile("", "kubernetes-client-exec-test-token-file-*")
tokenFile, err := os.CreateTemp("", "kubernetes-client-exec-test-token-file-*")
if err != nil {
t.Fatal(err)
}
@@ -855,7 +854,7 @@ func writeTokenFile(t *testing.T, goodToken string) string {
func read(t *testing.T, fileName string) string {
t.Helper()
data, err := ioutil.ReadFile(fileName)
data, err := os.ReadFile(fileName)
if err != nil {
t.Fatal(err)
}