From fd022fded2a92e2dc9778acd866e0270e75dcf5a Mon Sep 17 00:00:00 2001 From: yxxhero Date: Mon, 3 Feb 2025 17:45:14 +0800 Subject: [PATCH] refactor(two_pass_renderer): remove unused imports and functions Signed-off-by: yxxhero --- pkg/app/two_pass_renderer.go | 48 ------------------------------------ 1 file changed, 48 deletions(-) diff --git a/pkg/app/two_pass_renderer.go b/pkg/app/two_pass_renderer.go index e950a7cb..4d907b33 100644 --- a/pkg/app/two_pass_renderer.go +++ b/pkg/app/two_pass_renderer.go @@ -5,8 +5,6 @@ import ( "fmt" "strings" - "github.com/google/go-cmp/cmp" - "github.com/helmfile/helmfile/pkg/environment" "github.com/helmfile/helmfile/pkg/state" "github.com/helmfile/helmfile/pkg/tmpl" @@ -21,52 +19,6 @@ func prependLineNumbers(text string) string { return buf.String() } -func (r *desiredStateLoader) renderPrestate(firstPassEnv, overrode *environment.Environment, baseDir, filename string, content []byte) (*environment.Environment, *state.HelmState) { - initEnv, err := firstPassEnv.Merge(overrode) - if err != nil { - return firstPassEnv, nil - } - tmplData := state.NewEnvironmentTemplateData(*initEnv, r.namespace, map[string]any{}) - firstPassRenderer := tmpl.NewFirstPassRenderer(baseDir, tmplData) - - // parse as much as we can, tolerate errors, this is a preparse - yamlBuf, err := firstPassRenderer.RenderTemplateContentToBuffer(content) - if err != nil { - r.logger.Debugf("first-pass rendering input of \"%s\":\n%s", filename, prependLineNumbers(string(content))) - r.logger.Debugf("template syntax error: %v", err) - if yamlBuf == nil { // we have a template syntax error, let the second parse report - return firstPassEnv, nil - } - } - yamlData := yamlBuf.String() - r.logger.Debugf("first-pass rendering output of \"%s\":\n%s", filename, prependLineNumbers(yamlData)) - - // Work-around for https://github.com/golang/go/issues/24963 - sanitized := strings.ReplaceAll(yamlData, "", "") - - if len(yamlData) != len(sanitized) { - msg := "replaced s to workaround https://github.com/golang/go/issues/24963 to address https://github.com/roboll/helmfile/issues/553:\n%s" - r.logger.Debugf(msg, cmp.Diff(yamlData, sanitized)) - } - - c := r.underlying() - c.Strict = false - // create preliminary state, as we may have an environment. Tolerate errors. - prestate, err := c.ParseAndLoad([]byte(sanitized), baseDir, filename, r.env, true, false, firstPassEnv, overrode) - if err != nil { - if _, ok := err.(*state.StateLoadError); ok { - r.logger.Debugf("could not deduce `environment:` block, configuring only .Environment.Name. error: %v", err) - } - r.logger.Debugf("error in first-pass rendering: result of \"%s\":\n%s", filename, prependLineNumbers(yamlBuf.String())) - } - - if prestate != nil { - firstPassEnv = &prestate.Env - } - - return firstPassEnv, prestate -} - type RenderOpts struct { }