From c6d402c6a29ab2ea5db4dd2c7489b6adeff9d53b Mon Sep 17 00:00:00 2001 From: yxxhero Date: Tue, 4 Feb 2025 19:47:40 +0800 Subject: [PATCH] fix tests Signed-off-by: yxxhero --- pkg/app/two_pass_renderer.go | 1 - pkg/app/two_pass_renderer_test.go | 45 ------------------------------- 2 files changed, 46 deletions(-) diff --git a/pkg/app/two_pass_renderer.go b/pkg/app/two_pass_renderer.go index 4d907b33..fddfa307 100644 --- a/pkg/app/two_pass_renderer.go +++ b/pkg/app/two_pass_renderer.go @@ -33,7 +33,6 @@ func (r *desiredStateLoader) renderTemplatesToYamlWithEnv(baseDir, filename stri } func (r *desiredStateLoader) twoPassRenderTemplateToYaml(inherited, overrode *environment.Environment, baseDir, filename string, content []byte) (*bytes.Buffer, error) { - // try a first pass render. This will always succeed, but can produce a limited env var phase string r.logger.Debugf("%srendering starting for \"%s\": inherited=%v, overrode=%v", phase, filename, inherited, overrode) diff --git a/pkg/app/two_pass_renderer_test.go b/pkg/app/two_pass_renderer_test.go index aa5e7c94..396c38e6 100644 --- a/pkg/app/two_pass_renderer_test.go +++ b/pkg/app/two_pass_renderer_test.go @@ -197,51 +197,6 @@ releases: } } -// This test shows that a gotmpl reference will get rendered correctly -// even if the pre-render disables the readFile and exec functions. -// This does not apply to .gotmpl files, which is a nice side-effect. -func TestReadFromYaml_RenderTemplateWithGotmpl(t *testing.T) { - defaultValuesYamlGotmpl := ` -releaseName: {{ readFile "nonIgnoredFile" }} -` - - yamlContent := []byte(` -environments: - staging: - values: - - values.yaml.gotmpl - production: - -{{ if (eq .Environment.Values.releaseName "release-a") }} # line 8 -releases: -- name: a - chart: mychart1 -{{ end }} -`) - - files := map[string]string{ - "/path/to/nonIgnoredFile": `release-a`, - "/path/to/values.yaml": defaultValuesYamlGotmpl, - } - - r, _, _ := makeLoader(files, "staging") - rendered, _ := r.renderTemplatesToYaml("", "", yamlContent) - - var state state.HelmState - err := yaml.Unmarshal(rendered.Bytes(), &state) - if err != nil { - t.Fatalf("unexpected error: %v", err) - } - - if len(state.Releases) != 1 { - t.Fatal("there should be 1 release") - } - - if state.Releases[0].Name != "a" { - t.Fatal("release should have been declared") - } -} - func TestReadFromYaml_RenderTemplateWithNamespace(t *testing.T) { yamlContent := []byte(`releases: - name: {{ .Namespace }}-myrelease