Respect path in import

cmd/export.go

@@ -63,7 +63,9 @@ func Export(path, file, metad, ver string) error {
 				pairs = append(pairs, Pair{Key: k, Value: str})
 			}
 		}
-		items = append(items, Item{Path: p, Pairs: pairs})
+
+		relativePath := strings.TrimPrefix(p, path)
+		items = append(items, Item{Path: relativePath, Pairs: pairs})
 	}
 
 	// Convert to json and write to a file

cmd/import.go

@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/adamdecaf/vault-backend-migrator/vault"
 )
@@ -17,6 +18,16 @@ func Import(path, file, ver string) error {
 		return err
 	}
 
+	// Make sure path has a leading slash
+	if !strings.HasPrefix(path, "/") {
+		path = "/" + path
+	}
+
+	// Make sure path has a trailing slash
+	if !strings.HasSuffix(path, "/") {
+		path = path + "/"
+	}
+
 	// Check the input file exists
 	if _, err := os.Stat(abs); err != nil {
 		f, err := os.Create(abs)
@@ -54,8 +65,9 @@ func Import(path, file, ver string) error {
 		for _, kv := range item.Pairs {
 			data[kv.Key] = kv.Value
 		}
-		fmt.Printf("Writing %s\n", item.Path)
-		if err := v.Write(item.Path, data, ver); err != nil {
+		fullPath := path + item.Path
+		fmt.Printf("Writing %s\n", fullPath)
+		if err := v.Write(fullPath, data, ver); err != nil {
 			fmt.Printf("Error %s\n", err)
 		}
 	}