public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

check for filepath.Walk error everywhere

This commit is contained in:
Tejal Desai 2020-02-28 04:23:27 -08:00
parent 7aa737c297
commit 17f808da8a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/commands/copy_test.go
View File

@ -62,6 +62,9 @@ func setupTestTemp() string {
} }
cperr := filepath.Walk(srcPath, cperr := filepath.Walk(srcPath,
func(path string, info os.FileInfo, err error) error { func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
if path != srcPath { if path != srcPath {
if err != nil { if err != nil {
return err return err

6
pkg/util/fs_util.go
View File

@ -188,7 +188,11 @@ func GetFSFromLayers(root string, layers []v1.Layer, opts ...FSOpt) ([]string, e
// DeleteFilesystem deletes the extracted image file system // DeleteFilesystem deletes the extracted image file system
func DeleteFilesystem() error { func DeleteFilesystem() error {
logrus.Info("Deleting filesystem...") logrus.Info("Deleting filesystem...")
return filepath.Walk(constants.RootDir, func(path string, info os.FileInfo, _ error) error { return filepath.Walk(constants.RootDir, func(path string, info os.FileInfo, err error) error {
if err != nil {
return errors.Wrap(err, fmt.Sprintf("walking path %s", path))
}
if CheckWhitelist(path) { if CheckWhitelist(path) {
if !isExist(path) { if !isExist(path) {
logrus.Debugf("Path %s whitelisted, but not exists", path) logrus.Debugf("Path %s whitelisted, but not exists", path)