Skip to content

Commit adbda06

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#106015 from ahrtr/replace_ioutil_with_io_os_test
Replace ioutil with os and io for the test
2 parents a5e7005 + fe95aa6 commit adbda06

File tree

96 files changed

+250
-297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+250
-297
lines changed

‎test/conformance/image/go-runner/main.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package main
1919
import (
2020
"fmt"
2121
"io"
22-
"io/ioutil"
2322
"log"
2423
"os"
2524
"os/signal"
@@ -123,7 +122,7 @@ func saveResults(resultsDir string) error {
123122
return fmt.Errorf("failed to find absolute path for %v: %w", resultsTarball, err)
124123
}
125124

126-
err = ioutil.WriteFile(doneFile, []byte(resultsTarball), os.FileMode(0777))
125+
err = os.WriteFile(doneFile, []byte(resultsTarball), os.FileMode(0777))
127126
if err != nil {
128127
return fmt.Errorf("writing donefile: %w", err)
129128
}

‎test/conformance/image/go-runner/tar_test.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"compress/gzip"
2222
"fmt"
2323
"io"
24-
"io/ioutil"
2524
"os"
2625
"path/filepath"
2726
"reflect"
@@ -30,7 +29,7 @@ import (
3029
)
3130

3231
func TestTar(t *testing.T) {
33-
tmp, err := ioutil.TempDir("", "testtar")
32+
tmp, err := os.MkdirTemp("", "testtar")
3433
if err != nil {
3534
t.Fatal(err)
3635
}
@@ -39,13 +38,13 @@ func TestTar(t *testing.T) {
3938
if err := os.Mkdir(filepath.Join(tmp, "subdir"), os.FileMode(0755)); err != nil {
4039
t.Fatal(err)
4140
}
42-
if err := ioutil.WriteFile(filepath.Join(tmp, "file1"), []byte(`file1 data`), os.FileMode(0644)); err != nil {
41+
if err := os.WriteFile(filepath.Join(tmp, "file1"), []byte(`file1 data`), os.FileMode(0644)); err != nil {
4342
t.Fatal(err)
4443
}
45-
if err := ioutil.WriteFile(filepath.Join(tmp, "file2"), []byte(`file2 data`), os.FileMode(0644)); err != nil {
44+
if err := os.WriteFile(filepath.Join(tmp, "file2"), []byte(`file2 data`), os.FileMode(0644)); err != nil {
4645
t.Fatal(err)
4746
}
48-
if err := ioutil.WriteFile(filepath.Join(tmp, "subdir", "file4"), []byte(`file4 data`), os.FileMode(0644)); err != nil {
47+
if err := os.WriteFile(filepath.Join(tmp, "subdir", "file4"), []byte(`file4 data`), os.FileMode(0644)); err != nil {
4948
t.Fatal(err)
5049
}
5150

@@ -138,7 +137,7 @@ func readAllTar(tarPath string) (map[string]string, error) {
138137
return nil, err
139138
}
140139

141-
b, err := ioutil.ReadAll(tr)
140+
b, err := io.ReadAll(tr)
142141
if err != nil {
143142
return nil, err
144143
}

‎test/e2e/apimachinery/certs.go

+7-8
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package apimachinery
1818

1919
import (
2020
"crypto/x509"
21-
"io/ioutil"
2221
"os"
2322

2423
"k8s.io/client-go/util/cert"
@@ -36,7 +35,7 @@ type certContext struct {
3635
// Setup the server cert. For example, user apiservers and admission webhooks
3736
// can use the cert to prove their identify to the kube-apiserver
3837
func setupServerCert(namespaceName, serviceName string) *certContext {
39-
certDir, err := ioutil.TempDir("", "test-e2e-server-cert")
38+
certDir, err := os.MkdirTemp("", "test-e2e-server-cert")
4039
if err != nil {
4140
framework.Failf("Failed to create a temp dir for cert generation %v", err)
4241
}
@@ -49,11 +48,11 @@ func setupServerCert(namespaceName, serviceName string) *certContext {
4948
if err != nil {
5049
framework.Failf("Failed to create CA cert for apiserver %v", err)
5150
}
52-
caCertFile, err := ioutil.TempFile(certDir, "ca.crt")
51+
caCertFile, err := os.CreateTemp(certDir, "ca.crt")
5352
if err != nil {
5453
framework.Failf("Failed to create a temp file for ca cert generation %v", err)
5554
}
56-
if err := ioutil.WriteFile(caCertFile.Name(), utils.EncodeCertPEM(signingCert), 0644); err != nil {
55+
if err := os.WriteFile(caCertFile.Name(), utils.EncodeCertPEM(signingCert), 0644); err != nil {
5756
framework.Failf("Failed to write CA cert %v", err)
5857
}
5958
key, err := utils.NewPrivateKey()
@@ -71,22 +70,22 @@ func setupServerCert(namespaceName, serviceName string) *certContext {
7170
if err != nil {
7271
framework.Failf("Failed to create cert%v", err)
7372
}
74-
certFile, err := ioutil.TempFile(certDir, "server.crt")
73+
certFile, err := os.CreateTemp(certDir, "server.crt")
7574
if err != nil {
7675
framework.Failf("Failed to create a temp file for cert generation %v", err)
7776
}
78-
keyFile, err := ioutil.TempFile(certDir, "server.key")
77+
keyFile, err := os.CreateTemp(certDir, "server.key")
7978
if err != nil {
8079
framework.Failf("Failed to create a temp file for key generation %v", err)
8180
}
82-
if err = ioutil.WriteFile(certFile.Name(), utils.EncodeCertPEM(signedCert), 0600); err != nil {
81+
if err = os.WriteFile(certFile.Name(), utils.EncodeCertPEM(signedCert), 0600); err != nil {
8382
framework.Failf("Failed to write cert file %v", err)
8483
}
8584
privateKeyPEM, err := keyutil.MarshalPrivateKeyToPEM(key)
8685
if err != nil {
8786
framework.Failf("Failed to marshal key %v", err)
8887
}
89-
if err = ioutil.WriteFile(keyFile.Name(), privateKeyPEM, 0644); err != nil {
88+
if err = os.WriteFile(keyFile.Name(), privateKeyPEM, 0644); err != nil {
9089
framework.Failf("Failed to write key file %v", err)
9190
}
9291
return &certContext{

‎test/e2e/apimachinery/crd_publish_openapi.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121
"encoding/json"
2222
"fmt"
23-
"io/ioutil"
23+
"io"
2424
"net/http"
2525
"regexp"
2626
"strings"
@@ -662,7 +662,7 @@ func waitForOpenAPISchema(c k8sclientset.Interface, pred func(*spec.Swagger) (bo
662662
spec = etagSpec
663663
} else if resp.StatusCode != http.StatusOK {
664664
return false, fmt.Errorf("unexpected response: %d", resp.StatusCode)
665-
} else if bs, err := ioutil.ReadAll(resp.Body); err != nil {
665+
} else if bs, err := io.ReadAll(resp.Body); err != nil {
666666
return false, err
667667
} else if err := json.Unmarshal(bs, spec); err != nil {
668668
return false, err

‎test/e2e/apimachinery/request_timeout.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package apimachinery
1818

1919
import (
20-
"io/ioutil"
20+
"io"
2121
"net/http"
2222
"strings"
2323

@@ -100,7 +100,7 @@ func newRequest(f *framework.Framework, timeout string) *http.Request {
100100
}
101101

102102
func readBody(response *http.Response) string {
103-
raw, err := ioutil.ReadAll(response.Body)
103+
raw, err := io.ReadAll(response.Body)
104104
framework.ExpectNoError(err)
105105

106106
return string(raw)

‎test/e2e/autoscaling/cluster_size_autoscaling.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package autoscaling
1919
import (
2020
"context"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323
"math"
2424
"net/http"
2525
"os"
@@ -1101,7 +1101,7 @@ func getCluster(apiVersion string) (string, error) {
11011101
return "", err
11021102
}
11031103
defer resp.Body.Close()
1104-
body, err := ioutil.ReadAll(resp.Body)
1104+
body, err := io.ReadAll(resp.Body)
11051105
if err != nil {
11061106
return "", err
11071107
}

‎test/e2e/common/node/runtime.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package node
1919
import (
2020
"context"
2121
"fmt"
22-
"io/ioutil"
22+
"os"
2323
"path"
2424
"time"
2525

@@ -291,7 +291,7 @@ while true; do sleep 1; done
291291
}`
292292
// we might be told to use a different docker config JSON.
293293
if framework.TestContext.DockerConfigFile != "" {
294-
contents, err := ioutil.ReadFile(framework.TestContext.DockerConfigFile)
294+
contents, err := os.ReadFile(framework.TestContext.DockerConfigFile)
295295
framework.ExpectNoError(err)
296296
auth = string(contents)
297297
}

‎test/e2e/e2e.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"context"
2121
"encoding/json"
2222
"fmt"
23-
"io/ioutil"
2423
"os"
2524
"os/exec"
2625
"path"
@@ -298,7 +297,7 @@ func logClusterImageSources() {
298297

299298
outputBytes, _ := json.MarshalIndent(images, "", " ")
300299
filePath := filepath.Join(framework.TestContext.ReportDir, "images.json")
301-
if err := ioutil.WriteFile(filePath, outputBytes, 0644); err != nil {
300+
if err := os.WriteFile(filePath, outputBytes, 0644); err != nil {
302301
framework.Logf("cluster images sources, could not write to %q: %v", filePath, err)
303302
}
304303
}

‎test/e2e/framework/framework.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ package framework
2424
import (
2525
"context"
2626
"fmt"
27-
"io/ioutil"
2827
"math/rand"
28+
"os"
2929
"path"
3030
"strings"
3131
"sync"
@@ -328,7 +328,7 @@ func printSummaries(summaries []TestDataSummary, testBaseName string) {
328328
} else {
329329
// TODO: learn to extract test name and append it to the kind instead of timestamp.
330330
filePath := path.Join(TestContext.ReportDir, summaries[i].SummaryKind()+"_"+testBaseName+"_"+now.Format(time.RFC3339)+".txt")
331-
if err := ioutil.WriteFile(filePath, []byte(summaries[i].PrintHumanReadable()), 0644); err != nil {
331+
if err := os.WriteFile(filePath, []byte(summaries[i].PrintHumanReadable()), 0644); err != nil {
332332
Logf("Failed to write file %v with test performance data: %v", filePath, err)
333333
}
334334
}
@@ -345,7 +345,7 @@ func printSummaries(summaries []TestDataSummary, testBaseName string) {
345345
// TODO: learn to extract test name and append it to the kind instead of timestamp.
346346
filePath := path.Join(TestContext.ReportDir, summaries[i].SummaryKind()+"_"+testBaseName+"_"+now.Format(time.RFC3339)+".json")
347347
Logf("Writing to %s", filePath)
348-
if err := ioutil.WriteFile(filePath, []byte(summaries[i].PrintJSON()), 0644); err != nil {
348+
if err := os.WriteFile(filePath, []byte(summaries[i].PrintJSON()), 0644); err != nil {
349349
Logf("Failed to write file %v with test performance data: %v", filePath, err)
350350
}
351351
}

‎test/e2e/framework/ingress/ingress_utils.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@ import (
2626
"crypto/x509/pkix"
2727
"encoding/pem"
2828
"fmt"
29-
"io/ioutil"
29+
"io"
3030
"math/big"
3131
"net"
3232
"net/http"
33+
"os"
3334
"path/filepath"
3435
"regexp"
3536
"strconv"
@@ -178,7 +179,7 @@ func SimpleGET(c *http.Client, url, host string) (string, error) {
178179
return "", err
179180
}
180181
defer res.Body.Close()
181-
rawBody, err := ioutil.ReadAll(res.Body)
182+
rawBody, err := io.ReadAll(res.Body)
182183
if err != nil {
183184
return "", err
184185
}
@@ -533,7 +534,7 @@ func ingressToManifest(ing *networkingv1.Ingress, path string) error {
533534
return fmt.Errorf("failed to marshal ingress %v to YAML: %v", ing, err)
534535
}
535536

536-
if err := ioutil.WriteFile(path, serialized, 0600); err != nil {
537+
if err := os.WriteFile(path, serialized, 0600); err != nil {
537538
return fmt.Errorf("error in writing ingress to file: %s", err)
538539
}
539540
return nil

‎test/e2e/framework/ingress/ingress_utils_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package ingress
1818

1919
import (
20-
"io/ioutil"
2120
"os"
2221
"path/filepath"
2322
"testing"
@@ -28,7 +27,7 @@ import (
2827
func TestIngressToManifest(t *testing.T) {
2928
ing := &networkingv1.Ingress{}
3029
// Create a temp dir.
31-
tmpDir, err := ioutil.TempDir("", "kubemci")
30+
tmpDir, err := os.MkdirTemp("", "kubemci")
3231
if err != nil {
3332
t.Fatalf("unexpected error in creating temp dir: %s", err)
3433
}

‎test/e2e/framework/kubelet/config.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"crypto/tls"
2121
"encoding/json"
2222
"fmt"
23-
"io/ioutil"
23+
"io"
2424
"net/http"
2525
"regexp"
2626
"strconv"
@@ -117,7 +117,7 @@ func decodeConfigz(resp *http.Response) (*kubeletconfig.KubeletConfiguration, er
117117
configz := configzWrapper{}
118118
kubeCfg := kubeletconfig.KubeletConfiguration{}
119119

120-
contentsBytes, err := ioutil.ReadAll(resp.Body)
120+
contentsBytes, err := io.ReadAll(resp.Body)
121121
if err != nil {
122122
return nil, err
123123
}

‎test/e2e/framework/manifest/manifest.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package manifest
1818

1919
import (
2020
"fmt"
21-
"io/ioutil"
21+
"io"
2222
"net/http"
2323
"time"
2424

@@ -115,7 +115,7 @@ func DaemonSetFromURL(url string) (*appsv1.DaemonSet, error) {
115115
}
116116
defer response.Body.Close()
117117

118-
data, err := ioutil.ReadAll(response.Body)
118+
data, err := io.ReadAll(response.Body)
119119
if err != nil {
120120
return nil, fmt.Errorf("Failed to read html response body: %v", err)
121121
}

‎test/e2e/framework/metrics/kubelet_metrics.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package metrics
1919
import (
2020
"context"
2121
"fmt"
22-
"io/ioutil"
22+
"io"
2323
"net/http"
2424
"sort"
2525
"strconv"
@@ -73,7 +73,7 @@ func GrabKubeletMetricsWithoutProxy(nodeName, path string) (KubeletMetrics, erro
7373
return KubeletMetrics{}, err
7474
}
7575
defer resp.Body.Close()
76-
body, err := ioutil.ReadAll(resp.Body)
76+
body, err := io.ReadAll(resp.Body)
7777
if err != nil {
7878
return KubeletMetrics{}, err
7979
}

‎test/e2e/framework/network/utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"crypto/tls"
2222
"encoding/json"
2323
"fmt"
24-
"io/ioutil"
24+
"io"
2525
"net"
2626
"net/http"
2727
"strconv"
@@ -1005,7 +1005,7 @@ func PokeHTTP(host string, port int, path string, params *HTTPPokeParams) HTTPPo
10051005
ret.Code = resp.StatusCode
10061006

10071007
defer resp.Body.Close()
1008-
body, err := ioutil.ReadAll(resp.Body)
1008+
body, err := io.ReadAll(resp.Body)
10091009
if err != nil {
10101010
ret.Status = HTTPError
10111011
ret.Error = fmt.Errorf("error reading HTTP body: %v", err)

‎test/e2e/framework/pod/dial.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121
"errors"
2222
"fmt"
23-
"io/ioutil"
23+
"io"
2424
"net"
2525
"net/http"
2626
"regexp"
@@ -116,7 +116,7 @@ func (d *Dialer) DialContainerPort(ctx context.Context, addr Addr) (conn net.Con
116116
}
117117
errorStream.Close()
118118
go func() {
119-
message, err := ioutil.ReadAll(errorStream)
119+
message, err := io.ReadAll(errorStream)
120120
switch {
121121
case err != nil:
122122
klog.ErrorS(err, "error reading from error stream")

‎test/e2e/framework/ssh/ssh.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"bytes"
2121
"context"
2222
"fmt"
23-
"io/ioutil"
2423
"net"
2524
"os"
2625
"path/filepath"
@@ -102,7 +101,7 @@ func GetSigner(provider string) (ssh.Signer, error) {
102101
}
103102

104103
func makePrivateKeySignerFromFile(key string) (ssh.Signer, error) {
105-
buffer, err := ioutil.ReadFile(key)
104+
buffer, err := os.ReadFile(key)
106105
if err != nil {
107106
return nil, fmt.Errorf("error reading SSH key %s: '%v'", key, err)
108107
}

0 commit comments

Comments
 (0)