Migrate from io/ioutil package to io and os packages

kubernetes-csi · Sep 12, 2023 · 5c9c3c3 · 5c9c3c3
1 parent 32c3fb3
commit 5c9c3c3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/connection/connection.go b/connection/connection.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
+	"os"
 	"strings"
 	"time"
 
@@ -107,7 +107,7 @@ func OnConnectionLoss(reconnect func() bool) Option {
 func ExitOnConnectionLoss() func() bool {
 	return func() bool {
 		terminationMsg := "Lost connection to CSI driver, exiting"
-		if err := ioutil.WriteFile(terminationLogPath, []byte(terminationMsg), 0644); err != nil {
+		if err := os.WriteFile(terminationLogPath, []byte(terminationMsg), 0644); err != nil {
 			klog.Errorf("%s: %s", terminationLogPath, err)
 		}
 		klog.Exit(terminationMsg)

diff --git a/connection/connection_test.go b/connection/connection_test.go
@@ -18,7 +18,6 @@ package connection
 
 import (
 	"context"
-	"io/ioutil"
 	"net"
 	"os"
 	"path"
@@ -43,7 +42,7 @@ import (
 )
 
 func tmpDir(t *testing.T) string {
-	dir, err := ioutil.TempDir("", "connect")
+	dir, err := os.MkdirTemp("", "connect")
 	require.NoError(t, err, "creating temp directory")
 	return dir
 }

diff --git a/leaderelection/leader_election.go b/leaderelection/leader_election.go
@@ -19,7 +19,6 @@ package leaderelection
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"regexp"
@@ -219,7 +218,7 @@ func inClusterNamespace() string {
 		return ns
 	}
 
-	if data, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"); err == nil {
+	if data, err := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"); err == nil {
 		if ns := strings.TrimSpace(string(data)); len(ns) > 0 {
 			return ns
 		}

diff --git a/metrics/metrics_test.go b/metrics/metrics_test.go
@@ -17,7 +17,7 @@ limitations under the License.
 package metrics
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -506,7 +506,7 @@ func TestRegisterToServer_Noop(t *testing.T) {
 		t.Fatalf("/metrics response status not 200. Response was: %+v", resp)
 	}
 
-	contentBytes, err := ioutil.ReadAll(resp.Body)
+	contentBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
 		t.Fatalf("Failed to parse metrics response.  Response was: %+v Error: %v", resp, err)
 	}
@@ -572,7 +572,7 @@ func testRegisterPprofToServer_AllEndpointsAvailable(t *testing.T, endpoint stri
 		t.Fatalf("%s response status not 200. Response was: %+v", endpoint, resp)
 	}
 
-	contentBytes, err := ioutil.ReadAll(resp.Body)
+	contentBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
 		t.Fatalf("Failed to parse pprof index response.  Response was: %+v Error: %v", resp, err)
 	}

diff --git a/rpc/common_test.go b/rpc/common_test.go
@@ -19,7 +19,6 @@ package rpc
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"path"
@@ -40,7 +39,7 @@ import (
 )
 
 func tmpDir(t *testing.T) string {
-	dir, err := ioutil.TempDir("", "connect")
+	dir, err := os.MkdirTemp("", "connect")
 	require.NoError(t, err, "creating temp directory")
 	return dir
 }