github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-06-24 07:14:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the usages of deprecated io/ioutil package

Browse Source
This commit is contained in:
M. Mert Yildiran 2022-11-22 19:01:15 +03:00
parent 5250e4bde8
commit 71d1323640
No known key found for this signature in database
GPG Key ID: DA5D6DCBB758A461
24 changed files with 70 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
acceptanceTests/config_test.go
View File

@ -2,7 +2,6 @@ package acceptanceTests
import (
"fmt"
"io/ioutil"
"os"
"os/exec"
"testing"
@ -58,7 +57,7 @@ func TestConfigRegenerate(t *testing.T) {
return
}
_, readFileErr := ioutil.ReadFile(configPath)
_, readFileErr := os.ReadFile(configPath)
if readFileErr != nil {
t.Errorf("failed to read config file, err: %v", readFileErr)
return
@ -95,7 +94,7 @@ func TestConfigGuiPort(t *testing.T) {
return
}
if writeErr := ioutil.WriteFile(configPath, configBytes, 0644); writeErr != nil {
if writeErr := os.WriteFile(configPath, configBytes, 0644); writeErr != nil {
t.Errorf("failed to write config to file, err: %v", writeErr)
return
}
@ -168,7 +167,7 @@ func TestConfigSetGuiPort(t *testing.T) {
return
}
if writeErr := ioutil.WriteFile(configPath, configBytes, 0644); writeErr != nil {
if writeErr := os.WriteFile(configPath, configBytes, 0644); writeErr != nil {
t.Errorf("failed to write config to file, err: %v", writeErr)
return
}
@ -243,7 +242,7 @@ func TestConfigFlagGuiPort(t *testing.T) {
return
}
if writeErr := ioutil.WriteFile(configPath, configBytes, 0644); writeErr != nil {
if writeErr := os.WriteFile(configPath, configBytes, 0644); writeErr != nil {
t.Errorf("failed to write config to file, err: %v", writeErr)
return
}

4
acceptanceTests/tap_test.go
View File

@ -3,7 +3,7 @@ package acceptanceTests
import (
"archive/zip"
"fmt"
"io/ioutil"
"os"
"os/exec"
"path"
"strings"
@ -532,7 +532,7 @@ func TestTapDumpLogs(t *testing.T) {
return
}
files, readErr := ioutil.ReadDir(kubesharkFolderPath)
files, readErr := os.ReadDir(kubesharkFolderPath)
if readErr != nil {
t.Errorf("failed to read kubeshark folder files, err: %v", readErr)
return

4
acceptanceTests/testsUtils.go
View File

@ -5,7 +5,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"os"
"os/exec"
@ -330,7 +330,7 @@ func ExecuteHttpRequest(response *http.Response, requestErr error) (interface{},
defer func() { response.Body.Close() }()
data, readErr := ioutil.ReadAll(response.Body)
data, readErr := io.ReadAll(response.Body)
if readErr != nil {
return nil, readErr
}

5
agent/main.go
View File

@ -5,7 +5,6 @@ import (
"errors"
"flag"
"fmt"
"io/ioutil"
"net/http"
"os"
"os/signal"
@ -223,7 +222,7 @@ func disableRootStaticCache() gin.HandlerFunc {
}
func setUIFlags(uiIndexPath string) error {
read, err := ioutil.ReadFile(uiIndexPath)
read, err := os.ReadFile(uiIndexPath)
if err != nil {
return err
}
@ -231,7 +230,7 @@ func setUIFlags(uiIndexPath string) error {
replacedContent := strings.Replace(string(read), "__IS_OAS_ENABLED__", strconv.FormatBool(config.Config.OAS.Enable), 1)
replacedContent = strings.Replace(replacedContent, "__IS_SERVICE_MAP_ENABLED__", strconv.FormatBool(config.Config.ServiceMap), 1)
err = ioutil.WriteFile(uiIndexPath, []byte(replacedContent), 0)
err = os.WriteFile(uiIndexPath, []byte(replacedContent), 0)
if err != nil {
return err
}

3
agent/pkg/config/config.go
View File

@ -3,7 +3,6 @@ package config
import (
"encoding/json"
"fmt"
"io/ioutil"
"os"
"github.com/kubeshark/kubeshark/shared"
@ -23,7 +22,7 @@ func LoadConfig() error {
}
filePath := fmt.Sprintf("%s%s", shared.ConfigDirPath, shared.ConfigFileName)
content, err := ioutil.ReadFile(filePath)
content, err := os.ReadFile(filePath)
if err != nil {
if os.IsNotExist(err) {
return applyDefaultConfig()

3
agent/pkg/oas/feeder_test.go
View File

@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"net/url"
"os"
"path/filepath"
@ -111,7 +110,7 @@ func feedFromHAR(file string, isSync bool, gen *defaultOasGenerator) (uint, erro
defer fd.Close()
data, err := ioutil.ReadAll(fd)
data, err := io.ReadAll(fd)
if err != nil {
return 0, err
}

3
agent/pkg/oas/specgen.go
View File

@ -4,7 +4,6 @@ import (
"encoding/json"
"errors"
"io"
"io/ioutil"
"mime"
"mime/multipart"
"net/textproto"
@ -615,7 +614,7 @@ func handleFormDataMultipart(text string, content *openapi.MediaType, ctypeParam
}
defer part.Close()
body, err := ioutil.ReadAll(part)
body, err := io.ReadAll(part)
if err != nil {
logger.Log.Errorf("Error reading multipart Part %s: %v", part.Header, err)
}

12
agent/pkg/oas/specgen_test.go
View File

@ -2,7 +2,7 @@ package oas
import (
"encoding/json"
"io/ioutil"
"io"
"os"
"regexp"
"strings"
@ -29,7 +29,7 @@ func outputSpec(label string, spec *openapi.OpenAPI, t *testing.T) string {
if err != nil {
panic(err)
}
err = ioutil.WriteFile(path+"/"+label+".json", content, 0644)
err = os.WriteFile(path+"/"+label+".json", content, 0644)
if err != nil {
panic(err)
}
@ -150,7 +150,7 @@ func TestFileSingle(t *testing.T) {
t.FailNow()
}
expected, err := ioutil.ReadFile(file + ".spec.json")
expected, err := os.ReadFile(file + ".spec.json")
if err != nil {
t.Errorf(err.Error())
t.FailNow()
@ -170,7 +170,7 @@ func TestFileSingle(t *testing.T) {
}
if os.Getenv("KUBESHARK_OAS_WRITE_FILES") != "" {
err = ioutil.WriteFile(file+".spec.json", []byte(specText), 0644)
err = os.WriteFile(file+".spec.json", []byte(specText), 0644)
if err != nil {
panic(err)
}
@ -194,7 +194,7 @@ func loadStartingOAS(file string, label string, specs *sync.Map) {
defer fd.Close()
data, err := ioutil.ReadAll(fd)
data, err := io.ReadAll(fd)
if err != nil {
panic(err)
}
@ -252,7 +252,7 @@ func TestLoadValid3_1(t *testing.T) {
defer fd.Close()
data, err := ioutil.ReadAll(fd)
data, err := io.ReadAll(fd)
if err != nil {
t.Log(err)
t.FailNow()

5
agent/pkg/utils/utils.go
View File

@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"os"
"os/signal"
@ -59,7 +58,7 @@ func CheckErr(e error) {
}
func ReadJsonFile(filePath string, value interface{}) error {
if content, err := ioutil.ReadFile(filePath); err != nil {
if content, err := os.ReadFile(filePath); err != nil {
return err
} else {
if err = json.Unmarshal(content, value); err != nil {
@ -74,7 +73,7 @@ func SaveJsonFile(filePath string, value interface{}) error {
if data, err := json.Marshal(value); err != nil {
return err
} else {
if err = ioutil.WriteFile(filePath, data, 0644); err != nil {
if err = os.WriteFile(filePath, data, 0644); err != nil {
return err
}
}

7
cli/bucket/provider.go
View File

@ -2,10 +2,11 @@ package bucket
import (
"fmt"
"github.com/kubeshark/kubeshark/cli/utils"
"io/ioutil"
"io"
"net/http"
"time"
"github.com/kubeshark/kubeshark/cli/utils"
)
type Provider struct {
@ -33,7 +34,7 @@ func (provider *Provider) GetInstallTemplate(templateName string) (string, error
defer response.Body.Close()
installTemplate, err := ioutil.ReadAll(response.Body)
installTemplate, err := io.ReadAll(response.Body)
if err != nil {
return "", err
}

6
cli/config/config.go
View File

@ -3,7 +3,7 @@ package config
import (
"errors"
"fmt"
"io/ioutil"
"io"
"os"
"reflect"
"strconv"
@ -78,7 +78,7 @@ func WriteConfig(config *ConfigStruct) error {
}
data := []byte(template)
if err := ioutil.WriteFile(Config.ConfigFilePath, data, 0644); err != nil {
if err := os.WriteFile(Config.ConfigFilePath, data, 0644); err != nil {
return fmt.Errorf("failed writing config, err: %v", err)
}
@ -91,7 +91,7 @@ func loadConfigFile(configFilePath string, config *ConfigStruct) error {
return openErr
}
buf, readErr := ioutil.ReadAll(reader)
buf, readErr := io.ReadAll(reader)
if readErr != nil {
return readErr
}

3
cli/config/configStructs/tapConfig.go
View File

@ -3,7 +3,6 @@ package configStructs
import (
"fmt"
"io/fs"
"io/ioutil"
"os"
"regexp"
"strings"
@ -70,7 +69,7 @@ func (config *TapConfig) GetInsertionFilter() string {
insertionFilter := config.InsertionFilter
if fs.ValidPath(insertionFilter) {
if _, err := os.Stat(insertionFilter); err == nil {
b, err := ioutil.ReadFile(insertionFilter)
b, err := os.ReadFile(insertionFilter)
if err != nil {
logger.Log.Warningf(uiUtils.Warning, fmt.Sprintf("Couldn't read the file on path: %s, err: %v", insertionFilter, err))
} else {

4
cli/kubeshark/version/versionCheck.go
View File

@ -3,7 +3,7 @@ package version
import (
"context"
"fmt"
"io/ioutil"
"io"
"net/http"
"runtime"
"strings"
@ -47,7 +47,7 @@ func CheckNewerVersion(versionChan chan string) {
return
}
data, err := ioutil.ReadAll(res.Body)
data, err := io.ReadAll(res.Body)
res.Body.Close()
if err != nil {
logger.Log.Debugf("[ERROR] Failed to read the version file -> %v", err)

3
cli/utils/httpUtils.go
View File

@ -4,7 +4,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"net/http"
"strings"
)
@ -32,7 +31,7 @@ func checkError(response *http.Response, errInOperation error) (*http.Response,
return response, errInOperation
// Check only if status != 200 (and not status >= 300). Agent APIs return only 200 on success.
} else if response.StatusCode != http.StatusOK {
body, err := ioutil.ReadAll(response.Body)
body, err := io.ReadAll(response.Body)
response.Body.Close()
response.Body = io.NopCloser(bytes.NewBuffer(body)) // rewind
if err != nil {

15
tap/extensions/amqp/main_test.go
View File

@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"log"
"os"
"path"
@ -192,7 +191,7 @@ func TestDissect(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, items, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))
@ -222,7 +221,7 @@ func TestAnalyze(t *testing.T) {
for _, _path := range paths {
fmt.Printf("%s %s\n", msgAnalyzing, _path)
bytes, err := ioutil.ReadFile(_path)
bytes, err := os.ReadFile(_path)
assert.Nil(t, err)
var items []*api.OutputChannelItem
@ -249,7 +248,7 @@ func TestAnalyze(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, items, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))
@ -279,7 +278,7 @@ func TestSummarize(t *testing.T) {
for _, _path := range paths {
fmt.Printf("%s %s\n", msgSummarizing, _path)
bytes, err := ioutil.ReadFile(_path)
bytes, err := os.ReadFile(_path)
assert.Nil(t, err)
var entries []*api.Entry
@ -306,7 +305,7 @@ func TestSummarize(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, entries, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))
@ -336,7 +335,7 @@ func TestRepresent(t *testing.T) {
for _, _path := range paths {
fmt.Printf("%s %s\n", msgRepresenting, _path)
bytes, err := ioutil.ReadFile(_path)
bytes, err := os.ReadFile(_path)
assert.Nil(t, err)
var entries []*api.Entry
@ -364,7 +363,7 @@ func TestRepresent(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, objects, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))

5
tap/extensions/http/handlers.go
View File

@ -5,7 +5,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"net/http"
"strings"
"time"
@ -124,7 +123,7 @@ func handleHTTP1ClientStream(b *bufio.Reader, progress *api.ReadProgress, captur
}
var body []byte
body, err = ioutil.ReadAll(req.Body)
body, err = io.ReadAll(req.Body)
req.Body = io.NopCloser(bytes.NewBuffer(body)) // rewind
ident := fmt.Sprintf(
@ -168,7 +167,7 @@ func handleHTTP1ServerStream(b *bufio.Reader, progress *api.ReadProgress, captur
}
var body []byte
body, err = ioutil.ReadAll(res.Body)
body, err = io.ReadAll(res.Body)
res.Body = io.NopCloser(bytes.NewBuffer(body)) // rewind
ident := fmt.Sprintf(

15
tap/extensions/http/main_test.go
View File

@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"log"
"os"
"path"
@ -195,7 +194,7 @@ func TestDissect(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, items, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))
@ -225,7 +224,7 @@ func TestAnalyze(t *testing.T) {
for _, _path := range paths {
fmt.Printf("%s %s\n", msgAnalyzing, _path)
bytes, err := ioutil.ReadFile(_path)
bytes, err := os.ReadFile(_path)
assert.Nil(t, err)
var items []*api.OutputChannelItem
@ -252,7 +251,7 @@ func TestAnalyze(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, items, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))
@ -282,7 +281,7 @@ func TestSummarize(t *testing.T) {
for _, _path := range paths {
fmt.Printf("%s %s\n", msgSummarizing, _path)
bytes, err := ioutil.ReadFile(_path)
bytes, err := os.ReadFile(_path)
assert.Nil(t, err)
var entries []*api.Entry
@ -309,7 +308,7 @@ func TestSummarize(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, entries, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))
@ -339,7 +338,7 @@ func TestRepresent(t *testing.T) {
for _, _path := range paths {
fmt.Printf("%s %s\n", msgRepresenting, _path)
bytes, err := ioutil.ReadFile(_path)
bytes, err := os.ReadFile(_path)
assert.Nil(t, err)
var entries []*api.Entry
@ -367,7 +366,7 @@ func TestRepresent(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, objects, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))

3
tap/extensions/kafka/decode.go
View File

@ -5,7 +5,6 @@ import (
"fmt"
"hash/crc32"
"io"
"io/ioutil"
"reflect"
"strings"
)
@ -166,7 +165,7 @@ func (d *decoder) discard(n int) {
n, err = r.Discard(n)
d.remain -= n
} else {
_, err = io.Copy(ioutil.Discard, d)
_, err = io.Copy(io.Discard, d)
}
d.setError(err)
}

15
tap/extensions/kafka/main_test.go
View File

@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"log"
"os"
"path"
@ -193,7 +192,7 @@ func TestDissect(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, items, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))
@ -223,7 +222,7 @@ func TestAnalyze(t *testing.T) {
for _, _path := range paths {
fmt.Printf("%s %s\n", msgAnalyzing, _path)
bytes, err := ioutil.ReadFile(_path)
bytes, err := os.ReadFile(_path)
assert.Nil(t, err)
var items []*api.OutputChannelItem
@ -250,7 +249,7 @@ func TestAnalyze(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, items, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))
@ -280,7 +279,7 @@ func TestSummarize(t *testing.T) {
for _, _path := range paths {
fmt.Printf("%s %s\n", msgSummarizing, _path)
bytes, err := ioutil.ReadFile(_path)
bytes, err := os.ReadFile(_path)
assert.Nil(t, err)
var entries []*api.Entry
@ -307,7 +306,7 @@ func TestSummarize(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, entries, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))
@ -337,7 +336,7 @@ func TestRepresent(t *testing.T) {
for _, _path := range paths {
fmt.Printf("%s %s\n", msgRepresenting, _path)
bytes, err := ioutil.ReadFile(_path)
bytes, err := os.ReadFile(_path)
assert.Nil(t, err)
var entries []*api.Entry
@ -365,7 +364,7 @@ func TestRepresent(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, objects, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))

15
tap/extensions/redis/main_test.go
View File

@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"log"
"os"
"path"
@ -193,7 +192,7 @@ func TestDissect(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, items, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))
@ -223,7 +222,7 @@ func TestAnalyze(t *testing.T) {
for _, _path := range paths {
fmt.Printf("%s %s\n", msgAnalyzing, _path)
bytes, err := ioutil.ReadFile(_path)
bytes, err := os.ReadFile(_path)
assert.Nil(t, err)
var items []*api.OutputChannelItem
@ -250,7 +249,7 @@ func TestAnalyze(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, items, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))
@ -280,7 +279,7 @@ func TestSummarize(t *testing.T) {
for _, _path := range paths {
fmt.Printf("%s %s\n", msgSummarizing, _path)
bytes, err := ioutil.ReadFile(_path)
bytes, err := os.ReadFile(_path)
assert.Nil(t, err)
var entries []*api.Entry
@ -307,7 +306,7 @@ func TestSummarize(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, entries, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))
@ -337,7 +336,7 @@ func TestRepresent(t *testing.T) {
for _, _path := range paths {
fmt.Printf("%s %s\n", msgRepresenting, _path)
bytes, err := ioutil.ReadFile(_path)
bytes, err := os.ReadFile(_path)
assert.Nil(t, err)
var entries []*api.Entry
@ -365,7 +364,7 @@ func TestRepresent(t *testing.T) {
if _, err := os.Stat(pathExpect); errors.Is(err, os.ErrNotExist) {
assert.Len(t, objects, 0)
} else {
expectedBytes, err := ioutil.ReadFile(pathExpect)
expectedBytes, err := os.ReadFile(pathExpect)
assert.Nil(t, err)
assert.JSONEq(t, string(expectedBytes), string(marshaled))

4
tap/source/discoverer_util.go
View File

@ -1,7 +1,7 @@
package source
import (
"io/ioutil"
"os"
"regexp"
"strings"
@ -11,7 +11,7 @@ import (
var numberRegex = regexp.MustCompile("[0-9]+")
func getSingleValueFromEnvironmentVariableFile(filePath string, variableName string) (string, error) {
bytes, err := ioutil.ReadFile(filePath)
bytes, err := os.ReadFile(filePath)
if err != nil {
logger.Log.Warningf("Error reading environment file %v - %v", filePath, err)

3
tap/source/envoy_discoverer.go
View File

@ -2,7 +2,6 @@ package source
import (
"fmt"
"io/ioutil"
"os"
"strings"
@ -15,7 +14,7 @@ const envoyBinary = "/envoy"
func discoverRelevantEnvoyPids(procfs string, pods []v1.Pod) ([]string, error) {
result := make([]string, 0)
pids, err := ioutil.ReadDir(procfs)
pids, err := os.ReadDir(procfs)
if err != nil {
return result, err

3
tap/source/linkerd_discoverer.go
View File

@ -2,7 +2,6 @@ package source
import (
"fmt"
"io/ioutil"
"os"
"strings"
@ -15,7 +14,7 @@ const linkerdBinary = "/linkerd2-proxy"
func discoverRelevantLinkerdPids(procfs string, pods []v1.Pod) ([]string, error) {
result := make([]string, 0)
pids, err := ioutil.ReadDir(procfs)
pids, err := os.ReadDir(procfs)
if err != nil {
return result, err

6
tap/tlstapper/tls_process_discoverer.go
View File

@ -2,8 +2,8 @@ package tlstapper
import (
"fmt"
"io/ioutil"
"net/url"
"os"
"path"
"path/filepath"
"regexp"
@ -43,7 +43,7 @@ func UpdateTapTargets(tls *TlsTapper, pods *[]v1.Pod, procfs string) error {
func findContainerPids(procfs string, containerIds map[string]v1.Pod) (map[uint32]v1.Pod, error) {
result := make(map[uint32]v1.Pod)
pids, err := ioutil.ReadDir(procfs)
pids, err := os.ReadDir(procfs)
if err != nil {
return result, err
@ -107,7 +107,7 @@ func buildContainerIdsMap(pods *[]v1.Pod) map[string]v1.Pod {
func getProcessCgroup(procfs string, pid string) (string, error) {
filePath := fmt.Sprintf("%s/%s/cgroup", procfs, pid)
bytes, err := ioutil.ReadFile(filePath)
bytes, err := os.ReadFile(filePath)
if err != nil {
logger.Log.Warningf("Error reading cgroup file %s - %v", filePath, err)