Fix dir with trailing '/' (#39)

fishi0x01 · Jun 14, 2020 · b0f78f9 · b0f78f9
1 parent 7bd10b2
commit b0f78f9
Show file tree

Hide file tree

Showing 6 changed files with 148 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## v0.6.1 (June 15, 2020)
+
+BUG FIXES:
+
+* Properly handle suffix '/' in source path ([#39](https://github.com/fishi0x01/vsh/pull/39))
+
+
 ## v0.6.0 (June 13, 2020)
 
 ENHANCEMENTS:

diff --git a/cli/command.go b/cli/command.go
@@ -1,9 +1,10 @@
 package cli
 
 import (
-	"github.com/fishi0x01/vsh/client"
 	"path/filepath"
 	"strings"
+
+	"github.com/fishi0x01/vsh/client"
 )
 
 // Command interface to describe a command structure
@@ -31,6 +32,7 @@ func cmdPath(pwd string, arg string) (result string) {
 }
 
 func runCommandWithTraverseTwoPaths(client *client.Client, source string, target string, f func(string, string) error) {
+	source = filepath.Clean(source) // remove potential trailing '/'
 	for _, path := range client.Traverse(source) {
 		target := strings.Replace(path, source, target, 1)
 		err := f(path, target)

diff --git a/cli/cp.go b/cli/cp.go
@@ -2,8 +2,9 @@ package cli
 
 import (
 	"fmt"
-	"github.com/fishi0x01/vsh/client"
 	"io"
+
+	"github.com/fishi0x01/vsh/client"
 )
 
 // CopyCommand container for all 'cp' parameters

diff --git a/test/command-tests/cp.bats b/test/command-tests/cp.bats
@@ -25,19 +25,17 @@ load ../bin/plugins/bats-assert/load
   assert_output "test"
 
   #######################################
-  echo "==== case: copy single directory ===="
+  echo "==== case: copy single directory without trailing '/' ===="
   run ${APP_BIN} -c "cp ${KV_BACKEND}/src/dev ${KV_BACKEND}/dest/dev"
   assert_success
 
   echo "ensure the directory got copied to destination"
   run get_vault_value "value" "${KV_BACKEND}/dest/dev/1"
   assert_success
   assert_output "1"
-
   run get_vault_value "value" "${KV_BACKEND}/dest/dev/2"
   assert_success
   assert_output "2"
-
   run get_vault_value "value" "${KV_BACKEND}/dest/dev/3"
   assert_success
   assert_output "3"
@@ -46,11 +44,90 @@ load ../bin/plugins/bats-assert/load
   run get_vault_value "value" "${KV_BACKEND}/src/dev/1"
   assert_success
   assert_output "1"
+  run get_vault_value "value" "${KV_BACKEND}/src/dev/2"
+  assert_success
+  assert_output "2"
+  run get_vault_value "value" "${KV_BACKEND}/src/dev/3"
+  assert_success
+  assert_output "3"
+
+  #######################################
+  echo "==== case: copy single directory with trailing '/' ===="
+  run ${APP_BIN} -c "cp ${KV_BACKEND}/src/dev/ ${KV_BACKEND}/dest/dev.copy"
+  assert_success
+
+  echo "ensure the directory got copied to destination"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy/1"
+  assert_success
+  assert_output "1"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy/2"
+  assert_success
+  assert_output "2"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy/3"
+  assert_success
+  assert_output "3"
+
+  echo "ensure the src directory still exists"
+  run get_vault_value "value" "${KV_BACKEND}/src/dev/1"
+  assert_success
+  assert_output "1"
+  run get_vault_value "value" "${KV_BACKEND}/src/dev/2"
+  assert_success
+  assert_output "2"
+  run get_vault_value "value" "${KV_BACKEND}/src/dev/3"
+  assert_success
+  assert_output "3"
+
+  ######################################
+  echo "==== case: copy single directory with dest trailing '/' ===="
+  run ${APP_BIN} -c "cp ${KV_BACKEND}/src/dev ${KV_BACKEND}/dest/dev.copy2/"
+  assert_success
+
+  echo "ensure the directory got copied to destination"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy2/1"
+  assert_success
+  assert_output "1"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy2/2"
+  assert_success
+  assert_output "2"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy2/3"
+  assert_success
+  assert_output "3"
 
+  echo "ensure the src directory still exists"
+  run get_vault_value "value" "${KV_BACKEND}/src/dev/1"
+  assert_success
+  assert_output "1"
   run get_vault_value "value" "${KV_BACKEND}/src/dev/2"
   assert_success
   assert_output "2"
+  run get_vault_value "value" "${KV_BACKEND}/src/dev/3"
+  assert_success
+  assert_output "3"
+
+  ######################################
+  echo "==== case: copy single directory with dsrc and est trailing '/' ===="
+  run ${APP_BIN} -c "cp ${KV_BACKEND}/src/dev/ ${KV_BACKEND}/dest/dev.copy3/"
+  assert_success
+
+  echo "ensure the directory got copied to destination"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy3/1"
+  assert_success
+  assert_output "1"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy3/2"
+  assert_success
+  assert_output "2"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy3/3"
+  assert_success
+  assert_output "3"
 
+  echo "ensure the src directory still exists"
+  run get_vault_value "value" "${KV_BACKEND}/src/dev/1"
+  assert_success
+  assert_output "1"
+  run get_vault_value "value" "${KV_BACKEND}/src/dev/2"
+  assert_success
+  assert_output "2"
   run get_vault_value "value" "${KV_BACKEND}/src/dev/3"
   assert_success
   assert_output "3"

diff --git a/test/command-tests/mv.bats b/test/command-tests/mv.bats
@@ -22,19 +22,17 @@ load ../bin/plugins/bats-assert/load
   assert_output --partial "${NO_VALUE_FOUND}"
 
   #######################################
-  echo "==== case: move single directory ===="
+  echo "==== case: move single directory without trailing '/' ===="
   run ${APP_BIN} -c "mv ${KV_BACKEND}/src/dev ${KV_BACKEND}/dest/dev"
   assert_success
 
   echo "ensure the directory got moved to destination"
   run get_vault_value "value" "${KV_BACKEND}/dest/dev/1"
   assert_success
   assert_output "1"
-
   run get_vault_value "value" "${KV_BACKEND}/dest/dev/2"
   assert_success
   assert_output "2"
-
   run get_vault_value "value" "${KV_BACKEND}/dest/dev/3"
   assert_success
   assert_output "3"
@@ -43,15 +41,67 @@ load ../bin/plugins/bats-assert/load
   run get_vault_value "value" "${KV_BACKEND}/src/dev/1"
   assert_success
   assert_output --partial "${NO_VALUE_FOUND}"
-
   run get_vault_value "value" "${KV_BACKEND}/src/dev/2"
   assert_success
   assert_output --partial "${NO_VALUE_FOUND}"
-
   run get_vault_value "value" "${KV_BACKEND}/src/dev/3"
   assert_success
   assert_output --partial "${NO_VALUE_FOUND}"
 
+  #######################################
+  echo "==== case: move single directory with trailing '/' ===="
+  run ${APP_BIN} -c "mv ${KV_BACKEND}/dest/dev/ ${KV_BACKEND}/dest/dev.copy"
+  assert_success
+
+  echo "ensure the directory got moved to destination"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy/1"
+  assert_success
+  assert_output "1"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy/2"
+  assert_success
+  assert_output "2"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy/3"
+  assert_success
+  assert_output "3"
+
+  echo "ensure the src directory got removed"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev/1"
+  assert_success
+  assert_output --partial "${NO_VALUE_FOUND}"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev/2"
+  assert_success
+  assert_output --partial "${NO_VALUE_FOUND}"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev/3"
+  assert_success
+  assert_output --partial "${NO_VALUE_FOUND}"
+
+  #######################################
+  echo "==== case: move single directory with dest trailing '/' ===="
+  run ${APP_BIN} -c "mv ${KV_BACKEND}/dest/dev.copy ${KV_BACKEND}/dest/dev/"
+  assert_success
+
+  echo "ensure the directory got moved to destination"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev/1"
+  assert_success
+  assert_output "1"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev/2"
+  assert_success
+  assert_output "2"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev/3"
+  assert_success
+  assert_output "3"
+
+  echo "ensure the src directory got removed"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy/1"
+  assert_success
+  assert_output --partial "${NO_VALUE_FOUND}"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy/2"
+  assert_success
+  assert_output --partial "${NO_VALUE_FOUND}"
+  run get_vault_value "value" "${KV_BACKEND}/dest/dev.copy/3"
+  assert_success
+  assert_output --partial "${NO_VALUE_FOUND}"
+
   #######################################
   echo "==== TODO case: move ambigious file ===="
 

diff --git a/test/util/util.bash b/test/util/util.bash
@@ -1,8 +1,7 @@
 #!/bin/bash
 
-export KV_VERSION="${KV_VERSION:-"2"}"
-
 export VAULT_VERSION=${VAULT_VERSION:-"1.3.4"}
+export KV_BACKEND=${KV_BACKEND:-"KV2"}
 export VAULT_CONTAINER_NAME="vsh-integration-test-vault"
 export VAULT_HOST_PORT=${VAULT_HOST_PORT:-"8888"}