fix: fix subchart filenames for helm tests

srl-labs · Jun 13, 2024 · 3a4d02d · 3a4d02d
1 parent 99069fd
commit 3a4d02d
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 185 deletions.
diff --git a/.../clabernetes/tests/clicker_enabled/test-fixtures/golden/_subchart-github-clusterrole.yaml b/.../clabernetes/tests/clicker_enabled/test-fixtures/golden/_subchart-github-clusterrole.yaml
diff --git a/...netes/tests/clicker_enabled/test-fixtures/golden/_subchart-github-clusterrolebinding.yaml b/...netes/tests/clicker_enabled/test-fixtures/golden/_subchart-github-clusterrolebinding.yaml
diff --git a/charts/clabernetes/tests/clicker_enabled/test-fixtures/golden/_subchart-github-job.yaml b/charts/clabernetes/tests/clicker_enabled/test-fixtures/golden/_subchart-github-job.yaml
diff --git a/...abernetes/tests/clicker_enabled/test-fixtures/golden/_subchart-github-serviceaccount.yaml b/...abernetes/tests/clicker_enabled/test-fixtures/golden/_subchart-github-serviceaccount.yaml
diff --git a/charts/clicker/Chart.yaml b/charts/clicker/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
 name: clicker
-description: Cl(aberntes t)ick(l)er! For "clicking" on some nodes to perform clabernetes related cluster wide sysctl commands.
+description: Cl(abernetes t)ick(l)er! For "clicking" on some nodes to perform clabernetes related cluster wide sysctl commands.
 home: https://github.com/srl-labs/clabernetes
 sources:
   - https://github.com/srl-labs/clabernetes

diff --git a/charts/clicker/tests/default_values/default_values_test.go b/charts/clicker/tests/default_values/default_values_test.go
@@ -1,11 +1,11 @@
 package default_values_test
 
 import (
-	clabernetesconstants "github.com/srl-labs/clabernetes/constants"
 	"os"
 	"path/filepath"
 	"testing"
 
+	clabernetesconstants "github.com/srl-labs/clabernetes/constants"
 	clabernetestesthelper "github.com/srl-labs/clabernetes/testhelper"
 )
 

diff --git a/testhelper/helm.go b/testhelper/helm.go
@@ -157,8 +157,7 @@ func ReadAllRenderedTemplates(t *testing.T, rootRenderDir string) map[string][]b
 
 	for _, subChartFileName := range subChartFileNames {
 		subChartPathComponents := strings.Split(subChartFileName, string(filepath.Separator))
-
-		subChartName := subChartPathComponents[4]
+		subChartName := subChartPathComponents[len(subChartPathComponents)-3]
 
 		var contents []byte