Merge pull request #1285 from testwill/ioutil

chore: remove refs to deprecated io/ioutil

Author: k8s-ci-robot

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

@@ -18,7 +18,6 @@ package gceGCEDriver
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -95,7 +94,7 @@ func TestNodeGetVolumeStats(t *testing.T) {
 	gceDriver := getTestGCEDriver(t)
 	ns := gceDriver.ns
 
-	tempDir, err := ioutil.TempDir("", "ngvs")
+	tempDir, err := os.MkdirTemp("", "ngvs")
 	if err != nil {
 		t.Fatalf("Failed to set up temp dir: %v", err)
 	}
@@ -226,7 +225,7 @@ func TestNodePublishVolume(t *testing.T) {
 	gceDriver := getTestGCEDriver(t)
 	ns := gceDriver.ns
 
-	tempDir, err := ioutil.TempDir("", "npv")
+	tempDir, err := os.MkdirTemp("", "npv")
 	if err != nil {
 		t.Fatalf("Failed to set up temp dir: %v", err)
 	}
@@ -325,7 +324,7 @@ func TestNodeUnpublishVolume(t *testing.T) {
 	gceDriver := getTestGCEDriver(t)
 	ns := gceDriver.ns
 
-	tempDir, err := ioutil.TempDir("", "nupv")
+	tempDir, err := os.MkdirTemp("", "nupv")
 	if err != nil {
 		t.Fatalf("Failed to set up temp dir: %v", err)
 	}
@@ -387,7 +386,7 @@ func TestNodeStageVolume(t *testing.T) {
 		AccessType: blockCap,
 	}
 
-	tempDir, err := ioutil.TempDir("", "nsv")
+	tempDir, err := os.MkdirTemp("", "nsv")
 	if err != nil {
 		t.Fatalf("Failed to set up temp dir: %v", err)
 	}
@@ -798,7 +797,7 @@ func makeFakeCmd(fakeCmd *testingexec.FakeCmd, cmd string, args ...string) testi
 func TestNodeUnstageVolume(t *testing.T) {
 	gceDriver := getTestGCEDriver(t)
 	ns := gceDriver.ns
-	tempDir, err := ioutil.TempDir("", "nusv")
+	tempDir, err := os.MkdirTemp("", "nusv")
 	if err != nil {
 		t.Fatalf("Failed to set up temp dir: %v", err)
 	}
@@ -864,7 +863,7 @@ func TestNodeGetCapabilities(t *testing.T) {
 
 func runBlockingFormatAndMount(t *testing.T, gceDriver *GCEDriver, readyToExecute chan chan struct{}) {
 	ns := gceDriver.ns
-	tempDir, err := ioutil.TempDir("", "cno")
+	tempDir, err := os.MkdirTemp("", "cno")
 	if err != nil {
 		t.Fatalf("Failed to set up temp dir: %v", err)
 	}

release-tools/filter-junit.go

@@ -24,7 +24,6 @@ package main
 import (
 	"encoding/xml"
 	"flag"
-	"io/ioutil"
 	"os"
 	"regexp"
 )
@@ -95,7 +94,7 @@ func main() {
 			}
 		} else {
 			var err error
-			data, err = ioutil.ReadFile(input)
+			data, err = os.ReadFile(input)
 			if err != nil {
 				panic(err)
 			}
@@ -142,7 +141,7 @@ func main() {
 			panic(err)
 		}
 	} else {
-		if err := ioutil.WriteFile(*output, data, 0644); err != nil {
+		if err := os.WriteFile(*output, data, 0644); err != nil {
 			panic(err)
 		}
 	}

test/k8s-integration/filter-junit.go

@@ -19,7 +19,6 @@ package main
 import (
 	"encoding/xml"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -76,7 +75,7 @@ func MergeJUnit(testFilter string, sourceDirectories []string, destination strin
 	var mergeErrors []string
 	var filesToDelete []string
 	for _, dir := range sourceDirectories {
-		files, err := ioutil.ReadDir(dir)
+		files, err := os.ReadDir(dir)
 		if err != nil {
 			klog.Errorf("Failed to read juint directory %s: %w", dir, err)
 			mergeErrors = append(mergeErrors, err.Error())
@@ -88,7 +87,7 @@ func MergeJUnit(testFilter string, sourceDirectories []string, destination strin
 			}
 			fullFilename := filepath.Join(dir, file.Name())
 			filesToDelete = append(filesToDelete, fullFilename)
-			data, err := ioutil.ReadFile(fullFilename)
+			data, err := os.ReadFile(fullFilename)
 			if err != nil {
 				return err
 			}
@@ -121,7 +120,7 @@ func MergeJUnit(testFilter string, sourceDirectories []string, destination strin
 		return err
 	}
 
-	if err = ioutil.WriteFile(destination, data, 0644); err != nil {
+	if err = os.WriteFile(destination, data, 0644); err != nil {
 		return err
 	}
 

test/k8s-integration/utils.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"io/ioutil"
 	"os"
 	"os/exec"
 
@@ -30,7 +29,7 @@ func runCommand(action string, cmd *exec.Cmd) error {
 }
 
 func generateUniqueTmpDir() string {
-	dir, err := ioutil.TempDir("", "gcp-pd-driver-tmp")
+	dir, err := os.MkdirTemp("", "gcp-pd-driver-tmp")
 	if err != nil {
 		klog.Fatalf("Error creating temp dir: %w", err)
 	}

test/remote/archiver.go

@@ -18,7 +18,6 @@ package remote
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -28,7 +27,7 @@ import (
 
 func CreateDriverArchive(archiveName, architecture, pkgPath, binPath string) (string, error) {
 	klog.V(2).Infof("Building archive...")
-	tarDir, err := ioutil.TempDir("", "driver-temp-archive")
+	tarDir, err := os.MkdirTemp("", "driver-temp-archive")
 	if err != nil {
 		return "", fmt.Errorf("failed to create temporary directory %v", err.Error())
 	}

test/remote/instance.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"strings"
@@ -388,7 +387,7 @@ func GetComputeBetaClient() (*computebeta.Service, error) {
 }
 
 func generateMetadataWithPublicKey(pubKeyFile string) (*compute.Metadata, error) {
-	publicKeyByte, err := ioutil.ReadFile(pubKeyFile)
+	publicKeyByte, err := os.ReadFile(pubKeyFile)
 	if err != nil {
 		return nil, err
 	}