github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 21:50:05 +00:00
Code Issues 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

5
test/integration/controlplane/audit_test.go
View File

@@ -20,7 +20,6 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"os"
"strings"
@@ -232,7 +231,7 @@ func runTestWithVersion(t *testing.T, version string) {
// prepare audit policy file
auditPolicy := strings.Replace(auditPolicyPattern, "{version}", version, 1)
policyFile, err := ioutil.TempFile("", "audit-policy.yaml")
policyFile, err := os.CreateTemp("", "audit-policy.yaml")
if err != nil {
t.Fatalf("Failed to create audit policy file: %v", err)
}
@@ -245,7 +244,7 @@ func runTestWithVersion(t *testing.T, version string) {
}
// prepare audit log file
logFile, err := ioutil.TempFile("", "audit.log")
logFile, err := os.CreateTemp("", "audit.log")
if err != nil {
t.Fatalf("Failed to create audit log file: %v", err)
}

5
test/integration/controlplane/graceful_shutdown_test.go
View File

@@ -18,7 +18,6 @@ package controlplane
import (
"io"
"io/ioutil"
"net/http"
"sync"
"testing"
@@ -55,7 +54,7 @@ func TestGracefulShutdown(t *testing.T) {
if respErr.err != nil {
t.Fatalf("unexpected error: %v", err)
}
bs, err := ioutil.ReadAll(respErr.resp.Body)
bs, err := io.ReadAll(respErr.resp.Body)
if err != nil {
t.Fatal(err)
}
@@ -96,7 +95,7 @@ func TestGracefulShutdown(t *testing.T) {
t.Fatal(respErr.err)
}
defer respErr.resp.Body.Close()
bs, err := ioutil.ReadAll(respErr.resp.Body)
bs, err := io.ReadAll(respErr.resp.Body)
if err != nil {
t.Fatal(err)
}

16
test/integration/controlplane/synthetic_controlplane_test.go
View File

@@ -21,7 +21,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"os"
"path"
@@ -126,7 +126,7 @@ func TestEmptyList(t *testing.T) {
t.Fatalf("got status %v instead of 200 OK", resp.StatusCode)
}
defer resp.Body.Close()
data, _ := ioutil.ReadAll(resp.Body)
data, _ := io.ReadAll(resp.Body)
decodedData := map[string]interface{}{}
if err := json.Unmarshal(data, &decodedData); err != nil {
t.Logf("body: %s", string(data))
@@ -214,7 +214,7 @@ func TestStatus(t *testing.T) {
t.Fatalf("got status %v instead of %s", resp.StatusCode, tc.name)
}
defer resp.Body.Close()
data, _ := ioutil.ReadAll(resp.Body)
data, _ := io.ReadAll(resp.Body)
decodedData := map[string]interface{}{}
if err := json.Unmarshal(data, &decodedData); err != nil {
t.Logf("body: %s", string(data))
@@ -470,7 +470,7 @@ func TestAutoscalingGroupBackwardCompatibility(t *testing.T) {
t.Fatalf("unexpected error: %v", err)
}
defer resp.Body.Close()
b, _ := ioutil.ReadAll(resp.Body)
b, _ := io.ReadAll(resp.Body)
body := string(b)
if _, ok := r.expectedStatusCodes[resp.StatusCode]; !ok {
t.Logf("case %v", r)
@@ -518,7 +518,7 @@ func TestAppsGroupBackwardCompatibility(t *testing.T) {
t.Fatalf("unexpected error: %v", err)
}
defer resp.Body.Close()
b, _ := ioutil.ReadAll(resp.Body)
b, _ := io.ReadAll(resp.Body)
body := string(b)
if _, ok := r.expectedStatusCodes[resp.StatusCode]; !ok {
t.Logf("case %v", r)
@@ -545,7 +545,7 @@ func TestAccept(t *testing.T) {
t.Fatalf("got status %v instead of 200 OK", resp.StatusCode)
}
body, _ := ioutil.ReadAll(resp.Body)
body, _ := io.ReadAll(resp.Body)
if resp.Header.Get("Content-Type") != "application/json" {
t.Errorf("unexpected content: %s", body)
}
@@ -562,7 +562,7 @@ func TestAccept(t *testing.T) {
if err != nil {
t.Fatal(err)
}
body, _ = ioutil.ReadAll(resp.Body)
body, _ = io.ReadAll(resp.Body)
if resp.Header.Get("Content-Type") != "application/yaml" {
t.Errorf("unexpected content: %s", body)
}
@@ -580,7 +580,7 @@ func TestAccept(t *testing.T) {
if err != nil {
t.Fatal(err)
}
body, _ = ioutil.ReadAll(resp.Body)
body, _ = io.ReadAll(resp.Body)
if resp.Header.Get("Content-Type") != "application/json" {
t.Errorf("unexpected content: %s", body)
}

5
test/integration/controlplane/transformation_testcase.go
View File

@@ -20,7 +20,6 @@ import (
"bytes"
"context"
"fmt"
"io/ioutil"
"os"
"path"
"strconv"
@@ -173,14 +172,14 @@ func (e *transformTest) getEncryptionOptions() []string {
}
func (e *transformTest) createEncryptionConfig() (string, error) {
tempDir, err := ioutil.TempDir("", "secrets-encryption-test")
tempDir, err := os.MkdirTemp("", "secrets-encryption-test")
if err != nil {
return "", fmt.Errorf("failed to create temp directory: %v", err)
}
encryptionConfig := path.Join(tempDir, encryptionConfigFileName)
if err := ioutil.WriteFile(encryptionConfig, []byte(e.transformerConfig), 0644); err != nil {
if err := os.WriteFile(encryptionConfig, []byte(e.transformerConfig), 0644); err != nil {
os.RemoveAll(tempDir)
return "", fmt.Errorf("error while writing encryption config: %v", err)
}