Skip to content

Commit 9345e26

Browse files
committed
chore: remove refs to deprecated io/ioutil
1 parent 298e683 commit 9345e26

File tree

6 files changed

+14
-20
lines changed

6 files changed

+14
-20
lines changed

pkg/gce-pd-csi-driver/node_test.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package gceGCEDriver
1818
import (
1919
"context"
2020
"fmt"
21-
"io/ioutil"
2221
"os"
2322
"path/filepath"
2423
"strings"
@@ -82,7 +81,7 @@ func TestNodeGetVolumeStats(t *testing.T) {
8281
gceDriver := getTestGCEDriver(t)
8382
ns := gceDriver.ns
8483

85-
tempDir, err := ioutil.TempDir("", "ngvs")
84+
tempDir, err := os.MkdirTemp("", "ngvs")
8685
if err != nil {
8786
t.Fatalf("Failed to set up temp dir: %v", err)
8887
}
@@ -213,7 +212,7 @@ func TestNodePublishVolume(t *testing.T) {
213212
gceDriver := getTestGCEDriver(t)
214213
ns := gceDriver.ns
215214

216-
tempDir, err := ioutil.TempDir("", "npv")
215+
tempDir, err := os.MkdirTemp("", "npv")
217216
if err != nil {
218217
t.Fatalf("Failed to set up temp dir: %v", err)
219218
}
@@ -312,7 +311,7 @@ func TestNodeUnpublishVolume(t *testing.T) {
312311
gceDriver := getTestGCEDriver(t)
313312
ns := gceDriver.ns
314313

315-
tempDir, err := ioutil.TempDir("", "nupv")
314+
tempDir, err := os.MkdirTemp("", "nupv")
316315
if err != nil {
317316
t.Fatalf("Failed to set up temp dir: %v", err)
318317
}
@@ -374,7 +373,7 @@ func TestNodeStageVolume(t *testing.T) {
374373
AccessType: blockCap,
375374
}
376375

377-
tempDir, err := ioutil.TempDir("", "nsv")
376+
tempDir, err := os.MkdirTemp("", "nsv")
378377
if err != nil {
379378
t.Fatalf("Failed to set up temp dir: %v", err)
380379
}
@@ -785,7 +784,7 @@ func makeFakeCmd(fakeCmd *testingexec.FakeCmd, cmd string, args ...string) testi
785784
func TestNodeUnstageVolume(t *testing.T) {
786785
gceDriver := getTestGCEDriver(t)
787786
ns := gceDriver.ns
788-
tempDir, err := ioutil.TempDir("", "nusv")
787+
tempDir, err := os.MkdirTemp("", "nusv")
789788
if err != nil {
790789
t.Fatalf("Failed to set up temp dir: %v", err)
791790
}
@@ -853,7 +852,7 @@ func TestConcurrentNodeOperations(t *testing.T) {
853852
readyToExecute := make(chan chan struct{}, 1)
854853
gceDriver := getTestBlockingGCEDriver(t, readyToExecute)
855854
ns := gceDriver.ns
856-
tempDir, err := ioutil.TempDir("", "cno")
855+
tempDir, err := os.MkdirTemp("", "cno")
857856
if err != nil {
858857
t.Fatalf("Failed to set up temp dir: %v", err)
859858
}

release-tools/filter-junit.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ package main
2424
import (
2525
"encoding/xml"
2626
"flag"
27-
"io/ioutil"
2827
"os"
2928
"regexp"
3029
)
@@ -95,7 +94,7 @@ func main() {
9594
}
9695
} else {
9796
var err error
98-
data, err = ioutil.ReadFile(input)
97+
data, err = os.ReadFile(input)
9998
if err != nil {
10099
panic(err)
101100
}
@@ -142,7 +141,7 @@ func main() {
142141
panic(err)
143142
}
144143
} else {
145-
if err := ioutil.WriteFile(*output, data, 0644); err != nil {
144+
if err := os.WriteFile(*output, data, 0644); err != nil {
146145
panic(err)
147146
}
148147
}

test/k8s-integration/filter-junit.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package main
1919
import (
2020
"encoding/xml"
2121
"fmt"
22-
"io/ioutil"
2322
"os"
2423
"path/filepath"
2524
"regexp"
@@ -76,7 +75,7 @@ func MergeJUnit(testFilter string, sourceDirectories []string, destination strin
7675
var mergeErrors []string
7776
var filesToDelete []string
7877
for _, dir := range sourceDirectories {
79-
files, err := ioutil.ReadDir(dir)
78+
files, err := os.ReadDir(dir)
8079
if err != nil {
8180
klog.Errorf("Failed to read juint directory %s: %w", dir, err)
8281
mergeErrors = append(mergeErrors, err.Error())
@@ -88,7 +87,7 @@ func MergeJUnit(testFilter string, sourceDirectories []string, destination strin
8887
}
8988
fullFilename := filepath.Join(dir, file.Name())
9089
filesToDelete = append(filesToDelete, fullFilename)
91-
data, err := ioutil.ReadFile(fullFilename)
90+
data, err := os.ReadFile(fullFilename)
9291
if err != nil {
9392
return err
9493
}
@@ -121,7 +120,7 @@ func MergeJUnit(testFilter string, sourceDirectories []string, destination strin
121120
return err
122121
}
123122

124-
if err = ioutil.WriteFile(destination, data, 0644); err != nil {
123+
if err = os.WriteFile(destination, data, 0644); err != nil {
125124
return err
126125
}
127126

test/k8s-integration/utils.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package main
22

33
import (
4-
"io/ioutil"
54
"os"
65
"os/exec"
76

@@ -30,7 +29,7 @@ func runCommand(action string, cmd *exec.Cmd) error {
3029
}
3130

3231
func generateUniqueTmpDir() string {
33-
dir, err := ioutil.TempDir("", "gcp-pd-driver-tmp")
32+
dir, err := os.MkdirTemp("", "gcp-pd-driver-tmp")
3433
if err != nil {
3534
klog.Fatalf("Error creating temp dir: %w", err)
3635
}

test/remote/archiver.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package remote
1818

1919
import (
2020
"fmt"
21-
"io/ioutil"
2221
"os"
2322
"os/exec"
2423
"path/filepath"
@@ -28,7 +27,7 @@ import (
2827

2928
func CreateDriverArchive(archiveName, architecture, pkgPath, binPath string) (string, error) {
3029
klog.V(2).Infof("Building archive...")
31-
tarDir, err := ioutil.TempDir("", "driver-temp-archive")
30+
tarDir, err := os.MkdirTemp("", "driver-temp-archive")
3231
if err != nil {
3332
return "", fmt.Errorf("failed to create temporary directory %v", err.Error())
3433
}

test/remote/instance.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"context"
2121
"errors"
2222
"fmt"
23-
"io/ioutil"
2423
"net/http"
2524
"os"
2625
"strings"
@@ -388,7 +387,7 @@ func GetComputeBetaClient() (*computebeta.Service, error) {
388387
}
389388

390389
func generateMetadataWithPublicKey(pubKeyFile string) (*compute.Metadata, error) {
391-
publicKeyByte, err := ioutil.ReadFile(pubKeyFile)
390+
publicKeyByte, err := os.ReadFile(pubKeyFile)
392391
if err != nil {
393392
return nil, err
394393
}

0 commit comments

Comments
 (0)