Address deprecated ioutil

Author: andy-tier1app

internal/agent/api/server_test.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"testing"
 	"yc-agent/internal/config"
@@ -37,7 +37,7 @@ func TestServer(t *testing.T) {
 		}
 
 		if resp.Body != nil {
-			all, err := ioutil.ReadAll(resp.Body)
+			all, err := io.ReadAll(resp.Body)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -82,7 +82,7 @@ func TestServerCmdActions(t *testing.T) {
 		}
 
 		if resp.Body != nil {
-			all, err := ioutil.ReadAll(resp.Body)
+			all, err := io.ReadAll(resp.Body)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -149,7 +149,7 @@ func TestServerForward(t *testing.T) {
 		}
 
 		if resp.Body != nil {
-			all, err := ioutil.ReadAll(resp.Body)
+			all, err := io.ReadAll(resp.Body)
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -199,7 +199,7 @@ func TestAttendanceAPI(t *testing.T) {
 		}
 
 		if resp.Body != nil {
-			all, err := ioutil.ReadAll(resp.Body)
+			all, err := io.ReadAll(resp.Body)
 			if err != nil {
 				t.Fatal(err)
 			}

internal/agent/ondemand/ondemand.go

@@ -7,7 +7,7 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"os/user"
@@ -988,7 +988,7 @@ func RequestFin(endpoint string) (resp []byte, err error) {
 	if len(path) > 0 {
 		pool := x509.NewCertPool()
 		var ca []byte
-		ca, err = ioutil.ReadFile(path)
+		ca, err = os.ReadFile(path)
 		if err != nil {
 			return
 		}
@@ -1008,7 +1008,7 @@ func RequestFin(endpoint string) (resp []byte, err error) {
 	post, err := httpClient.Do(req)
 	if err == nil {
 		defer post.Body.Close()
-		resp, err = ioutil.ReadAll(post.Body)
+		resp, err = io.ReadAll(post.Body)
 		if err == nil {
 			logger.Log(
 				`yc-fin endpoint: %s

internal/capture/boomi.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"strings"
 	"text/template"
@@ -533,7 +533,7 @@ func makeBoomiRequest(queryToken string, username string, password string, boomi
 			//fmt.Printf("Request Body: %s\n", string(bodyBytes))
 
 			// Reset the request body
-			req.Body = ioutil.NopCloser(bytes.NewReader(bodyBytes))
+			req.Body = io.NopCloser(bytes.NewReader(bodyBytes))
 		}
 
 		return nil
@@ -646,7 +646,7 @@ func makeAtomConnectorsRequest(queryToken string, username string, password stri
 			//fmt.Printf("Request Body: %s\n", string(bodyBytes))
 
 			// Reset the request body
-			req.Body = ioutil.NopCloser(bytes.NewReader(bodyBytes))
+			req.Body = io.NopCloser(bytes.NewReader(bodyBytes))
 		}
 
 		return nil

internal/capture/executils/shell.go

@@ -74,44 +74,6 @@ func (cmd *Command) AddDynamicArg(args ...string) (result Command, err error) {
 	return
 }
 
-func (cmd *Command) addDynamicArg(args ...string) (result Command, err error) {
-	if cmd == nil {
-		err = errors.New("invalid nil Command, please use NopCommand instead")
-		return
-	}
-	if *cmd == nil {
-		return NopCommand, nil
-	}
-	n := 0
-	for _, c := range *cmd {
-		if c == DynamicArg {
-			n++
-		}
-	}
-	if n != len(args) {
-		return *cmd, nil
-	}
-	if (*cmd)[0] == WaitCommand {
-		result = make(Command, 0, len(*cmd)+1)
-		result = append(result, WaitCommand)
-	} else {
-		result = make(Command, 0, len(*cmd))
-	}
-	i := 0
-	for _, c := range *cmd {
-		switch c {
-		case WaitCommand:
-			continue
-		case DynamicArg:
-			result = append(result, args[i])
-			i++
-		default:
-			result = append(result, c)
-		}
-	}
-	return
-}
-
 var Env []string
 
 func NewCommand(cmd Command, hookers ...Hooker) CmdManager {

internal/capture/gc_test.go

@@ -3,7 +3,7 @@ package capture
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 	"strings"
@@ -30,7 +30,7 @@ func TestProcessLogFile(t *testing.T) {
 			t.Fatal(err)
 		}
 		gc.Seek(0, 0)
-		all, err := ioutil.ReadAll(gc)
+		all, err := io.ReadAll(gc)
 		if err != nil {
 			t.Fatal(err)
 		}

internal/capture/post.go

@@ -5,7 +5,6 @@ import (
 	"crypto/x509"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
@@ -117,7 +116,7 @@ func PostCustomDataWithPositionFuncWithTimeout(endpoint, params string, file *os
 	path := config.GlobalConfig.CACertPath
 	if len(path) > 0 {
 		pool := x509.NewCertPool()
-		ca, err := ioutil.ReadFile(path)
+		ca, err := os.ReadFile(path)
 		if err != nil {
 			msg = err.Error()
 			return
@@ -148,7 +147,7 @@ func PostCustomDataWithPositionFuncWithTimeout(endpoint, params string, file *os
 	}
 
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		msg = fmt.Sprintf("PostData get resp err %s", err.Error())
 		return
@@ -173,7 +172,7 @@ func GetData(endpoint string) (msg string, ok bool) {
 	path := config.GlobalConfig.CACertPath
 	if len(path) > 0 {
 		pool := x509.NewCertPool()
-		ca, err := ioutil.ReadFile(path)
+		ca, err := os.ReadFile(path)
 		if err != nil {
 			msg = err.Error()
 			return
@@ -198,7 +197,7 @@ func GetData(endpoint string) (msg string, ok bool) {
 	}
 
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		msg = fmt.Sprintf("GetData get resp err %s", err.Error())
 		return

internal/capture/post_test.go

@@ -1,7 +1,7 @@
 package capture
 
 import (
-	"io/ioutil"
+	"io"
 	"os"
 	"testing"
 )
@@ -16,7 +16,7 @@ func TestLastNLines(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	bytes, err := ioutil.ReadAll(file)
+	bytes, err := io.ReadAll(file)
 	if err != nil {
 		t.Fatal(err)
 	}

internal/config/config_test.go

@@ -125,7 +125,7 @@ func TestConfig(t *testing.T) {
 		if len(GlobalConfig.ProcessTokens) != 2 {
 			t.Fail()
 		}
-		if GlobalConfig.M3Frequency != 5*time.Minute {
+		if GlobalConfig.M3Frequency != Duration(5*time.Minute) {
 			t.Fail()
 		}
 	})