Remove use of io/ioutil

This is a follow-up to #3403 io/ioutil has been deprecated since go 1.16 There are replacements for the functions it provides either in io or os.
crc-org · Nov 4, 2022 · 641ff18 · 641ff18
1 parent 5847f99
commit 641ff18
Show file tree

Hide file tree

Showing 46 changed files with 117 additions and 143 deletions.
diff --git a/cmd/crc-embedder/cmd/embed.go b/cmd/crc-embedder/cmd/embed.go
@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -46,7 +45,7 @@ func runEmbed(args []string) {
 	var err error
 	executablePath := args[0]
 	if cacheDir == "" {
-		cacheDir, err = ioutil.TempDir("", "crc-embedder")
+		cacheDir, err = os.MkdirTemp("", "crc-embedder")
 		if err != nil {
 			logging.Fatalf("Failed to create temporary directory: %v", err)
 		}

diff --git a/cmd/crc/cmd/daemon.go b/cmd/crc/cmd/daemon.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"os"
@@ -193,7 +193,7 @@ func run(configuration *types.Configuration) error {
 
 	if watchdog {
 		go func() {
-			if _, err := ioutil.ReadAll(os.Stdin); err != nil {
+			if _, err := io.ReadAll(os.Stdin); err != nil {
 				logging.Errorf("unexpected error while reading stdin: %v", err)
 			}
 			logging.Error("stdin is closed, shutdown...")

diff --git a/cmd/crc/cmd/status_test.go b/cmd/crc/cmd/status_test.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -51,7 +51,7 @@ func TestPlainStatus(t *testing.T) {
 
 	client := setUpClient(t)
 
-	require.NoError(t, ioutil.WriteFile(filepath.Join(cacheDir, "crc.qcow2"), make([]byte, 10000), 0600))
+	require.NoError(t, os.WriteFile(filepath.Join(cacheDir, "crc.qcow2"), make([]byte, 10000), 0600))
 
 	out := new(bytes.Buffer)
 	assert.NoError(t, runStatus(out, &daemonclient.Client{
@@ -73,7 +73,7 @@ func TestStatusWithoutPodman(t *testing.T) {
 	cacheDir := t.TempDir()
 
 	client := mocks.NewClient(t)
-	require.NoError(t, ioutil.WriteFile(filepath.Join(cacheDir, "crc.qcow2"), make([]byte, 10000), 0600))
+	require.NoError(t, os.WriteFile(filepath.Join(cacheDir, "crc.qcow2"), make([]byte, 10000), 0600))
 
 	client.On("Status").Return(apiClient.ClusterStatusResult{
 		CrcStatus:        string(state.Running),
@@ -104,7 +104,7 @@ func TestJsonStatus(t *testing.T) {
 
 	client := setUpClient(t)
 
-	require.NoError(t, ioutil.WriteFile(filepath.Join(cacheDir, "crc.qcow2"), make([]byte, 10000), 0600))
+	require.NoError(t, os.WriteFile(filepath.Join(cacheDir, "crc.qcow2"), make([]byte, 10000), 0600))
 
 	out := new(bytes.Buffer)
 	assert.NoError(t, runStatus(out, &daemonclient.Client{
@@ -132,7 +132,7 @@ func TestPlainStatusWithError(t *testing.T) {
 
 	client := setUpFailingClient(t)
 
-	require.NoError(t, ioutil.WriteFile(filepath.Join(cacheDir, "crc.qcow2"), make([]byte, 10000), 0600))
+	require.NoError(t, os.WriteFile(filepath.Join(cacheDir, "crc.qcow2"), make([]byte, 10000), 0600))
 
 	out := new(bytes.Buffer)
 	assert.EqualError(t, runStatus(out, &daemonclient.Client{
@@ -146,7 +146,7 @@ func TestJsonStatusWithError(t *testing.T) {
 
 	client := setUpFailingClient(t)
 
-	require.NoError(t, ioutil.WriteFile(filepath.Join(cacheDir, "crc.qcow2"), make([]byte, 10000), 0600))
+	require.NoError(t, os.WriteFile(filepath.Join(cacheDir, "crc.qcow2"), make([]byte, 10000), 0600))
 
 	out := new(bytes.Buffer)
 	assert.NoError(t, runStatus(out, &daemonclient.Client{
@@ -166,7 +166,7 @@ func TestStatusWithMemoryPodman(t *testing.T) {
 	cacheDir := t.TempDir()
 
 	client := mocks.NewClient(t)
-	require.NoError(t, ioutil.WriteFile(filepath.Join(cacheDir, "crc.qcow2"), make([]byte, 10000), 0600))
+	require.NoError(t, os.WriteFile(filepath.Join(cacheDir, "crc.qcow2"), make([]byte, 10000), 0600))
 
 	client.On("Status").Return(apiClient.ClusterStatusResult{
 		CrcStatus:        string(state.Running),

diff --git a/pkg/compress/compress_test.go b/pkg/compress/compress_test.go
@@ -2,7 +2,6 @@ package compress
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -121,7 +120,7 @@ func checkFiles(destDir string, files fileMap) error {
 		}
 		delete(files, archivePath)
 
-		data, err := ioutil.ReadFile(path) // #nosec G304
+		data, err := os.ReadFile(path) // #nosec G304
 		if err != nil {
 			return err
 		}

diff --git a/pkg/crc/api/api_client_test.go b/pkg/crc/api/api_client_test.go
@@ -1,9 +1,9 @@
 package api
 
 import (
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -277,7 +277,7 @@ func TestPullSecret(t *testing.T) {
 	assert.False(t, defined)
 
 	pullSecretFile := filepath.Join(dir, "pull-secret.json")
-	assert.NoError(t, ioutil.WriteFile(pullSecretFile, []byte(constants.OkdPullSecret), 0600))
+	assert.NoError(t, os.WriteFile(pullSecretFile, []byte(constants.OkdPullSecret), 0600))
 	_, err = config.Set(crcConfig.PullSecretFile, pullSecretFile)
 	assert.NoError(t, err)
 

diff --git a/pkg/crc/api/api_http_test.go b/pkg/crc/api/api_http_test.go
@@ -3,7 +3,6 @@ package api
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"net/http/httputil"
@@ -27,7 +26,7 @@ type mockServer struct {
 }
 
 func createDummyPullSecret(t *testing.T) string {
-	f, err := ioutil.TempFile("", "kubeconfig")
+	f, err := os.CreateTemp("", "kubeconfig")
 	assert.NoError(t, err)
 	_, err = f.WriteString(constants.OkdPullSecret)
 	assert.NoError(t, err)
@@ -464,7 +463,7 @@ func testOne(t *testing.T, testCase *testCase, server *mockServer) {
 	require.Equal(t, testCase.response.statusCode, resp.StatusCode, testCase.request)
 	require.Equal(t, testCase.response.protoMajor, resp.ProtoMajor, testCase.request)
 	require.Equal(t, testCase.response.protoMinor, resp.ProtoMinor, testCase.request)
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	require.NoError(t, err, testCase.request)
 	require.Equal(t, testCase.response.body, string(body), testCase.request)
 	fmt.Println("-----")

diff --git a/pkg/crc/api/client/client.go b/pkg/crc/api/client/client.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
@@ -218,7 +217,7 @@ func (c *client) sendGetRequest(url string) ([]byte, error) {
 	}
 	defer res.Body.Close()
 
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		return nil, fmt.Errorf("Unknown error reading response: %w", err)
 	}
@@ -267,7 +266,7 @@ func (c *client) sendRequest(url string, method string, data io.Reader) ([]byte,
 		}
 	}
 
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		return nil, fmt.Errorf("Unknown error reading response: %w", err)
 	}

diff --git a/pkg/crc/api/helpers.go b/pkg/crc/api/helpers.go
@@ -2,7 +2,7 @@ package api
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"sync"
@@ -99,7 +99,7 @@ func (s *server) Handler() http.Handler {
 		}
 		s.routesLock.RUnlock()
 
-		requestBody, err := ioutil.ReadAll(r.Body)
+		requestBody, err := io.ReadAll(r.Body)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return

diff --git a/pkg/crc/cache/cache.go b/pkg/crc/cache/cache.go
@@ -2,7 +2,6 @@ package cache
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -108,7 +107,7 @@ func (c *Cache) CacheExecutable() error {
 	}
 
 	// Create tmp dir to download the requested tarball
-	tmpDir, err := ioutil.TempDir("", "crc")
+	tmpDir, err := os.MkdirTemp("", "crc")
 	if err != nil {
 		return err
 	}

diff --git a/pkg/crc/cluster/cluster.go b/pkg/crc/cluster/cluster.go
@@ -6,7 +6,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"regexp"
 	"strconv"
 	"strings"
@@ -105,7 +105,7 @@ func GetRAMUsage(sshRunner *ssh.Runner) (int64, int64, error) {
 }
 
 func EnsureSSHKeyPresentInTheCluster(ctx context.Context, ocConfig oc.Config, sshPublicKeyPath string) error {
-	sshPublicKeyByte, err := ioutil.ReadFile(sshPublicKeyPath)
+	sshPublicKeyByte, err := os.ReadFile(sshPublicKeyPath)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/crc/cluster/clusteroperator_test.go b/pkg/crc/cluster/clusteroperator_test.go
@@ -3,7 +3,7 @@ package cluster
 import (
 	"context"
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -40,7 +40,7 @@ type mockLister struct {
 }
 
 func (r *mockLister) List(ctx context.Context, opts metav1.ListOptions) (*v1.ClusterOperatorList, error) {
-	bin, err := ioutil.ReadFile(r.file)
+	bin, err := os.ReadFile(r.file)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/crc/cluster/kubeadmin_password.go b/pkg/crc/cluster/kubeadmin_password.go
@@ -7,8 +7,8 @@ import (
 	"crypto/rand"
 	"encoding/base64"
 	"fmt"
-	"io/ioutil"
 	"math/big"
+	"os"
 	"strings"
 
 	"github.com/crc-org/crc/pkg/crc/constants"
@@ -25,14 +25,14 @@ func GenerateKubeAdminUserPassword() error {
 	if err != nil {
 		return fmt.Errorf("Cannot generate the kubeadmin user password: %w", err)
 	}
-	return ioutil.WriteFile(kubeAdminPasswordFile, []byte(kubeAdminPassword), 0600)
+	return os.WriteFile(kubeAdminPasswordFile, []byte(kubeAdminPassword), 0600)
 }
 
 // UpdateKubeAdminUserPassword updates the htpasswd secret
 func UpdateKubeAdminUserPassword(ctx context.Context, ocConfig oc.Config, newPassword string) error {
 	if newPassword != "" {
 		logging.Infof("Overriding password for kubeadmin user")
-		if err := ioutil.WriteFile(constants.GetKubeAdminPasswordPath(), []byte(strings.TrimSpace(newPassword)), 0600); err != nil {
+		if err := os.WriteFile(constants.GetKubeAdminPasswordPath(), []byte(strings.TrimSpace(newPassword)), 0600); err != nil {
 			return err
 		}
 	}
@@ -79,7 +79,7 @@ func UpdateKubeAdminUserPassword(ctx context.Context, ocConfig oc.Config, newPas
 
 func GetKubeadminPassword() (string, error) {
 	kubeAdminPasswordFile := constants.GetKubeAdminPasswordPath()
-	rawData, err := ioutil.ReadFile(kubeAdminPasswordFile)
+	rawData, err := os.ReadFile(kubeAdminPasswordFile)
 	if err != nil {
 		return "", err
 	}

diff --git a/pkg/crc/cluster/pullsecret.go b/pkg/crc/cluster/pullsecret.go
@@ -7,7 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
+	"os"
 	"strings"
 
 	crcConfig "github.com/crc-org/crc/pkg/crc/config"
@@ -156,7 +156,7 @@ func loadFile(path string) (string, error) {
 	if path == "" {
 		return "", errors.New("empty path")
 	}
-	data, err := ioutil.ReadFile(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		return "", err
 	}

diff --git a/pkg/crc/cluster/pullsecret_test.go b/pkg/crc/cluster/pullsecret_test.go
@@ -1,7 +1,7 @@
 package cluster
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -39,15 +39,15 @@ func TestLoadPullSecret(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, secret3, val)
 
-	assert.NoError(t, ioutil.WriteFile(filepath.Join(dir, "file2"), []byte(secret2), 0600))
+	assert.NoError(t, os.WriteFile(filepath.Join(dir, "file2"), []byte(secret2), 0600))
 	_, err = cfg.Set(config.PullSecretFile, filepath.Join(dir, "file2"))
 	assert.NoError(t, err)
 
 	val, err = loader.Value()
 	assert.NoError(t, err)
 	assert.Equal(t, secret2, val)
 
-	assert.NoError(t, ioutil.WriteFile(filepath.Join(dir, "file2"), []byte(secret1), 0600))
+	assert.NoError(t, os.WriteFile(filepath.Join(dir, "file2"), []byte(secret1), 0600))
 
 	val, err = loader.Value()
 	assert.NoError(t, err)

diff --git a/pkg/crc/config/viper_config.go b/pkg/crc/config/viper_config.go
@@ -3,7 +3,6 @@ package config
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -68,7 +67,7 @@ func (c *ViperStorage) Set(key string, value interface{}) error {
 	if err := ensureConfigFileExists(c.configFile); err != nil {
 		return err
 	}
-	in, err := ioutil.ReadFile(c.configFile)
+	in, err := os.ReadFile(c.configFile)
 	if err != nil {
 		return err
 	}
@@ -90,7 +89,7 @@ func (c *ViperStorage) Unset(key string) error {
 	if err := ensureConfigFileExists(c.configFile); err != nil {
 		return err
 	}
-	in, err := ioutil.ReadFile(c.configFile)
+	in, err := os.ReadFile(c.configFile)
 	if err != nil {
 		return err
 	}
@@ -118,15 +117,15 @@ func (c *ViperStorage) BindFlagSet(flagSet *pflag.FlagSet) error {
 func ensureConfigFileExists(file string) error {
 	_, err := os.Stat(file)
 	if os.IsNotExist(err) {
-		return ioutil.WriteFile(file, []byte("{}\n"), 0600)
+		return os.WriteFile(file, []byte("{}\n"), 0600)
 	}
 	return err
 }
 
 func atomicWrite(bin []byte, configFile string) error {
 	ext := filepath.Ext(configFile)
 	pattern := fmt.Sprintf("%s*%s", strings.TrimSuffix(filepath.Base(configFile), ext), ext)
-	tmpFile, err := ioutil.TempFile(filepath.Dir(configFile), pattern)
+	tmpFile, err := os.CreateTemp(filepath.Dir(configFile), pattern)
 	if err != nil {
 		return err
 	}
@@ -136,7 +135,7 @@ func atomicWrite(bin []byte, configFile string) error {
 	if err := tmpFile.Close(); err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(tmpFile.Name(), bin, 0600); err != nil {
+	if err := os.WriteFile(tmpFile.Name(), bin, 0600); err != nil {
 		return err
 	}
 	return os.Rename(tmpFile.Name(), configFile)