From 965b6067200fdc2d9aec85fb64c4d68748eab47f Mon Sep 17 00:00:00 2001
From: cvgw <cgwippern@google.com>
Date: Sat, 22 Feb 2020 10:09:34 -0800
Subject: [PATCH] remove cruft and unneeded loop

---
 pkg/snapshot/snapshot.go      | 25 +++++++++----------------
 pkg/snapshot/snapshot_test.go | 13 -------------
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/pkg/snapshot/snapshot.go b/pkg/snapshot/snapshot.go
index 90f06564ee..143f72ba84 100644
--- a/pkg/snapshot/snapshot.go
+++ b/pkg/snapshot/snapshot.go
@@ -22,7 +22,6 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
-	"strings"
 	"syscall"
 
 	"github.com/GoogleContainerTools/kaniko/pkg/filesystem"
@@ -136,18 +135,23 @@ func (s *Snapshotter) scanFullFilesystem() ([]string, []string, error) {
 	s.l.Snapshot()
 
 	timer := timing.Start("Walking filesystem")
-	// Save the fs state in a map to iterate over later.
-	memFs := map[string]*godirwalk.Dirent{}
+
+	foundPaths := make([]string, 0)
+
 	godirwalk.Walk(s.directory, &godirwalk.Options{
 		Callback: func(path string, ent *godirwalk.Dirent) error {
 			if util.IsInWhitelist(path) {
 				if util.IsDestDir(path) {
 					logrus.Tracef("Skipping paths under %s, as it is a whitelisted directory", path)
+
 					return filepath.SkipDir
 				}
+
 				return nil
 			}
-			memFs[path] = ent
+
+			foundPaths = append(foundPaths, path)
+
 			return nil
 		},
 		Unsorted: true,
@@ -155,24 +159,13 @@ func (s *Snapshotter) scanFullFilesystem() ([]string, []string, error) {
 	)
 	timing.DefaultRun.Stop(timer)
 
-	filesToResolve := make([]string, 0, len(memFs))
-	for file := range memFs {
-		if strings.HasPrefix(file, "/tmp/dir") {
-			logrus.Infof("found %s", file)
-		}
-		filesToResolve = append(filesToResolve, file)
-	}
-
-	resolvedFiles, err := filesystem.ResolvePaths(filesToResolve, s.whitelist)
+	resolvedFiles, err := filesystem.ResolvePaths(foundPaths, s.whitelist)
 	if err != nil {
 		return nil, nil, err
 	}
 
 	resolvedMemFs := make(map[string]bool)
 	for _, f := range resolvedFiles {
-		if strings.HasPrefix(f, "/tmp/dir") {
-			logrus.Infof("found again %s", f)
-		}
 		resolvedMemFs[f] = true
 	}
 
diff --git a/pkg/snapshot/snapshot_test.go b/pkg/snapshot/snapshot_test.go
index cd9a0a4ff0..19fc9c4cbc 100644
--- a/pkg/snapshot/snapshot_test.go
+++ b/pkg/snapshot/snapshot_test.go
@@ -64,14 +64,6 @@ func TestSnapshotFSFileChange(t *testing.T) {
 		batPath: "baz",
 	}
 
-	// Their parents didn't change so they shouldn't be included
-	//for _, dir := range util.ParentDirectoriesWithoutLeadingSlash(fooPath) {
-	//        snapshotFiles[dir] = ""
-	//}
-	//for _, dir := range util.ParentDirectoriesWithoutLeadingSlash(batPath) {
-	//        snapshotFiles[dir] = ""
-	//}
-
 	actualFiles := []string{}
 	for {
 		hdr, err := tr.Next()
@@ -161,11 +153,6 @@ func TestSnapshotFSChangePermissions(t *testing.T) {
 		batPathWithoutLeadingSlash: "baz2",
 	}
 
-	// The parents haven't changed so they shouldn't be in the tar
-	//for _, dir := range util.ParentDirectoriesWithoutLeadingSlash(batPath) {
-	//        snapshotFiles[dir] = ""
-	//}
-
 	foundFiles := []string{}
 	for {
 		hdr, err := tr.Next()