ReAdding template file filtering

gruntwork-io · Oct 25, 2023 · 3af4232 · 3af4232
1 parent 2e57203
commit 3af4232
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/modules/helm/template.go b/modules/helm/template.go
@@ -92,17 +92,17 @@ func RenderRemoteTemplateE(t testing.TestingT, options *Options, chartURL string
 	if err != nil {
 		return "", err
 	}
-	// for _, templateFile := range templateFiles {
-	// 	// validate this is a valid template file
-	// 	absTemplateFile := filepath.Join(absChartDir, templateFile)
-	// 	if !strings.HasPrefix(templateFile, "charts") && !files.FileExists(absTemplateFile) {
-	// 		return "", errors.WithStackTrace(TemplateFileNotFoundError{Path: templateFile, ChartDir: absChartDir})
-	// 	}
-
-	// 	// Note: we only get the abs template file path to check it actually exists, but the `helm template` command
-	// 	// expects the relative path from the chart.
-	// 	args = append(args, "--show-only", templateFile)
-	// }
+	for _, templateFile := range templateFiles {
+		// validate this is a valid template file
+		// absTemplateFile := filepath.Join(absChartDir, templateFile)
+		// if !strings.HasPrefix(templateFile, "charts") && !files.FileExists(absTemplateFile) {
+		// 	return "", errors.WithStackTrace(TemplateFileNotFoundError{Path: templateFile, ChartDir: absChartDir})
+		// }
+
+		// Note: we only get the abs template file path to check it actually exists, but the `helm template` command
+		// expects the relative path from the chart.
+		args = append(args, "--show-only", templateFile)
+	}
 	// deal extraHelmArgs
 	args = append(args, extraHelmArgs...)
 

diff --git a/test/helm_keda_remote_example_template_test.go b/test/helm_keda_remote_example_template_test.go
@@ -61,7 +61,7 @@ func TestHelmKedaRemoteExampleTemplateRenderedDeployment(t *testing.T) {
 	// we want to assert that the template renders without any errors.
 	// Additionally, although we know there is only one yaml file in the template, we deliberately path a templateFiles
 	// arg to demonstrate how to select individual templates to render.
-	output := helm.RenderRemoteTemplate(t, options, "https://kedacore.github.io/charts", releaseName, []string{"templates/metrics-server/deployment.yamll"})
+	output := helm.RenderRemoteTemplate(t, options, "https://kedacore.github.io/charts", releaseName, []string{"templates/metrics-server/deployment.yaml"})
 
 	// Now we use kubernetes/client-go library to render the template output into the Deployment struct. This will
 	// ensure the Deployment resource is rendered correctly.