feat(import): copy dir contents

  import:
    - path: folder1/
      dest: /

vs

  import:
    - path: folder1
      dest: /

The former will copy the contents of folder1/ at / and the latter will
make and copy a /folder1 at /

Signed-off-by: Ramkumar Chinchani <rchincha@cisco.com>

pkg/stacker/import.go

@@ -125,6 +125,7 @@ func importFile(imp string, cacheDir string, hash string, idest string, mode *fs
 	}
 
 	dest := path.Join(cacheDir, path.Base(imp))
+
 	if err := os.MkdirAll(dest, 0755); err != nil {
 		return "", errors.Wrapf(err, "failed making cache dir")
 	}
@@ -156,7 +157,12 @@ func importFile(imp string, cacheDir string, hash string, idest string, mode *fs
 			fallthrough
 		case mtree.Extra:
 			srcpath := path.Join(imp, d.Path())
-			destpath := path.Join(cacheDir, path.Base(imp), d.Path())
+			var destpath string
+			if imp[len(imp)-1:] == "/" {
+				destpath = path.Join(cacheDir, d.Path())
+			} else {
+				destpath = path.Join(cacheDir, path.Base(imp), d.Path())
+			}
 
 			if d.New().IsDir() {
 				fi, err := os.Lstat(destpath)

pkg/types/layer.go

@@ -406,6 +406,9 @@ func (l Layer) absolutify(referenceDirectory string) (Layer, error) {
 		if err != nil {
 			return ret, err
 		}
+		if rawImport.Path[len(rawImport.Path)-1:] == "/" {
+			absImportPath += "/"
+		}
 		absImport := Import{Hash: rawImport.Hash, Path: absImportPath, Dest: rawImport.Dest, Mode: rawImport.Mode, Uid: rawImport.Uid, Gid: rawImport.Gid}
 		ret.Imports = append(ret.Imports, absImport)
 	}

test/import.bats

@@ -393,3 +393,21 @@ EOF
 
     stacker build
 }
+
+@test "import with dir contents" {
+  mkdir folder1
+  touch folder1/file1
+  cat > stacker.yaml <<EOF
+first:
+  from:
+    type: oci
+    url: $CENTOS_OCI
+  import:
+  - path: folder1/
+    dest: /
+  run: |
+    ls -l /
+    [ -f /file1 ]
+EOF
+    stacker build
+}