[metricbeat] replace depricated io/ioutil

metricbeat/autodiscover/appender/kubernetes/token/token.go

@@ -19,7 +19,7 @@
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"github.com/elastic/beats/v7/libbeat/autodiscover"
 	"github.com/elastic/beats/v7/libbeat/common/cfgwarn"
@@ -31,7 +31,7 @@
 )
 
 func init() {
 	autodiscover.Registry.AddAppender("kubernetes.token", NewTokenAppender)
 }
 
 type tokenAppender struct {
@@ -47,7 +47,7 @@
 
 	err := cfg.Unpack(&conf)
 	if err != nil {
 		return nil, fmt.Errorf("unable to unpack config due to error: %v", err)
 	}
 
 	var cond conditions.Condition
@@ -55,7 +55,7 @@
 		// Attempt to create a condition. If fails then report error
 		cond, err = conditions.NewCondition(conf.ConditionConfig)
 		if err != nil {
 			return nil, fmt.Errorf("unable to create condition due to error: %v", err)
 		}
 	}
 	appender := tokenAppender{
@@ -81,7 +81,7 @@
 	}
 
 	// Check if the condition is met. Attempt to append only if that is the case.
 	if t.Condition == nil || t.Condition.Check(mapstr.M(event)) == true {
 		tok := t.getAuthHeaderFromToken()
 		// If token is empty then just return
 		if tok == "" {
@@ -127,7 +127,7 @@
 	var token string
 
 	if t.TokenPath != "" {
-		b, err := ioutil.ReadFile(t.TokenPath)
+		b, err := os.ReadFile(t.TokenPath)
 		if err != nil {
 			logp.Err("Reading token file failed with err: %v", err)
 		}

metricbeat/autodiscover/appender/kubernetes/token/token_test.go

@@ -18,7 +18,6 @@
 package token
 
 import (
-	"io/ioutil"
 	"os"
 	"testing"
 
@@ -93,7 +92,7 @@
 		assert.Equal(t, len(cfgs), 1)
 
 		out := mapstr.M{}
 		cfgs[0].Unpack(&out)
 
 		assert.Equal(t, out, test.result)
 		deleteFile("test")
@@ -101,7 +100,7 @@
 }
 
 func writeFile(name, message string) {
-	ioutil.WriteFile(name, []byte(message), os.ModePerm)
+	os.WriteFile(name, []byte(message), os.ModePerm)
 }
 
 func deleteFile(name string) {

metricbeat/helper/http.go

@@ -23,8 +23,8 @@
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
+	"os"
 
 	"github.com/elastic/beats/v7/libbeat/version"
 	"github.com/elastic/beats/v7/metricbeat/helper/dialer"
@@ -115,7 +115,7 @@
 		reader = bytes.NewReader(h.body)
 	}
 
 	req, err := http.NewRequest(h.method, h.uri, reader)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create HTTP request: %w", err)
 	}
@@ -126,7 +126,7 @@
 
 	resp, err := h.client.Do(req)
 	if err != nil {
 		return nil, fmt.Errorf("error making http request: %v", err)
 	}
 
 	return resp, nil
@@ -179,7 +179,7 @@
 		return nil, fmt.Errorf("HTTP error %d in %s: %s", resp.StatusCode, h.name, resp.Status)
 	}
 
-	return ioutil.ReadAll(resp.Body)
+	return io.ReadAll(resp.Body)
 }
 
 // FetchScanner returns a Scanner for the content.
@@ -214,7 +214,7 @@
 func getAuthHeaderFromToken(path string) (string, error) {
 	var token string
 
-	b, err := ioutil.ReadFile(path)
+	b, err := os.ReadFile(path)
 	if err != nil {
 		return "", fmt.Errorf("reading bearer token file: %w", err)
 	}

metricbeat/helper/http_test.go

@@ -19,7 +19,7 @@
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"net/http/httptest"
@@ -55,7 +55,7 @@
 	for _, test := range tests {
 		t.Run(test.Name, func(t *testing.T) {
 			content := []byte(test.Content)
-			tmpfile, err := ioutil.TempFile("", "token")
+			tmpfile, err := os.CreateTemp("", "token")
 			if err != nil {
 				t.Fatal(err)
 			}
@@ -236,14 +236,14 @@
 			fmt.Fprintf(w, "ehlo!")
 		})
 
 		go http.Serve(l, mux)
 
 		return l
 	}
 
 	for title, c := range cases {
 		t.Run(title, func(t *testing.T) {
-			tmpDir, err := ioutil.TempDir("", "testsocket")
+			tmpDir, err := os.MkdirTemp("", "testsocket")
 			require.NoError(t, err)
 			defer os.RemoveAll(tmpDir)
 
@@ -262,7 +262,7 @@
 			r, err := h.FetchResponse()
 			require.NoError(t, err)
 			defer r.Body.Close()
-			content, err := ioutil.ReadAll(r.Body)
+			content, err := io.ReadAll(r.Body)
 			require.NoError(t, err)
 			assert.Equal(t, []byte("ehlo!"), content)
 		})

metricbeat/helper/kubernetes/ktest/ktest.go

@@ -18,7 +18,7 @@
 package ktest
 
 import (
-	"io/ioutil"
+	"os"
 	"strings"
 	"testing"
 
@@ -57,7 +57,7 @@ func GetTestCases(files []string) ptest.TestCases {
 func TestMetricsFamily(t *testing.T, files []string, mapping *p.MetricsMapping) {
 	metricsFiles := map[string][]string{}
 	for i := 0; i < len(files); i++ {
-		content, err := ioutil.ReadFile(files[i])
+		content, err := os.ReadFile(files[i])
 		if err != nil {
 			t.Fatalf("Unknown file %s.", files[i])
 		}

metricbeat/helper/server/http/http.go

@@ -19,7 +19,7 @@
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"strconv"
@@ -72,7 +72,7 @@
 		stop:       cancel,
 	}
 
 	httpServer := &http.Server{
 		Addr: net.JoinHostPort(config.Host, strconv.Itoa(int(config.Port))),
 	}
 	if tlsConfig != nil {
@@ -147,7 +147,7 @@
 			meta["Content-Type"] = contentType
 		}
 
-		body, err := ioutil.ReadAll(req.Body)
+		body, err := io.ReadAll(req.Body)
 		if err != nil {
 			logp.Err("Error reading body: %v", err)
 			http.Error(writer, "Unexpected error reading request payload", http.StatusBadRequest)

metricbeat/helper/server/http/http_test.go

@@ -24,7 +24,7 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"strconv"
@@ -212,6 +212,10 @@ func writeToServer(t *testing.T, message, host string, port int, connectionMetho
 	url := fmt.Sprintf("%s://%s:%d/", strings.ToLower(connectionType), host, port)
 	var str = []byte(message)
 	req, err := http.NewRequest(connectionMethod, url, bytes.NewBuffer(str))
+	if err != nil {
+		t.Error(err)
+		t.FailNow()
+	}
 	req.Header.Set("Content-Type", "text/plain")
 	client := &http.Client{}
 	if connectionType == "HTTPS" {
@@ -230,7 +234,7 @@ func writeToServer(t *testing.T, message, host string, port int, connectionMetho
 
 	if connectionMethod == "GET" {
 		if resp.StatusCode == http.StatusOK {
-			bodyBytes, err2 := ioutil.ReadAll(resp.Body)
+			bodyBytes, err2 := io.ReadAll(resp.Body)
 			if err2 != nil {
 				t.Error(err)
 				t.FailNow()

metricbeat/mb/lightmodules.go

@@ -19,7 +19,6 @@ package mb
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -260,7 +259,7 @@ func (s *LightModulesSource) moduleNames() ([]string, error) {
 			s.log.Debugf("Light modules directory '%d' doesn't exist", dir)
 			continue
 		}
-		files, err := ioutil.ReadDir(dir)
+		files, err := os.ReadDir(dir)
 		if err != nil {
 			return nil, fmt.Errorf("listing modules on path '%s': %w", dir, err)
 		}

metricbeat/mb/testing/data_generator.go

@@ -20,7 +20,6 @@ package testing
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"testing"
@@ -184,7 +183,7 @@ func WriteEventToDataJSON(t testing.TB, fullEvent beat.Event, postfixPath string
 		t.Fatal(err)
 	}
 
-	if err = ioutil.WriteFile(p, output, 0644); err != nil {
+	if err = os.WriteFile(p, output, 0644); err != nil {
 		t.Fatal(err)
 	}
 }

metricbeat/mb/testing/lightmodules_test.go

@@ -22,7 +22,6 @@ package testing
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -103,7 +102,7 @@ func TestDataLightModuleWithProcessors(t *testing.T) {
 	assert.Empty(t, errs)
 	assert.NotEmpty(t, events)
 
-	dir, err := ioutil.TempDir("", "_meta-*")
+	dir, err := os.MkdirTemp("", "_meta-*")
 	require.NoError(t, err)
 	defer os.RemoveAll(dir)
 
@@ -127,7 +126,7 @@ func TestDataLightModuleWithProcessors(t *testing.T) {
 		}
 	}
 
-	d, err := ioutil.ReadFile(dataPath)
+	d, err := os.ReadFile(dataPath)
 	require.NoError(t, err)
 
 	err = json.Unmarshal(d, &event)

metricbeat/mb/testing/testdata.go

@@ -20,9 +20,9 @@ package testing
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -131,7 +131,7 @@ func ReadDataConfig(t *testing.T, f string) DataConfig {
 	t.Helper()
 	config := defaultDataConfig()
 
-	configFile, err := ioutil.ReadFile(f)
+	configFile, err := os.ReadFile(f)
 	if err != nil {
 		t.Fatalf("failed to read '%s': %v", f, err)
 	}
@@ -294,13 +294,13 @@ func runTest(t *testing.T, file string, module, metricSetName string, config Dat
 		if err != nil {
 			t.Fatal(err)
 		}
-		if err = ioutil.WriteFile(expectedFile, outputIndented, 0644); err != nil {
+		if err = os.WriteFile(expectedFile, outputIndented, 0644); err != nil {
 			t.Fatal(err)
 		}
 	}
 
 	// Read expected file
-	expected, err := ioutil.ReadFile(expectedFile)
+	expected, err := os.ReadFile(expectedFile)
 	if err != nil {
 		t.Fatalf("could not read file: %s", err)
 	}
@@ -362,7 +362,11 @@ func writeDataJSON(t *testing.T, data mapstr.M, path string) {
 	// Add hardcoded timestamp
 	data.Put("@timestamp", "2019-03-01T08:05:34.853Z")
 	output, err := json.MarshalIndent(&data, "", "    ")
-	if err = ioutil.WriteFile(path, output, 0644); err != nil {
+	if err != nil {
+		t.Error(err)
+		t.FailNow()
+	}
+	if err = os.WriteFile(path, output, 0644); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -494,7 +498,7 @@ func getConfig(module, metricSet, url string, config DataConfig) map[string]inte
 // server starts a server with a mock output
 func server(t *testing.T, path string, url string, contentType string) *httptest.Server {
 
-	body, err := ioutil.ReadFile(path)
+	body, err := os.ReadFile(path)
 	if err != nil {
 		t.Fatalf("could not read file: %s", err)
 	}

metricbeat/module/beat/state/data_test.go

@@ -20,7 +20,7 @@
 package state
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -42,7 +42,7 @@ func TestEventMapping(t *testing.T) {
 	}
 
 	for _, f := range files {
-		input, err := ioutil.ReadFile(f)
+		input, err := os.ReadFile(f)
 		require.NoError(t, err)
 
 		reporter := &mbtest.CapturingReporterV2{}

metricbeat/module/beat/stats/data_test.go

@@ -20,7 +20,7 @@
 package stats
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -44,7 +44,7 @@ func TestEventMapping(t *testing.T) {
 	clusterUUID := "foo"
 
 	for _, f := range files {
-		input, err := ioutil.ReadFile(f)
+		input, err := os.ReadFile(f)
 		require.NoError(t, err)
 
 		reporter := &mbtest.CapturingReporterV2{}

metricbeat/module/ceph/cluster_disk/cluster_disk_test.go

@@ -18,9 +18,9 @@
 package cluster_disk
 
 import (
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -34,7 +34,7 @@ func TestFetchEventContents(t *testing.T) {
 	absPath, err := filepath.Abs("../_meta/testdata/")
 	assert.NoError(t, err)
 
-	response, err := ioutil.ReadFile(absPath + "/df_sample_response.json")
+	response, err := os.ReadFile(absPath + "/df_sample_response.json")
 	assert.NoError(t, err)
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

metricbeat/module/ceph/cluster_health/cluster_health_test.go

@@ -18,9 +18,9 @@
 package cluster_health
 
 import (
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -34,7 +34,7 @@ func TestFetchEventContents(t *testing.T) {
 	absPath, err := filepath.Abs("../_meta/testdata/")
 	assert.NoError(t, err)
 
-	response, err := ioutil.ReadFile(absPath + "/sample_response.json")
+	response, err := os.ReadFile(absPath + "/sample_response.json")
 	assert.NoError(t, err)
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

metricbeat/module/ceph/cluster_status/cluster_status_test.go

@@ -18,9 +18,9 @@
 package cluster_status
 
 import (
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"path/filepath"
 	"testing"
 
@@ -34,7 +34,7 @@ func TestFetchEventContents(t *testing.T) {
 	absPath, err := filepath.Abs("../_meta/testdata/")
 	assert.NoError(t, err)
 
-	response, err := ioutil.ReadFile(absPath + "/status_sample_response.json")
+	response, err := os.ReadFile(absPath + "/status_sample_response.json")
 	assert.NoError(t, err)
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {