Merge pull request #214 from priyawadhwa/bug

Fix bug in snapshotting

pkg/snapshot/snapshot_test.go

@@ -149,7 +149,7 @@ func TestSnapshotFiles(t *testing.T) {
  if err != nil {
  t.Fatal(err)
  }
- expectedFiles := []string{"/tmp", filepath.Join(testDir, "foo")}
+ expectedFiles := []string{"/", "/tmp", filepath.Join(testDir, "foo")}
 
  // Check contents of the snapshot, make sure contents is equivalent to snapshotFiles
  reader := bytes.NewReader(contents)

pkg/util/command_util.go

@@ -69,7 +69,7 @@ func ResolveEnvironmentReplacement(value string, envs []string, isFilepath bool)
  return "", err
  }
  fp = filepath.Clean(fp)
- if IsDestDir(value) {
+ if IsDestDir(value) && !IsDestDir(fp) {
  fp = fp + "/"
  }
  return fp, nil

pkg/util/fs_util.go

@@ -336,12 +336,12 @@ func Files(root string) ([]string, error) {
 }
 
 // ParentDirectories returns a list of paths to all parent directories
-// Ex. /some/temp/dir -> [/some, /some/temp, /some/temp/dir]
+// Ex. /some/temp/dir -> [/, /some, /some/temp, /some/temp/dir]
 func ParentDirectories(path string) []string {
  path = filepath.Clean(path)
  dirs := strings.Split(path, "/")
  dirPath := constants.RootDir
- var paths []string
+ paths := []string{constants.RootDir}
  for index, dir := range dirs {
  if dir == "" || index == (len(dirs)-1) {
  continue

pkg/util/fs_util_test.go

@@ -142,14 +142,17 @@ func Test_ParentDirectories(t *testing.T) {
  name: "regular path",
  path: "/path/to/dir",
  expected: []string{
+ "/",
  "/path",
  "/path/to",
  },
  },
  {
- name: "current directory",
- path: ".",
- expected: nil,
+ name: "current directory",
+ path: ".",
+ expected: []string{
+ "/",
+ },
  },
  }