fix: parser to work with forward slashes in ref param (#124)

aslafy-z · Nov 11, 2020 · 00697dd · 00697dd
1 parent 17363a4
commit 00697dd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/helm-git-plugin.sh b/helm-git-plugin.sh
@@ -171,9 +171,9 @@ main() {
 
   readonly git_repo=$(echo "$_raw_uri" | sed -E 's#^([^/]+//[^/]+[^@\?]+)@?[^@\?]+\??.*$#\1#')
   # TODO: Validate git_repo
-  readonly git_path=$(echo "$_raw_uri" | sed -E 's#.*@([^?]*)\/.*#\1#')
+  readonly git_path=$(echo "$_raw_uri" | sed -E 's#.*@([^\?]+)\/([^\?]+).*(\?.*)?#\1#')
   # TODO: Validate git_path
-  readonly helm_file=$(echo "$_raw_uri" | sed -E 's#.*@[^?]*\/([^?]*).*#\1#')
+  readonly helm_file=$(echo "$_raw_uri" | sed -E 's#.*@([^\?]+)\/([^\?]+).*(\?.*)?#\2#')
 
   git_ref=$(echo "$_raw_uri" | sed '/^.*ref=\([^&#]*\).*$/!d;s//\1/')
   # TODO: Validate git_ref

diff --git a/tests/04-uri-validation.bats b/tests/04-uri-validation.bats
@@ -55,6 +55,6 @@ load 'test-helper'
 }
 
 @test "should success with forward slash in ref" {
-    _run_helm_git "git+https://github.com/jaroslaw-osmanski/helm-git-test@/index.yaml?ref=feature/feature-test"
+    _run_helm_git "git+https://github.com/jaroslaw-osmanski/helm-git-test@test-chart/index.yaml?ref=feature/feature-test"
     [ $status = 0 ]
 }