gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-23 07:29:00 -08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move from io/ioutil to io and os package (#1245)

Browse Source 
The io/ioutil package has been deprecated as of Go 1.16, see
https://golang.org/doc/go1.16#ioutil. This commit replaces the existing
io/ioutil functions with their new definitions in io and os packages.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun
2021-09-29 15:17:02 +08:00
committed by GitHub
parent 6bcb4af10f
commit bbcce9f7b7
13 changed files with 42 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/utils/utils_test.go
View File

@@ -2,7 +2,6 @@ package utils
import (
"io"
"io/ioutil"
"os"
"path/filepath"
"reflect"
@@ -25,14 +24,14 @@ func touch(t *testing.T, name string) {
}
func write(t *testing.T, name string, content string) {
err := ioutil.WriteFile(name, []byte(content), 0666)
err := os.WriteFile(name, []byte(content), 0666)
if err != nil {
t.Fatal(err)
}
}
func TestFileWalk(t *testing.T) {
td, err := ioutil.TempDir("", "walktest")
td, err := os.MkdirTemp("", "walktest")
if err != nil {
t.Fatal(err)
}
@@ -62,7 +61,7 @@ func TestFileWalk(t *testing.T) {
sawFoo2 = true
}
if strings.HasSuffix(path, "foo3") {
contentFoo3, err = ioutil.ReadAll(r)
contentFoo3, err = io.ReadAll(r)
if err != nil {
t.Fatal(err)
}
@@ -163,7 +162,7 @@ func TestCopyFile(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
src := tt.args.src
if tt.args.src == "" {
s, err := ioutil.TempFile("", "src")
s, err := os.CreateTemp("", "src")
require.NoError(t, err, tt.name)
_, err = s.Write(tt.content)
require.NoError(t, err, tt.name)
@@ -172,7 +171,7 @@ func TestCopyFile(t *testing.T) {
dst := tt.args.dst
if tt.args.dst == "" {
d, err := ioutil.TempFile("", "dst")
d, err := os.CreateTemp("", "dst")
require.NoError(t, err, tt.name)
dst = d.Name()
require.NoError(t, d.Close(), tt.name)