Merge pull request #577 from inteon/replace_deprecated_functions

Replace deprecated ioutil package

Author: inteon

cmd/agent.go

@@ -2,7 +2,7 @@ package cmd
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"github.com/jetstack/preflight/pkg/agent"
 	"github.com/jetstack/preflight/pkg/logs"
@@ -35,7 +35,7 @@ var agentRBACCmd = &cobra.Command{
 	Long:  `Print RBAC string by reading GVRs`,
 	Run: func(cmd *cobra.Command, args []string) {
 
-		b, err := ioutil.ReadFile(agent.Flags.ConfigFilePath)
+		b, err := os.ReadFile(agent.Flags.ConfigFilePath)
 		if err != nil {
 			logs.Log.Fatalf("Failed to read config file: %s", err)
 		}

pkg/agent/run.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	_ "net/http/pprof"
 	"os"
@@ -50,7 +50,7 @@ func Run(cmd *cobra.Command, args []string) {
 	}
 	defer file.Close()
 
-	b, err := ioutil.ReadAll(file)
+	b, err := io.ReadAll(file)
 	if err != nil {
 		logs.Log.Fatalf("Failed to read config file: %s", err)
 	}
@@ -194,7 +194,7 @@ func gatherAndOutputData(config Config, preflightClient client.Client, dataGathe
 
 	if Flags.InputPath != "" {
 		logs.Log.Printf("Reading data from local file: %s", Flags.InputPath)
-		data, err := ioutil.ReadFile(Flags.InputPath)
+		data, err := os.ReadFile(Flags.InputPath)
 		if err != nil {
 			logs.Log.Fatalf("failed to read local data file: %s", err)
 		}
@@ -211,7 +211,7 @@ func gatherAndOutputData(config Config, preflightClient client.Client, dataGathe
 		if err != nil {
 			logs.Log.Fatal("failed to marshal JSON")
 		}
-		err = ioutil.WriteFile(Flags.OutputPath, data, 0644)
+		err = os.WriteFile(Flags.OutputPath, data, 0644)
 		if err != nil {
 			logs.Log.Fatalf("failed to output to local file: %s", err)
 		}
@@ -320,7 +320,7 @@ func postData(config Config, preflightClient client.Client, readings []*api.Data
 		}
 		if code := res.StatusCode; code < 200 || code >= 300 {
 			errorContent := ""
-			body, _ := ioutil.ReadAll(res.Body)
+			body, _ := io.ReadAll(res.Body)
 			if err == nil {
 				errorContent = string(body)
 			}

pkg/client/client_api_token.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"path/filepath"
 	"time"
@@ -66,7 +65,7 @@ func (c *APITokenClient) PostDataReadings(orgID, clusterID string, readings []*a
 
 	if code := res.StatusCode; code < 200 || code >= 300 {
 		errorContent := ""
-		body, err := ioutil.ReadAll(res.Body)
+		body, err := io.ReadAll(res.Body)
 		if err == nil {
 			errorContent = string(body)
 		}

pkg/client/client_oauth.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"path/filepath"
@@ -120,7 +119,7 @@ func (c *OAuthClient) PostDataReadings(orgID, clusterID string, readings []*api.
 
 	if code := res.StatusCode; code < 200 || code >= 300 {
 		errorContent := ""
-		body, err := ioutil.ReadAll(res.Body)
+		body, err := io.ReadAll(res.Body)
 		if err == nil {
 			errorContent = string(body)
 		}
@@ -187,7 +186,7 @@ func (c *OAuthClient) renewAccessToken() error {
 		return errors.WithStack(err)
 	}
 
-	body, err := ioutil.ReadAll(res.Body)
+	body, err := io.ReadAll(res.Body)
 	if err != nil {
 		return errors.WithStack(err)
 	}

pkg/client/client_unauthenticated.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"path/filepath"
 	"time"
@@ -62,7 +61,7 @@ func (c *UnauthenticatedClient) PostDataReadings(orgID, clusterID string, readin
 
 	if code := res.StatusCode; code < 200 || code >= 300 {
 		errorContent := ""
-		body, err := ioutil.ReadAll(res.Body)
+		body, err := io.ReadAll(res.Body)
 		if err == nil {
 			errorContent = string(body)
 		}

pkg/datagatherer/k8s/client_test.go

@@ -1,7 +1,6 @@
 package k8s
 
 import (
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -55,7 +54,7 @@ func TestNewDiscoveryClient_InferredKubeconfig(t *testing.T) {
 }
 
 func writeConfigToFile(t *testing.T, cfg clientcmdapi.Config) string {
-	f, err := ioutil.TempFile("", "testcase-*")
+	f, err := os.CreateTemp("", "testcase-*")
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/datagatherer/local/local.go

@@ -3,7 +3,7 @@ package local
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"github.com/jetstack/preflight/pkg/datagatherer"
 )
@@ -55,7 +55,7 @@ func (g *DataGatherer) WaitForCacheSync(stopCh <-chan struct{}) error {
 
 // Fetch loads and returns the data from the LocalDatagatherer's dataPath
 func (g *DataGatherer) Fetch() (interface{}, int, error) {
-	dataBytes, err := ioutil.ReadFile(g.dataPath)
+	dataBytes, err := os.ReadFile(g.dataPath)
 	if err != nil {
 		return nil, -1, err
 	}