public_git/kaniko
1
0
Fork 0
mirror of https://github.com/GoogleContainerTools/kaniko synced 2026-10-21 12:54:35 +02:00
Code Issues Releases Wiki Activity

fix: Remove references to deprecated io/ioutil pkg (#2867)

Browse Source 
* Update benchmark_test

* Updae tar.go

* Update further refs

* Commit next set of replacements

* Reverting changes in vendor folder

* Update integreation_with_context_test.go

* Update k8s_test.go

* Update remaining usages

* Replace conflicting usage of fs local variable
This commit is contained in:
Manish Giri
2023-11-28 13:02:53 -08:00
committed by GitHub
parent 2b3d3c7eff
commit 7bfc73c3ad
32 changed files with 173 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/fs_util.go
+1 -2
View File
@@ -22,7 +22,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"math"
"net/http"
"os"
@@ -763,7 +762,7 @@ func getExcludedFiles(dockerfilePath, buildcontext string) ([]string, error) {
return nil, nil
}
logrus.Infof("Using dockerignore file: %v", path)
contents, err := ioutil.ReadFile(path)
contents, err := os.ReadFile(path)
if err != nil {
return nil, errors.Wrap(err, "parsing .dockerignore")
}
pkg/util/fs_util_test.go
+14 -15
View File
@@ -21,7 +21,6 @@ import (
"bytes"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"reflect"
@@ -52,7 +51,7 @@ func Test_DetectFilesystemSkiplist(t *testing.T) {
if err := os.MkdirAll(filepath.Dir(path), 0750); err != nil {
t.Fatalf("Error creating tempdir: %s", err)
}
if err := ioutil.WriteFile(path, []byte(fileContents), 0644); err != nil {
if err := os.WriteFile(path, []byte(fileContents), 0644); err != nil {
t.Fatalf("Error writing file contents to %s: %s", path, err)
}
@@ -492,7 +491,7 @@ func fileExists(p string) checker {
func fileMatches(p string, c []byte) checker {
return func(root string, t *testing.T) {
actual, err := ioutil.ReadFile(filepath.Join(root, p))
actual, err := os.ReadFile(filepath.Join(root, p))
if err != nil {
t.Fatalf("error reading file: %s", p)
}
@@ -840,7 +839,7 @@ func TestCopySymlink(t *testing.T) {
linkTarget: "/abs/dest",
dest: "overwrite_me",
beforeLink: func(r string) error {
return ioutil.WriteFile(filepath.Join(r, "overwrite_me"), nil, 0644)
return os.WriteFile(filepath.Join(r, "overwrite_me"), nil, 0644)
},
}}
@@ -851,7 +850,7 @@ func TestCopySymlink(t *testing.T) {
r := t.TempDir()
os.MkdirAll(filepath.Join(r, filepath.Dir(tc.linkTarget)), 0777)
tc.linkTarget = filepath.Join(r, tc.linkTarget)
ioutil.WriteFile(tc.linkTarget, nil, 0644)
os.WriteFile(tc.linkTarget, nil, 0644)
if tc.beforeLink != nil {
if err := tc.beforeLink(r); err != nil {
@@ -980,7 +979,7 @@ func Test_CopyFile_skips_self(t *testing.T) {
tempFile := filepath.Join(tempDir, "foo")
expected := "bar"
if err := ioutil.WriteFile(
if err := os.WriteFile(
tempFile,
[]byte(expected),
0755,
@@ -998,7 +997,7 @@ func Test_CopyFile_skips_self(t *testing.T) {
}
// Ensure file has expected contents
actualData, err := ioutil.ReadFile(tempFile)
actualData, err := os.ReadFile(tempFile)
if err != nil {
t.Fatal(err)
}
@@ -1130,7 +1129,7 @@ func Test_GetFSFromLayers_with_whiteouts_include_whiteout_disabled(t *testing.T)
root := t.TempDir()
// Write a whiteout path
d1 := []byte("Hello World\n")
if err := ioutil.WriteFile(filepath.Join(root, "foobar"), d1, 0644); err != nil {
if err := os.WriteFile(filepath.Join(root, "foobar"), d1, 0644); err != nil {
t.Fatal(err)
}
@@ -1185,7 +1184,7 @@ func Test_GetFSFromLayers_with_whiteouts_include_whiteout_disabled(t *testing.T)
f(layerFiles, tw)
rc := ioutil.NopCloser(buf)
rc := io.NopCloser(buf)
mockLayer.EXPECT().Uncompressed().Return(rc, nil)
secondLayerFiles := []string{
@@ -1200,7 +1199,7 @@ func Test_GetFSFromLayers_with_whiteouts_include_whiteout_disabled(t *testing.T)
mockLayer2 := mockv1.NewMockLayer(ctrl)
mockLayer2.EXPECT().MediaType().Return(types.OCILayer, nil)
rc = ioutil.NopCloser(buf)
rc = io.NopCloser(buf)
mockLayer2.EXPECT().Uncompressed().Return(rc, nil)
layers := []v1.Layer{
@@ -1292,7 +1291,7 @@ func Test_GetFSFromLayers_ignorelist(t *testing.T) {
f(layerFiles, tw)
rc := ioutil.NopCloser(buf)
rc := io.NopCloser(buf)
mockLayer.EXPECT().Uncompressed().Return(rc, nil)
layers := []v1.Layer{
@@ -1346,7 +1345,7 @@ func Test_GetFSFromLayers_ignorelist(t *testing.T) {
f(layerFiles, tw)
rc = ioutil.NopCloser(buf)
rc = io.NopCloser(buf)
mockLayer.EXPECT().Uncompressed().Return(rc, nil)
layers = []v1.Layer{
@@ -1413,7 +1412,7 @@ func Test_GetFSFromLayers(t *testing.T) {
mockLayer := mockv1.NewMockLayer(ctrl)
mockLayer.EXPECT().MediaType().Return(types.OCILayer, nil)
rc := ioutil.NopCloser(buf)
rc := io.NopCloser(buf)
mockLayer.EXPECT().Uncompressed().Return(rc, nil)
layers := []v1.Layer{
@@ -1463,7 +1462,7 @@ func TestInitIgnoreList(t *testing.T) {
mountInfo := `36 35 98:0 /kaniko /test/kaniko rw,noatime master:1 - ext3 /dev/root rw,errors=continue
36 35 98:0 /proc /test/proc rw,noatime master:1 - ext3 /dev/root rw,errors=continue
`
mFile, err := ioutil.TempFile("", "mountinfo")
mFile, err := os.CreateTemp("", "mountinfo")
if err != nil {
t.Fatal(err)
}
@@ -1520,7 +1519,7 @@ func Test_setFileTimes(t *testing.T) {
p := filepath.Join(testDir, "foo.txt")
if err := ioutil.WriteFile(p, []byte("meow"), 0777); err != nil {
if err := os.WriteFile(p, []byte("meow"), 0777); err != nil {
t.Fatal(err)
}
pkg/util/gcr_util_test.go
+1 -2
View File
@@ -17,7 +17,6 @@ limitations under the License.
package util
import (
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -101,7 +100,7 @@ func TestDockerConfLocationWithFileLocation(t *testing.T) {
if err := os.Unsetenv(DockerConfigEnvKey); err != nil {
t.Fatalf("Failed to unset DOCKER_CONFIG: %v", err)
}
file, err := ioutil.TempFile("", "docker.conf")
file, err := os.CreateTemp("", "docker.conf")
if err != nil {
t.Fatalf("could not create temp file: %s", err)
}
pkg/util/proc/proc.go
+1 -2
View File
@@ -20,7 +20,6 @@ package proc
import (
"fmt"
"io/ioutil"
"os"
"regexp"
"strings"
@@ -201,7 +200,7 @@ func readFile(file string) []byte {
return nil
}
b, _ := ioutil.ReadFile(file)
b, _ := os.ReadFile(file)
return b
}
pkg/util/tar_util.go
+1 -2
View File
@@ -23,7 +23,6 @@ import (
"fmt"
"io"
"io/fs"
"io/ioutil"
"os"
"path/filepath"
"strings"
@@ -266,7 +265,7 @@ func fileIsCompressedTar(src string) (bool, archive.Compression) {
return false, -1
}
defer r.Close()
buf, err := ioutil.ReadAll(r)
buf, err := io.ReadAll(r)
if err != nil {
return false, -1
}
pkg/util/tar_util_test.go
+1 -2
View File
@@ -22,7 +22,6 @@ import (
"compress/gzip"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"testing"
@@ -61,7 +60,7 @@ func Test_AddFileToTar(t *testing.T) {
testDir := t.TempDir()
path := filepath.Join(testDir, regularFiles[0])
if err := ioutil.WriteFile(path, []byte("hello"), os.ModePerm); err != nil {
if err := os.WriteFile(path, []byte("hello"), os.ModePerm); err != nil {
t.Fatal(err)
}
// use a pre-determined time with non-zero microseconds to avoid flakiness
pkg/util/transport_util.go
+2 -2
View File
@@ -20,9 +20,9 @@ import (
"crypto/tls"
"crypto/x509"
"fmt"
"os"
"strings"
"io/ioutil"
"net/http"
"github.com/GoogleContainerTools/kaniko/pkg/config"
@@ -43,7 +43,7 @@ func (p *X509CertPool) value() *x509.CertPool {
}
func (p *X509CertPool) append(path string) error {
pem, err := ioutil.ReadFile(path)
pem, err := os.ReadFile(path)
if err != nil {
return err
}
pkg/util/util.go
+1 -2
View File
@@ -22,7 +22,6 @@ import (
"encoding/hex"
"fmt"
"io"
"io/ioutil"
"math"
"os"
"strconv"
@@ -176,7 +175,7 @@ func SHA256(r io.Reader) (string, error) {
// GetInputFrom returns Reader content
func GetInputFrom(r io.Reader) ([]byte, error) {
output, err := ioutil.ReadAll(r)
output, err := io.ReadAll(r)
if err != nil {
return nil, err
}