Update single chart test to work with helm 2 and fix regexp to match …

…exact name and regardless of number of whitespaces or presence of quotes
aslafy-z · Feb 9, 2025 · 2a119a3 · 2a119a3
1 parent ea80f2b
commit 2a119a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/helm-git-plugin.sh b/helm-git-plugin.sh
@@ -465,7 +465,7 @@ main() {
   chart_search_root="$git_sub_path"
 
   if [ "$helm_chart_name" != "index.yaml" ] && [ "$cache_charts_enabled" = "1" ] && [ "$cache_charts_strategy" = "chart" ]; then
-    chart_search=$(find "$chart_search_root" -maxdepth 2 -name "Chart.yaml" -exec grep -l "name:\s$helm_chart_name" {} +)
+    chart_search=$(find "$chart_search_root" -maxdepth 2 -name "Chart.yaml" -exec grep -lE "name:\s*('|\")?${helm_chart_name}('|\")?(\s+|$)" {} +)
   else
     chart_search=$(find "$chart_search_root" -maxdepth 2 -name "Chart.yaml" -print)
   fi

diff --git a/tests/06-helm-git-cache.bats b/tests/06-helm-git-cache.bats
@@ -72,19 +72,19 @@ load 'test-helper'
     [ $status = 0 ]
     run "$HELM_BIN" plugin install "$HELM_GIT_DIRNAME"
     [ $status = 0 ]
-    run "$HELM_BIN" fetch -d "$HELM_GIT_OUTPUT" "git+https://github.com/istio/istio@manifests/charts/gateway-1.0.0.tgz?ref=1.24.2"
+    run "$HELM_BIN" fetch -d "$HELM_GIT_OUTPUT" "git+https://github.com/istio/istio@install/kubernetes/helm/istio-1.1.0.tgz?ref=1.1.0"
     [ $status = 0 ]
     echo "$output" | grep "Helm request not found in cache"
-    run stat "$HELM_GIT_OUTPUT/gateway-1.0.0.tgz"
+    run stat "$HELM_GIT_OUTPUT/istio-1.1.0.tgz"
     [ $status = 0 ]
     run bats_pipe ls -1 "$HELM_GIT_CHART_CACHE"/*/* \| grep -v index.yaml \| wc -l \| awk '{print $1}'
     [ "$output" -gt "1" ]
     run rm -rf "$HELM_GIT_CHART_CACHE"/*/*
     set_chart_cache_strategy "chart"
-    run "$HELM_BIN" fetch -d "$HELM_GIT_OUTPUT" "git+https://github.com/istio/istio@manifests/charts/gateway-1.0.0.tgz?ref=1.24.2"
+    run "$HELM_BIN" fetch -d "$HELM_GIT_OUTPUT" "git+https://github.com/istio/istio@install/kubernetes/helm/istio-1.1.0.tgz?ref=1.1.0"
     [ $status = 0 ]
     echo "$output" | grep "Helm request not found in cache"
-    run stat "$HELM_GIT_OUTPUT/gateway-1.0.0.tgz"
+    run stat "$HELM_GIT_OUTPUT/istio-1.1.0.tgz"
     [ $status = 0 ]
     run bats_pipe ls -1 "$HELM_GIT_CHART_CACHE"/*/* \| grep -v index.yaml \| wc -l \| awk '{print $1}'
     [ "$output" = "1" ]