From 14f902c2455ee29436a4d23532db5ee234f3fc7e Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Mon, 2 Dec 2024 21:52:41 -0500 Subject: [PATCH 01/77] wip: draft at making cleaner stacktraces Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 50 ++++++++++++++++++++++++++++++++++++++- pkg/engine/engine_test.go | 21 ++++++++++++++++ 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 839ad4a31..00b3d917a 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -330,6 +330,11 @@ func cleanupParseError(filename string, err error) error { return fmt.Errorf("parse error at (%s): %s", string(location), errMsg) } +type TraceableError struct { + location string + message string +} + func cleanupExecError(filename string, err error) error { if _, isExecError := err.(template.ExecError); !isExecError { return err @@ -349,8 +354,51 @@ func cleanupExecError(filename string, err error) error { if len(parts) >= 2 { return fmt.Errorf("execution error at (%s): %s", string(location), parts[1]) } + current := err + fileLocations := []TraceableError{} + for { + if current == nil { + break + } + tokens = strings.SplitN(current.Error(), ": ", 3) + location = tokens[1] + traceable := TraceableError{ + location: location, + message: current.Error(), + } + fileLocations = append(fileLocations, traceable) + current = errors.Unwrap(current) + } + + prevMessage := "" + for i := len(fileLocations) - 1; i >= 0; i-- { + currentMsg := fileLocations[i].message + if i == len(fileLocations)-1 { + prevMessage = currentMsg + continue + } + + if strings.Contains(currentMsg, prevMessage) { + fileLocations[i].message = strings.ReplaceAll(fileLocations[i].message, prevMessage, "") + } + prevMessage = currentMsg + } + + for i := len(fileLocations) - 1; i >= 0; i-- { + if strings.Contains(fileLocations[i].message, fileLocations[i].location) { + fileLocations[i].message = strings.ReplaceAll(fileLocations[i].message, fileLocations[i].location, "") + } + } + + finalErrorString := "" + for _, i := range fileLocations { + if i.message == "" { + continue + } + finalErrorString = finalErrorString + "\n" + i.location + " " + i.message + } - return err + return fmt.Errorf("%s\n\n\n\nError: %s", finalErrorString, err.Error()) } func sortTemplates(tpls map[string]renderable) []string { diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index 68e0158fa..8445abf83 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -18,6 +18,8 @@ package engine import ( "fmt" + "github.com/stretchr/testify/assert" + "helm.sh/helm/v4/pkg/chart/v2/loader" "path" "strings" "sync" @@ -1301,6 +1303,25 @@ func TestRenderTplMissingKeyString(t *testing.T) { } } +func TestSometimesJesseJustBe(t *testing.T) { + c, _ := loader.Load("/home/jesse/code/camunda-platform-helm/charts/camunda-platform-8.5") + + v, _ := chartutil.ReadValuesFile("/home/jesse/code/helm/values.yaml") + val, _ := chartutil.CoalesceValues(c, v) + vals := map[string]interface{}{ + "Values": val.AsMap(), + } + out, err := Render(c, vals) + + if err != nil { + t.Errorf("Failed to render templates: %s", err) + } + assert.NotNil(t, out) + data := strings.TrimSpace(out["jesse-subchart-values-hacktest/charts/keycloak/templates/ingress.yaml"]) + fmt.Println(data) + assert.NotEmpty(t, data) +} + func TestRenderCustomTemplateFuncs(t *testing.T) { // Create a chart with two templates that use custom functions c := &chart.Chart{ From cc477e9f7919ad6a6962e5f1076acde9db0e37db Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Tue, 3 Dec 2024 18:32:56 -0500 Subject: [PATCH 02/77] fix: adjust test to not require external chart Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 2 +- pkg/engine/engine_test.go | 28 +++++++++++++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 00b3d917a..65e633f89 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -398,7 +398,7 @@ func cleanupExecError(filename string, err error) error { finalErrorString = finalErrorString + "\n" + i.location + " " + i.message } - return fmt.Errorf("%s\n\n\n\nError: %s", finalErrorString, err.Error()) + return fmt.Errorf("NEW ERROR FORMAT: \n%s\n\n\nORIGINAL ERROR:\n%s", finalErrorString, err.Error()) } func sortTemplates(tpls map[string]renderable) []string { diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index 8445abf83..fc2a1a3f3 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -19,7 +19,6 @@ package engine import ( "fmt" "github.com/stretchr/testify/assert" - "helm.sh/helm/v4/pkg/chart/v2/loader" "path" "strings" "sync" @@ -1303,23 +1302,34 @@ func TestRenderTplMissingKeyString(t *testing.T) { } } -func TestSometimesJesseJustBe(t *testing.T) { - c, _ := loader.Load("/home/jesse/code/camunda-platform-helm/charts/camunda-platform-8.5") +func TestNestedHelpersProducesMultilineStacktrace(t *testing.T) { + c := &chart.Chart{ + Metadata: &chart.Metadata{Name: "NestedHelperFunctions"}, + Templates: []*chart.File{ + {Name: "templates/svc.yaml", Data: []byte( + `name: {{ include "nested_helper.name" . }}`, + )}, + {Name: "templates/_helpers_1.tpl", Data: []byte( + `{{- define "nested_helper.name" -}}{{- include "common.names.get_name" . -}}{{- end -}}`, + )}, + {Name: "charts/common/templates/_helpers_2.tpl", Data: []byte( + `{{- define "common.names.get_name" -}}{{- .Release.Name | trunc 63 | trimSuffix "-" -}}{{- end -}}`, + )}, + }, + } + + v := chartutil.Values{} - v, _ := chartutil.ReadValuesFile("/home/jesse/code/helm/values.yaml") val, _ := chartutil.CoalesceValues(c, v) vals := map[string]interface{}{ "Values": val.AsMap(), } - out, err := Render(c, vals) + _, err := Render(c, vals) + assert.NotNil(t, err) if err != nil { t.Errorf("Failed to render templates: %s", err) } - assert.NotNil(t, out) - data := strings.TrimSpace(out["jesse-subchart-values-hacktest/charts/keycloak/templates/ingress.yaml"]) - fmt.Println(data) - assert.NotEmpty(t, data) } func TestRenderCustomTemplateFuncs(t *testing.T) { From 6cd0c0082a4f0c996adc7d71328b5d0d8953f1b8 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Mon, 23 Dec 2024 14:44:37 -0500 Subject: [PATCH 03/77] fix: split up the multiline errors to be more vertical Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 65e633f89..0336801c6 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -331,8 +331,9 @@ func cleanupParseError(filename string, err error) error { } type TraceableError struct { - location string - message string + location string + message string + executedFunction string } func cleanupExecError(filename string, err error) error { @@ -390,12 +391,35 @@ func cleanupExecError(filename string, err error) error { } } + for i := len(fileLocations) - 1; i >= 0; i-- { + if strings.Contains(fileLocations[i].message, "template:") { + fileLocations[i].message = strings.TrimSpace(strings.ReplaceAll(fileLocations[i].message, "template:", "")) + } + if strings.HasPrefix(fileLocations[i].message, ": ") { + fileLocations[i].message = strings.TrimSpace(strings.TrimPrefix(fileLocations[i].message, ": ")) + } + } + + for i := len(fileLocations) - 1; i >= 0; i-- { + if fileLocations[i].message == "" { + continue + } + executionLocationRegex, regexFindErr := regexp.Compile(`executing "[^\"]*" at <[^\<\>]*>:?\s*`) + if regexFindErr != nil { + continue + } + byteArrayMsg := []byte(fileLocations[i].message) + executionLocations := executionLocationRegex.FindAll(byteArrayMsg, -1) + fileLocations[i].executedFunction = string(executionLocations[0]) + fileLocations[i].message = strings.ReplaceAll(fileLocations[i].message, fileLocations[i].executedFunction, "") + } + finalErrorString := "" for _, i := range fileLocations { if i.message == "" { continue } - finalErrorString = finalErrorString + "\n" + i.location + " " + i.message + finalErrorString = finalErrorString + "\n" + i.location + "\n " + i.executedFunction + "\n " + i.message } return fmt.Errorf("NEW ERROR FORMAT: \n%s\n\n\nORIGINAL ERROR:\n%s", finalErrorString, err.Error()) From 87f9e2dc45532bb94421c9c817e12c5b37c789f8 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Mon, 23 Dec 2024 15:35:39 -0500 Subject: [PATCH 04/77] style: create String function for TraceableError representing one chunk of a stacktrace Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 0336801c6..5234ce293 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -336,6 +336,10 @@ type TraceableError struct { executedFunction string } +func (t TraceableError) String() string { + return t.location + "\n " + t.executedFunction + "\n " + t.message + "\n" +} + func cleanupExecError(filename string, err error) error { if _, isExecError := err.(template.ExecError); !isExecError { return err @@ -419,7 +423,7 @@ func cleanupExecError(filename string, err error) error { if i.message == "" { continue } - finalErrorString = finalErrorString + "\n" + i.location + "\n " + i.executedFunction + "\n " + i.message + finalErrorString = finalErrorString + i.String() } return fmt.Errorf("NEW ERROR FORMAT: \n%s\n\n\nORIGINAL ERROR:\n%s", finalErrorString, err.Error()) From a56daca82bb4b741bf59a6c1e2e7c8772d520859 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Mon, 23 Dec 2024 15:53:20 -0500 Subject: [PATCH 05/77] style: use interface functions instead of inline logic Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 58 +++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 5234ce293..273560212 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -340,6 +340,35 @@ func (t TraceableError) String() string { return t.location + "\n " + t.executedFunction + "\n " + t.message + "\n" } +func (t TraceableError) ExtractExecutedFunction() (TraceableError, error) { + executionLocationRegex, regexFindErr := regexp.Compile(`executing "[^\"]*" at <[^\<\>]*>:?\s*`) + if regexFindErr != nil { + return t, regexFindErr + } + byteArrayMsg := []byte(t.message) + executionLocations := executionLocationRegex.FindAll(byteArrayMsg, -1) + t.executedFunction = string(executionLocations[0]) + t.message = strings.ReplaceAll(t.message, t.executedFunction, "") + return t, nil +} + +func (t TraceableError) FilterLocation() TraceableError { + if strings.Contains(t.message, t.location) { + t.message = strings.ReplaceAll(t.message, t.location, "") + } + return t +} + +func (t TraceableError) FilterUnnecessaryWords() TraceableError { + if strings.Contains(t.message, "template:") { + t.message = strings.TrimSpace(strings.ReplaceAll(t.message, "template:", "")) + } + if strings.HasPrefix(t.message, ": ") { + t.message = strings.TrimSpace(strings.TrimPrefix(t.message, ": ")) + } + return t +} + func cleanupExecError(filename string, err error) error { if _, isExecError := err.(template.ExecError); !isExecError { return err @@ -389,33 +418,24 @@ func cleanupExecError(filename string, err error) error { prevMessage = currentMsg } - for i := len(fileLocations) - 1; i >= 0; i-- { - if strings.Contains(fileLocations[i].message, fileLocations[i].location) { - fileLocations[i].message = strings.ReplaceAll(fileLocations[i].message, fileLocations[i].location, "") - } + for i, fileLocation := range fileLocations { + t := fileLocation.FilterLocation() + fileLocations[i] = t } - for i := len(fileLocations) - 1; i >= 0; i-- { - if strings.Contains(fileLocations[i].message, "template:") { - fileLocations[i].message = strings.TrimSpace(strings.ReplaceAll(fileLocations[i].message, "template:", "")) - } - if strings.HasPrefix(fileLocations[i].message, ": ") { - fileLocations[i].message = strings.TrimSpace(strings.TrimPrefix(fileLocations[i].message, ": ")) - } + for i, fileLocation := range fileLocations { + fileLocations[i] = fileLocation.FilterUnnecessaryWords() } - for i := len(fileLocations) - 1; i >= 0; i-- { - if fileLocations[i].message == "" { + for i, fileLocation := range fileLocations { + if fileLocation.message == "" { continue } - executionLocationRegex, regexFindErr := regexp.Compile(`executing "[^\"]*" at <[^\<\>]*>:?\s*`) - if regexFindErr != nil { + t, extractionErr := fileLocation.ExtractExecutedFunction() + if extractionErr != nil { continue } - byteArrayMsg := []byte(fileLocations[i].message) - executionLocations := executionLocationRegex.FindAll(byteArrayMsg, -1) - fileLocations[i].executedFunction = string(executionLocations[0]) - fileLocations[i].message = strings.ReplaceAll(fileLocations[i].message, fileLocations[i].executedFunction, "") + fileLocations[i] = t } finalErrorString := "" From 1357db4db133a486d69f00072bf23754765e9fbf Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Mon, 23 Dec 2024 15:54:13 -0500 Subject: [PATCH 06/77] style: removed variable only used once Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 273560212..156aafcf0 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -419,8 +419,7 @@ func cleanupExecError(filename string, err error) error { } for i, fileLocation := range fileLocations { - t := fileLocation.FilterLocation() - fileLocations[i] = t + fileLocations[i] = fileLocation.FilterLocation() } for i, fileLocation := range fileLocations { From f09bbb8ab8b0a034bfc4cfbca35c395ed332ba2d Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Mon, 23 Dec 2024 16:19:16 -0500 Subject: [PATCH 07/77] style: consolidate for loops Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 156aafcf0..6a9b49a3d 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -419,14 +419,7 @@ func cleanupExecError(filename string, err error) error { } for i, fileLocation := range fileLocations { - fileLocations[i] = fileLocation.FilterLocation() - } - - for i, fileLocation := range fileLocations { - fileLocations[i] = fileLocation.FilterUnnecessaryWords() - } - - for i, fileLocation := range fileLocations { + fileLocations[i] = fileLocation.FilterLocation().FilterUnnecessaryWords() if fileLocation.message == "" { continue } From 2e3f6dce28b1c204bf99d6ba660365a0ca23adfe Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Mon, 23 Dec 2024 16:25:18 -0500 Subject: [PATCH 08/77] fix: save to fileLocation rather than fileLocations[i] which gets overwritten Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 6a9b49a3d..a533e3241 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -419,7 +419,7 @@ func cleanupExecError(filename string, err error) error { } for i, fileLocation := range fileLocations { - fileLocations[i] = fileLocation.FilterLocation().FilterUnnecessaryWords() + fileLocation = fileLocation.FilterLocation().FilterUnnecessaryWords() if fileLocation.message == "" { continue } From c48147098534e935ea5f9725fbfd04f39431791b Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Mon, 23 Dec 2024 16:27:31 -0500 Subject: [PATCH 09/77] style: renamed i variable for consistency Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index a533e3241..21d3fd2c8 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -431,11 +431,11 @@ func cleanupExecError(filename string, err error) error { } finalErrorString := "" - for _, i := range fileLocations { - if i.message == "" { + for _, fileLocation := range fileLocations { + if fileLocation.message == "" { continue } - finalErrorString = finalErrorString + i.String() + finalErrorString = finalErrorString + fileLocation.String() } return fmt.Errorf("NEW ERROR FORMAT: \n%s\n\n\nORIGINAL ERROR:\n%s", finalErrorString, err.Error()) From d8bec4e30f6f2aa068d0b90e68266d6cba7c8253 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Mon, 23 Dec 2024 16:33:03 -0500 Subject: [PATCH 10/77] fix: remove comparison from old error message to new Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 21d3fd2c8..4c7021872 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -437,8 +437,12 @@ func cleanupExecError(filename string, err error) error { } finalErrorString = finalErrorString + fileLocation.String() } + if strings.TrimSpace(finalErrorString) == "" { + // Fallback to original error message if nothing was extracted + return fmt.Errorf("%s", err.Error()) + } - return fmt.Errorf("NEW ERROR FORMAT: \n%s\n\n\nORIGINAL ERROR:\n%s", finalErrorString, err.Error()) + return fmt.Errorf("%s", finalErrorString) } func sortTemplates(tpls map[string]renderable) []string { From 383a758aecd00e6c1bd7043f0b6b9c8151d850eb Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Tue, 31 Dec 2024 18:47:09 -0500 Subject: [PATCH 11/77] fix: add quality checks to ensure formatted error doesnt remove important info Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 4c7021872..9d81a90db 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -369,6 +369,33 @@ func (t TraceableError) FilterUnnecessaryWords() TraceableError { return t } +// In the process of formatting the error, we want to ensure that the formatted version of the error +// is not losing any necessary information. This function will tokenize and compare the two strings +// and if the formatted error doesn't meet the threshold, it will fallback to the originalErr +func determineIfFormattedErrorIsAcceptable(formattedErr error, originalErr error) error { + formattedErrTokens := strings.Fields(formattedErr.Error()) + originalErrTokens := strings.Fields(originalErr.Error()) + + tokenSet := make(map[string]struct{}) + for _, token := range originalErrTokens { + tokenSet[token] = struct{}{} + } + + matchCount := 0 + for _, token := range formattedErrTokens { + if _, exists := tokenSet[token]; exists { + matchCount++ + } + } + + equivalenceRating := (float64(matchCount) / float64(len(formattedErrTokens))) * 100 + fmt.Printf("Rating: %f\n", equivalenceRating) + if equivalenceRating >= 80 { + return formattedErr + } + return originalErr +} + func cleanupExecError(filename string, err error) error { if _, isExecError := err.(template.ExecError); !isExecError { return err @@ -442,7 +469,7 @@ func cleanupExecError(filename string, err error) error { return fmt.Errorf("%s", err.Error()) } - return fmt.Errorf("%s", finalErrorString) + return determineIfFormattedErrorIsAcceptable(fmt.Errorf("%s", finalErrorString), err) } func sortTemplates(tpls map[string]renderable) []string { From 6bb836374b1b27841f2ed1db93028e7502cb8148 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Tue, 31 Dec 2024 18:54:34 -0500 Subject: [PATCH 12/77] test: adjusted to make it more meaningful and to pass Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 1 - pkg/engine/engine_test.go | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 9d81a90db..c8e50eed5 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -389,7 +389,6 @@ func determineIfFormattedErrorIsAcceptable(formattedErr error, originalErr error } equivalenceRating := (float64(matchCount) / float64(len(formattedErrTokens))) * 100 - fmt.Printf("Rating: %f\n", equivalenceRating) if equivalenceRating >= 80 { return formattedErr } diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index fc2a1a3f3..55fb0087c 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -1318,6 +1318,17 @@ func TestNestedHelpersProducesMultilineStacktrace(t *testing.T) { }, } + expectedErrorMessage := `NestedHelperFunctions/templates/svc.yaml:1:9 + executing "NestedHelperFunctions/templates/svc.yaml" at : + error calling include: +NestedHelperFunctions/templates/_helpers_1.tpl:1:39 + executing "nested_helper.name" at : + error calling include: +NestedHelperFunctions/charts/common/templates/_helpers_2.tpl:1:50 + executing "common.names.get_name" at <.Release.Name>: + nil pointer evaluating interface {}.Name +` + v := chartutil.Values{} val, _ := chartutil.CoalesceValues(c, v) @@ -1327,9 +1338,7 @@ func TestNestedHelpersProducesMultilineStacktrace(t *testing.T) { _, err := Render(c, vals) assert.NotNil(t, err) - if err != nil { - t.Errorf("Failed to render templates: %s", err) - } + assert.Equal(t, expectedErrorMessage, err.Error()) } func TestRenderCustomTemplateFuncs(t *testing.T) { From 487f72b822655185c279e87a4bef51c7b51792c6 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Wed, 1 Jan 2025 12:26:39 -0500 Subject: [PATCH 13/77] fix: added protection against while-true condition in unbounded for loop Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index c8e50eed5..e06c18f34 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -392,7 +392,7 @@ func determineIfFormattedErrorIsAcceptable(formattedErr error, originalErr error if equivalenceRating >= 80 { return formattedErr } - return originalErr + return fmt.Errorf("%s", originalErr.Error()) } func cleanupExecError(filename string, err error) error { @@ -416,7 +416,8 @@ func cleanupExecError(filename string, err error) error { } current := err fileLocations := []TraceableError{} - for { + maxIterations := 100 + for i := 0; i < maxIterations && current != nil; i++ { if current == nil { break } @@ -429,6 +430,9 @@ func cleanupExecError(filename string, err error) error { fileLocations = append(fileLocations, traceable) current = errors.Unwrap(current) } + if current != nil { + return fmt.Errorf("%s", err.Error()) + } prevMessage := "" for i := len(fileLocations) - 1; i >= 0; i-- { From edf0f7be592c3909ece2735f93278ce9d859b813 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sat, 25 Jan 2025 09:04:21 -0500 Subject: [PATCH 14/77] test: adjust formatting for error in test Signed-off-by: Jesse Simpson --- pkg/action/install_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go index e39674c80..6a028bd85 100644 --- a/pkg/action/install_test.go +++ b/pkg/action/install_test.go @@ -446,7 +446,9 @@ func TestInstallReleaseIncorrectTemplate_DryRun(t *testing.T) { instAction.DryRun = true vals := map[string]interface{}{} _, err := instAction.Run(buildChart(withSampleIncludingIncorrectTemplates()), vals) - expectedErr := "\"hello/templates/incorrect\" at <.Values.bad.doh>: nil pointer evaluating interface {}.doh" + expectedErr := `hello/templates/incorrect:1:10 + executing "hello/templates/incorrect" at <.Values.bad.doh>: + nil pointer evaluating interface {}.doh` if err == nil { t.Fatalf("Install should fail containing error: %s", expectedErr) } From 80d7a1b33f556c03bbf3b39fea488ca34731a2d2 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sat, 25 Jan 2025 09:26:02 -0500 Subject: [PATCH 15/77] style: make format Signed-off-by: Jesse Simpson --- pkg/engine/engine_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index 55fb0087c..79560bc75 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -18,13 +18,14 @@ package engine import ( "fmt" - "github.com/stretchr/testify/assert" "path" "strings" "sync" "testing" "text/template" + "github.com/stretchr/testify/assert" + "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" From 98da3e28b666b04664a787e515d2a3adc1fb0289 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sat, 25 Jan 2025 10:06:06 -0500 Subject: [PATCH 16/77] fix: add some index checking and fixed a test that relied on type-checking Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 10 +++++++++- pkg/engine/engine_test.go | 14 ++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index e06c18f34..0c7d72dba 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -347,6 +347,9 @@ func (t TraceableError) ExtractExecutedFunction() (TraceableError, error) { } byteArrayMsg := []byte(t.message) executionLocations := executionLocationRegex.FindAll(byteArrayMsg, -1) + if len(executionLocations) == 0 { + return t, nil + } t.executedFunction = string(executionLocations[0]) t.message = strings.ReplaceAll(t.message, t.executedFunction, "") return t, nil @@ -422,7 +425,12 @@ func cleanupExecError(filename string, err error) error { break } tokens = strings.SplitN(current.Error(), ": ", 3) - location = tokens[1] + if len(tokens) == 1 { + // For cases where the error message doesn't contain a colon + location = tokens[0] + } else { + location = tokens[1] + } traceable := TraceableError{ location: location, message: current.Error(), diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index 79560bc75..a34082e5f 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -22,7 +22,6 @@ import ( "strings" "sync" "testing" - "text/template" "github.com/stretchr/testify/assert" @@ -1291,16 +1290,11 @@ func TestRenderTplMissingKeyString(t *testing.T) { t.Errorf("Expected error, got %v", out) return } - switch err.(type) { - case (template.ExecError): - errTxt := fmt.Sprint(err) - if !strings.Contains(errTxt, "noSuchKey") { - t.Errorf("Expected error to contain 'noSuchKey', got %s", errTxt) - } - default: - // Some unexpected error. - t.Fatal(err) + errTxt := fmt.Sprint(err) + if !strings.Contains(errTxt, "noSuchKey") { + t.Errorf("Expected error to contain 'noSuchKey', got %s", errTxt) } + } func TestNestedHelpersProducesMultilineStacktrace(t *testing.T) { From daf4c348791a81607dc5ced88fff3b18ede847a4 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sat, 22 Feb 2025 09:46:21 -0500 Subject: [PATCH 17/77] fix: use originalErr instead of formatting original error Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 0c7d72dba..d70e9fdad 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -395,7 +395,7 @@ func determineIfFormattedErrorIsAcceptable(formattedErr error, originalErr error if equivalenceRating >= 80 { return formattedErr } - return fmt.Errorf("%s", originalErr.Error()) + return originalErr } func cleanupExecError(filename string, err error) error { From 13b232e061f0d33d365beb9dc28ca72656051552 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sat, 22 Feb 2025 11:58:11 -0500 Subject: [PATCH 18/77] refactor: make use of regexs for err parsing Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 132 ++++++++++++++------------------------ pkg/engine/engine_test.go | 6 +- 2 files changed, 50 insertions(+), 88 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index d70e9fdad..48020a521 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -339,67 +339,22 @@ type TraceableError struct { func (t TraceableError) String() string { return t.location + "\n " + t.executedFunction + "\n " + t.message + "\n" } - -func (t TraceableError) ExtractExecutedFunction() (TraceableError, error) { - executionLocationRegex, regexFindErr := regexp.Compile(`executing "[^\"]*" at <[^\<\>]*>:?\s*`) - if regexFindErr != nil { - return t, regexFindErr - } - byteArrayMsg := []byte(t.message) - executionLocations := executionLocationRegex.FindAll(byteArrayMsg, -1) - if len(executionLocations) == 0 { - return t, nil - } - t.executedFunction = string(executionLocations[0]) - t.message = strings.ReplaceAll(t.message, t.executedFunction, "") - return t, nil -} - -func (t TraceableError) FilterLocation() TraceableError { - if strings.Contains(t.message, t.location) { - t.message = strings.ReplaceAll(t.message, t.location, "") - } - return t -} - -func (t TraceableError) FilterUnnecessaryWords() TraceableError { - if strings.Contains(t.message, "template:") { - t.message = strings.TrimSpace(strings.ReplaceAll(t.message, "template:", "")) - } - if strings.HasPrefix(t.message, ": ") { - t.message = strings.TrimSpace(strings.TrimPrefix(t.message, ": ")) - } - return t -} - -// In the process of formatting the error, we want to ensure that the formatted version of the error -// is not losing any necessary information. This function will tokenize and compare the two strings -// and if the formatted error doesn't meet the threshold, it will fallback to the originalErr -func determineIfFormattedErrorIsAcceptable(formattedErr error, originalErr error) error { - formattedErrTokens := strings.Fields(formattedErr.Error()) - originalErrTokens := strings.Fields(originalErr.Error()) - - tokenSet := make(map[string]struct{}) - for _, token := range originalErrTokens { - tokenSet[token] = struct{}{} +func cleanupExecError(filename string, err error) error { + if _, isExecError := err.(template.ExecError); !isExecError { + return err } - matchCount := 0 - for _, token := range formattedErrTokens { - if _, exists := tokenSet[token]; exists { - matchCount++ - } - } + // taken from https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=138 + // > "template: %s: %s" + // taken from https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=141 + // > "template: %s: executing %q at <%s>: %s" - equivalenceRating := (float64(matchCount) / float64(len(formattedErrTokens))) * 100 - if equivalenceRating >= 80 { - return formattedErr + execErrFmt, compileErr := regexp.Compile(`^template: (?P(?U).+): executing (?P(?U).+) at (?P(?U).+): (?P(?U).+)(?P( template:.*)?)$`) + if compileErr != nil { + return err } - return originalErr -} - -func cleanupExecError(filename string, err error) error { - if _, isExecError := err.(template.ExecError); !isExecError { + execErrFmtWithoutTemplate, compileErr := regexp.Compile(`^template: (?P(?U).+): (?P.*)(?P( template:.*)?)$`) + if compileErr != nil { return err } @@ -424,16 +379,35 @@ func cleanupExecError(filename string, err error) error { if current == nil { break } - tokens = strings.SplitN(current.Error(), ": ", 3) - if len(tokens) == 1 { - // For cases where the error message doesn't contain a colon - location = tokens[0] + + var traceable TraceableError + if execErrFmt.MatchString(current.Error()) { + matches := execErrFmt.FindStringSubmatch(current.Error()) + templateIndex := execErrFmt.SubexpIndex("templateName") + templateName := matches[templateIndex] + functionNameIndex := execErrFmt.SubexpIndex("functionName") + functionName := matches[functionNameIndex] + locationNameIndex := execErrFmt.SubexpIndex("location") + locationName := matches[locationNameIndex] + errMsgIndex := execErrFmt.SubexpIndex("errMsg") + errMsg := matches[errMsgIndex] + traceable = TraceableError{ + location: templateName, + message: errMsg, + executedFunction: "executing " + functionName + " at " + locationName + ":", + } + } else if execErrFmtWithoutTemplate.MatchString(current.Error()) { + matches := execErrFmt.FindStringSubmatch(current.Error()) + templateIndex := execErrFmt.SubexpIndex("templateName") + templateName := matches[templateIndex] + errMsgIndex := execErrFmt.SubexpIndex("errMsg") + errMsg := matches[errMsgIndex] + traceable = TraceableError{ + location: templateName, + message: errMsg, + } } else { - location = tokens[1] - } - traceable := TraceableError{ - location: location, - message: current.Error(), + return err } fileLocations = append(fileLocations, traceable) current = errors.Unwrap(current) @@ -442,30 +416,18 @@ func cleanupExecError(filename string, err error) error { return fmt.Errorf("%s", err.Error()) } - prevMessage := "" + var prev TraceableError for i := len(fileLocations) - 1; i >= 0; i-- { - currentMsg := fileLocations[i].message + current := fileLocations[i] if i == len(fileLocations)-1 { - prevMessage = currentMsg + prev = current continue } - if strings.Contains(currentMsg, prevMessage) { - fileLocations[i].message = strings.ReplaceAll(fileLocations[i].message, prevMessage, "") - } - prevMessage = currentMsg - } - - for i, fileLocation := range fileLocations { - fileLocation = fileLocation.FilterLocation().FilterUnnecessaryWords() - if fileLocation.message == "" { - continue - } - t, extractionErr := fileLocation.ExtractExecutedFunction() - if extractionErr != nil { - continue + if current.message == prev.message && current.location == prev.location && current.executedFunction == prev.executedFunction { + fileLocations[i].message = "" } - fileLocations[i] = t + prev = current } finalErrorString := "" @@ -480,7 +442,7 @@ func cleanupExecError(filename string, err error) error { return fmt.Errorf("%s", err.Error()) } - return determineIfFormattedErrorIsAcceptable(fmt.Errorf("%s", finalErrorString), err) + return fmt.Errorf("%s", finalErrorString) } func sortTemplates(tpls map[string]renderable) []string { diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index a34082e5f..58d8588ab 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -1314,13 +1314,13 @@ func TestNestedHelpersProducesMultilineStacktrace(t *testing.T) { } expectedErrorMessage := `NestedHelperFunctions/templates/svc.yaml:1:9 - executing "NestedHelperFunctions/templates/svc.yaml" at : + executing "NestedHelperFunctions/templates/svc.yaml" at : error calling include: NestedHelperFunctions/templates/_helpers_1.tpl:1:39 - executing "nested_helper.name" at : + executing "nested_helper.name" at : error calling include: NestedHelperFunctions/charts/common/templates/_helpers_2.tpl:1:50 - executing "common.names.get_name" at <.Release.Name>: + executing "common.names.get_name" at <.Release.Name>: nil pointer evaluating interface {}.Name ` From 0a7dd4b269da6b8f739c7189b06227e16c3dafe7 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sat, 22 Feb 2025 12:15:49 -0500 Subject: [PATCH 19/77] test: adjust failing test on extra whitespace Signed-off-by: Jesse Simpson --- pkg/action/install_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go index 6a028bd85..61cc2946f 100644 --- a/pkg/action/install_test.go +++ b/pkg/action/install_test.go @@ -447,7 +447,7 @@ func TestInstallReleaseIncorrectTemplate_DryRun(t *testing.T) { vals := map[string]interface{}{} _, err := instAction.Run(buildChart(withSampleIncludingIncorrectTemplates()), vals) expectedErr := `hello/templates/incorrect:1:10 - executing "hello/templates/incorrect" at <.Values.bad.doh>: + executing "hello/templates/incorrect" at <.Values.bad.doh>: nil pointer evaluating interface {}.doh` if err == nil { t.Fatalf("Install should fail containing error: %s", expectedErr) From deea4a0d0e91f7d25761a07713fbcb362cc46f49 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sat, 22 Feb 2025 12:34:05 -0500 Subject: [PATCH 20/77] refactor: remove more unnecessary format calls Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 48020a521..74cc899ef 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -413,7 +413,7 @@ func cleanupExecError(filename string, err error) error { current = errors.Unwrap(current) } if current != nil { - return fmt.Errorf("%s", err.Error()) + return err } var prev TraceableError @@ -439,7 +439,7 @@ func cleanupExecError(filename string, err error) error { } if strings.TrimSpace(finalErrorString) == "" { // Fallback to original error message if nothing was extracted - return fmt.Errorf("%s", err.Error()) + return err } return fmt.Errorf("%s", finalErrorString) From 3cc4cb60ba3316e25c630d263a0aad9225441af0 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sat, 22 Feb 2025 13:10:07 -0500 Subject: [PATCH 21/77] refactor: prevent duplicates being inserted rather than post-filtering Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 74cc899ef..d5c507eab 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -379,6 +379,9 @@ func cleanupExecError(filename string, err error) error { if current == nil { break } + if i == maxIterations-1 { + return err + } var traceable TraceableError if execErrFmt.MatchString(current.Error()) { @@ -409,34 +412,24 @@ func cleanupExecError(filename string, err error) error { } else { return err } + if len(fileLocations) > 0 { + lastErr := fileLocations[len(fileLocations)-1] + if lastErr.message == traceable.message && + lastErr.location == traceable.location && + lastErr.executedFunction == traceable.executedFunction { + current = errors.Unwrap(current) + continue + } + } fileLocations = append(fileLocations, traceable) current = errors.Unwrap(current) } - if current != nil { - return err - } - - var prev TraceableError - for i := len(fileLocations) - 1; i >= 0; i-- { - current := fileLocations[i] - if i == len(fileLocations)-1 { - prev = current - continue - } - - if current.message == prev.message && current.location == prev.location && current.executedFunction == prev.executedFunction { - fileLocations[i].message = "" - } - prev = current - } finalErrorString := "" for _, fileLocation := range fileLocations { - if fileLocation.message == "" { - continue - } finalErrorString = finalErrorString + fileLocation.String() } + if strings.TrimSpace(finalErrorString) == "" { // Fallback to original error message if nothing was extracted return err From cdcf1bc6016593126b92c0eab09adaa55ed5e0e8 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sun, 16 Mar 2025 20:45:11 -0400 Subject: [PATCH 22/77] style: remove unnecessary break Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index d5c507eab..c1356e7c2 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -376,9 +376,6 @@ func cleanupExecError(filename string, err error) error { fileLocations := []TraceableError{} maxIterations := 100 for i := 0; i < maxIterations && current != nil; i++ { - if current == nil { - break - } if i == maxIterations-1 { return err } From cbdc22128eb5e01041311e30267beb0dbbea9c3b Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sun, 16 Mar 2025 20:45:31 -0400 Subject: [PATCH 23/77] refactor: use strings.Builder instead of string concatenation Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index c1356e7c2..46e75a1f3 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -422,17 +422,17 @@ func cleanupExecError(filename string, err error) error { current = errors.Unwrap(current) } - finalErrorString := "" + var finalErrorString strings.Builder for _, fileLocation := range fileLocations { - finalErrorString = finalErrorString + fileLocation.String() + fmt.Fprintf(&finalErrorString, "%s", fileLocation.String()) } - if strings.TrimSpace(finalErrorString) == "" { + if strings.TrimSpace(finalErrorString.String()) == "" { // Fallback to original error message if nothing was extracted return err } - return fmt.Errorf("%s", finalErrorString) + return fmt.Errorf("%s", finalErrorString.String()) } func sortTemplates(tpls map[string]renderable) []string { From 5202820f2f9a0c04514f2c15621491d398623ac4 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sun, 16 Mar 2025 20:53:18 -0400 Subject: [PATCH 24/77] refactor: define regexs at package scope Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 46e75a1f3..0dea01dd6 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -33,6 +33,14 @@ import ( chartutil "helm.sh/helm/v4/pkg/chart/v2/util" ) +// taken from https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=141 +// > "template: %s: executing %q at <%s>: %s" +var execErrFmt = regexp.MustCompile(`^template: (?P(?U).+): executing (?P(?U).+) at (?P(?U).+): (?P(?U).+)(?P( template:.*)?)$`) + +// taken from https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=138 +// > "template: %s: %s" +var execErrFmtWithoutTemplate = regexp.MustCompile(`^template: (?P(?U).+): (?P.*)(?P( template:.*)?)$`) + // Engine is an implementation of the Helm rendering implementation for templates. type Engine struct { // If strict is enabled, template rendering will fail if a template references @@ -344,20 +352,6 @@ func cleanupExecError(filename string, err error) error { return err } - // taken from https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=138 - // > "template: %s: %s" - // taken from https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=141 - // > "template: %s: executing %q at <%s>: %s" - - execErrFmt, compileErr := regexp.Compile(`^template: (?P(?U).+): executing (?P(?U).+) at (?P(?U).+): (?P(?U).+)(?P( template:.*)?)$`) - if compileErr != nil { - return err - } - execErrFmtWithoutTemplate, compileErr := regexp.Compile(`^template: (?P(?U).+): (?P.*)(?P( template:.*)?)$`) - if compileErr != nil { - return err - } - tokens := strings.SplitN(err.Error(), ": ", 3) if len(tokens) != 3 { // This might happen if a non-templating error occurs From 4f63c7335306f9197f6d560fbf3ccf3c5416e248 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sun, 16 Mar 2025 21:07:52 -0400 Subject: [PATCH 25/77] refactor: remove impractical safety check Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 0dea01dd6..3be69f1ab 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -421,11 +421,6 @@ func cleanupExecError(filename string, err error) error { fmt.Fprintf(&finalErrorString, "%s", fileLocation.String()) } - if strings.TrimSpace(finalErrorString.String()) == "" { - // Fallback to original error message if nothing was extracted - return err - } - return fmt.Errorf("%s", finalErrorString.String()) } From 4b9a9ecaf64acddea4f8a2cc5d22a8ad04d8b727 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sun, 16 Mar 2025 21:21:04 -0400 Subject: [PATCH 26/77] refactor: rename function and add doc-string Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 3be69f1ab..cc1951af7 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -312,7 +312,7 @@ func (e Engine) render(tpls map[string]renderable) (rendered map[string]string, vals["Template"] = chartutil.Values{"Name": filename, "BasePath": tpls[filename].basePath} var buf strings.Builder if err := t.ExecuteTemplate(&buf, filename, vals); err != nil { - return map[string]string{}, cleanupExecError(filename, err) + return map[string]string{}, reformatExecErrorMsg(filename, err) } // Work around the issue where Go will emit "" even if Options(missing=zero) @@ -347,7 +347,14 @@ type TraceableError struct { func (t TraceableError) String() string { return t.location + "\n " + t.executedFunction + "\n " + t.message + "\n" } -func cleanupExecError(filename string, err error) error { + +// reformatExecErrorMsg takes an error message for template rendering and formats it into a formatted +// multi-line error string +func reformatExecErrorMsg(filename string, err error) error { + // This function matches the error message against regex's for the text/template package. + // If the regex's can parse out details from that error message such as the line number, template it failed on, + // and error description, then it will construct a new error that displays these details in a structured way. + // If there are issues with parsing the error message, the err passed into the function should return instead. if _, isExecError := err.(template.ExecError); !isExecError { return err } From 782f6c640987f3df24b5e925e3bece4e7fdc17df Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Mon, 17 Mar 2025 12:37:18 -0400 Subject: [PATCH 27/77] refactor: shorten regex subexp syntax Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index cc1951af7..ad2c1679d 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -384,14 +384,10 @@ func reformatExecErrorMsg(filename string, err error) error { var traceable TraceableError if execErrFmt.MatchString(current.Error()) { matches := execErrFmt.FindStringSubmatch(current.Error()) - templateIndex := execErrFmt.SubexpIndex("templateName") - templateName := matches[templateIndex] - functionNameIndex := execErrFmt.SubexpIndex("functionName") - functionName := matches[functionNameIndex] - locationNameIndex := execErrFmt.SubexpIndex("location") - locationName := matches[locationNameIndex] - errMsgIndex := execErrFmt.SubexpIndex("errMsg") - errMsg := matches[errMsgIndex] + templateName := matches[execErrFmt.SubexpIndex("templateName")] + functionName := matches[execErrFmt.SubexpIndex("functionName")] + locationName := matches[execErrFmt.SubexpIndex("location")] + errMsg := matches[execErrFmt.SubexpIndex("errMsg")] traceable = TraceableError{ location: templateName, message: errMsg, @@ -399,10 +395,8 @@ func reformatExecErrorMsg(filename string, err error) error { } } else if execErrFmtWithoutTemplate.MatchString(current.Error()) { matches := execErrFmt.FindStringSubmatch(current.Error()) - templateIndex := execErrFmt.SubexpIndex("templateName") - templateName := matches[templateIndex] - errMsgIndex := execErrFmt.SubexpIndex("errMsg") - errMsg := matches[errMsgIndex] + templateName := matches[execErrFmt.SubexpIndex("templateName")] + errMsg := matches[execErrFmt.SubexpIndex("errMsg")] traceable = TraceableError{ location: templateName, message: errMsg, From 65084371c9a774c6c4c6afadd5f6fa2152b31b8a Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Mon, 17 Mar 2025 12:39:55 -0400 Subject: [PATCH 28/77] refactor: replace if MatchString with FindStringSubMatch Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index ad2c1679d..26f80a2f0 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -382,8 +382,7 @@ func reformatExecErrorMsg(filename string, err error) error { } var traceable TraceableError - if execErrFmt.MatchString(current.Error()) { - matches := execErrFmt.FindStringSubmatch(current.Error()) + if matches := execErrFmt.FindStringSubmatch(current.Error()); matches != nil { templateName := matches[execErrFmt.SubexpIndex("templateName")] functionName := matches[execErrFmt.SubexpIndex("functionName")] locationName := matches[execErrFmt.SubexpIndex("location")] @@ -393,8 +392,7 @@ func reformatExecErrorMsg(filename string, err error) error { message: errMsg, executedFunction: "executing " + functionName + " at " + locationName + ":", } - } else if execErrFmtWithoutTemplate.MatchString(current.Error()) { - matches := execErrFmt.FindStringSubmatch(current.Error()) + } else if matches := execErrFmtWithoutTemplate.FindStringSubmatch(current.Error()); matches != nil { templateName := matches[execErrFmt.SubexpIndex("templateName")] errMsg := matches[execErrFmt.SubexpIndex("errMsg")] traceable = TraceableError{ From ac98e977c392885c702515f4899b8f2a2c873870 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Tue, 18 Mar 2025 20:30:19 -0400 Subject: [PATCH 29/77] refactor: switch to while loop instead of for to reduce unnecessary variables Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 26f80a2f0..fee26490f 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -375,12 +375,7 @@ func reformatExecErrorMsg(filename string, err error) error { } current := err fileLocations := []TraceableError{} - maxIterations := 100 - for i := 0; i < maxIterations && current != nil; i++ { - if i == maxIterations-1 { - return err - } - + for current != nil { var traceable TraceableError if matches := execErrFmt.FindStringSubmatch(current.Error()); matches != nil { templateName := matches[execErrFmt.SubexpIndex("templateName")] From 48922e21d1e1647957ea7570d2b4c1fbf81283f5 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Tue, 18 Mar 2025 20:39:06 -0400 Subject: [PATCH 30/77] refactor: use struct equality instead of comparing each composition Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index fee26490f..7b0f87feb 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -399,9 +399,7 @@ func reformatExecErrorMsg(filename string, err error) error { } if len(fileLocations) > 0 { lastErr := fileLocations[len(fileLocations)-1] - if lastErr.message == traceable.message && - lastErr.location == traceable.location && - lastErr.executedFunction == traceable.executedFunction { + if lastErr == traceable { current = errors.Unwrap(current) continue } From 868cdc261ff645052c00b917b43e83187bb91a7f Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Tue, 18 Mar 2025 21:11:25 -0400 Subject: [PATCH 31/77] refactor: reduce flow-control operations Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 7b0f87feb..5b6999021 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -397,14 +397,9 @@ func reformatExecErrorMsg(filename string, err error) error { } else { return err } - if len(fileLocations) > 0 { - lastErr := fileLocations[len(fileLocations)-1] - if lastErr == traceable { - current = errors.Unwrap(current) - continue - } + if len(fileLocations) == 0 || fileLocations[len(fileLocations)-1] != traceable { + fileLocations = append(fileLocations, traceable) } - fileLocations = append(fileLocations, traceable) current = errors.Unwrap(current) } From 013f27c2947362a79f1c93a10add188e67c280fc Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Sun, 20 Apr 2025 17:45:59 -0400 Subject: [PATCH 32/77] fix: use errors.New instead of fmt.Errorf Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 5b6999021..04feb43fe 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -408,7 +408,7 @@ func reformatExecErrorMsg(filename string, err error) error { fmt.Fprintf(&finalErrorString, "%s", fileLocation.String()) } - return fmt.Errorf("%s", finalErrorString.String()) + return errors.New(finalErrorString.String()) } func sortTemplates(tpls map[string]renderable) []string { From 0e0a8cc76534177a1c9809804232ac334d7f0f0e Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Wed, 23 Apr 2025 21:56:30 -0400 Subject: [PATCH 33/77] fix: address no-template-associated type of error Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 20 +++++++++++++++++++- pkg/engine/engine_test.go | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 04feb43fe..7c92b4505 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -41,6 +41,10 @@ var execErrFmt = regexp.MustCompile(`^template: (?P(?U).+): execut // > "template: %s: %s" var execErrFmtWithoutTemplate = regexp.MustCompile(`^template: (?P(?U).+): (?P.*)(?P( template:.*)?)$`) +// taken from https://cs.opensource.google/go/go/+/refs/tags/go1.23.6:src/text/template/exec.go;l=191 +// > "template: no template %q associated with template %q" +var execErrNoTemplateAssociated = regexp.MustCompile(`^template: no template (?P.*) associated with template (?P(.*)?)$`) + // Engine is an implementation of the Helm rendering implementation for templates. type Engine struct { // If strict is enabled, template rendering will fail if a template references @@ -345,7 +349,17 @@ type TraceableError struct { } func (t TraceableError) String() string { - return t.location + "\n " + t.executedFunction + "\n " + t.message + "\n" + var errorString strings.Builder + if t.location != "" { + fmt.Fprintf(&errorString, "%s\n ", t.location) + } + if t.executedFunction != "" { + fmt.Fprintf(&errorString, "%s\n ", t.executedFunction) + } + if t.message != "" { + fmt.Fprintf(&errorString, "%s\n", t.message) + } + return errorString.String() } // reformatExecErrorMsg takes an error message for template rendering and formats it into a formatted @@ -394,6 +408,10 @@ func reformatExecErrorMsg(filename string, err error) error { location: templateName, message: errMsg, } + } else if matches := execErrNoTemplateAssociated.FindStringSubmatch(current.Error()); matches != nil { + traceable = TraceableError{ + message: current.Error(), + } } else { return err } diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index 58d8588ab..5359465d4 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -22,6 +22,7 @@ import ( "strings" "sync" "testing" + "text/template" "github.com/stretchr/testify/assert" @@ -1336,6 +1337,40 @@ NestedHelperFunctions/charts/common/templates/_helpers_2.tpl:1:50 assert.Equal(t, expectedErrorMessage, err.Error()) } +func TestMultilineNoTemplateAssociatedError(t *testing.T) { + c := &chart.Chart{ + Metadata: &chart.Metadata{Name: "multiline"}, + Templates: []*chart.File{ + {Name: "templates/svc.yaml", Data: []byte( + `name: {{ include "nested_helper.name" . }}`, + )}, + {Name: "templates/test.yaml", Data: []byte( + `{{ toYaml .Values }}`, + )}, + {Name: "charts/common/templates/_helpers_2.tpl", Data: []byte( + `{{ toYaml .Values }}`, + )}, + }, + } + + expectedErrorMessage := `multiline/templates/svc.yaml:1:9 + executing "multiline/templates/svc.yaml" at : + error calling include: +template: no template "nested_helper.name" associated with template "gotpl" +` + + v := chartutil.Values{} + + val, _ := chartutil.CoalesceValues(c, v) + vals := map[string]interface{}{ + "Values": val.AsMap(), + } + _, err := Render(c, vals) + + assert.NotNil(t, err) + assert.Equal(t, expectedErrorMessage, err.Error()) +} + func TestRenderCustomTemplateFuncs(t *testing.T) { // Create a chart with two templates that use custom functions c := &chart.Chart{ From d10c5f642901946d9bf89e01e29a85ffdd97c690 Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Wed, 23 Apr 2025 22:07:21 -0400 Subject: [PATCH 34/77] style: trim space from formatted error messages Signed-off-by: Jesse Simpson --- pkg/engine/engine.go | 2 +- pkg/engine/engine_test.go | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 7c92b4505..009b5e432 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -426,7 +426,7 @@ func reformatExecErrorMsg(filename string, err error) error { fmt.Fprintf(&finalErrorString, "%s", fileLocation.String()) } - return errors.New(finalErrorString.String()) + return errors.New(strings.TrimSpace(finalErrorString.String())) } func sortTemplates(tpls map[string]renderable) []string { diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index 5359465d4..e99fac2e8 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -1322,8 +1322,7 @@ NestedHelperFunctions/templates/_helpers_1.tpl:1:39 error calling include: NestedHelperFunctions/charts/common/templates/_helpers_2.tpl:1:50 executing "common.names.get_name" at <.Release.Name>: - nil pointer evaluating interface {}.Name -` + nil pointer evaluating interface {}.Name` v := chartutil.Values{} @@ -1356,8 +1355,7 @@ func TestMultilineNoTemplateAssociatedError(t *testing.T) { expectedErrorMessage := `multiline/templates/svc.yaml:1:9 executing "multiline/templates/svc.yaml" at : error calling include: -template: no template "nested_helper.name" associated with template "gotpl" -` +template: no template "nested_helper.name" associated with template "gotpl"` v := chartutil.Values{} From e0a67b1028dc175aafa2116eb3a17ce786cbc8cd Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Thu, 24 Apr 2025 13:08:30 -0400 Subject: [PATCH 35/77] test: use more realistic unit-test scenario by not relying on Release.Name Signed-off-by: Jesse Simpson --- pkg/engine/engine_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index e99fac2e8..f4228fbd7 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -1309,7 +1309,7 @@ func TestNestedHelpersProducesMultilineStacktrace(t *testing.T) { `{{- define "nested_helper.name" -}}{{- include "common.names.get_name" . -}}{{- end -}}`, )}, {Name: "charts/common/templates/_helpers_2.tpl", Data: []byte( - `{{- define "common.names.get_name" -}}{{- .Release.Name | trunc 63 | trimSuffix "-" -}}{{- end -}}`, + `{{- define "common.names.get_name" -}}{{- .Values.nonexistant.key | trunc 63 | trimSuffix "-" -}}{{- end -}}`, )}, }, } @@ -1320,9 +1320,9 @@ func TestNestedHelpersProducesMultilineStacktrace(t *testing.T) { NestedHelperFunctions/templates/_helpers_1.tpl:1:39 executing "nested_helper.name" at : error calling include: -NestedHelperFunctions/charts/common/templates/_helpers_2.tpl:1:50 - executing "common.names.get_name" at <.Release.Name>: - nil pointer evaluating interface {}.Name` +NestedHelperFunctions/charts/common/templates/_helpers_2.tpl:1:49 + executing "common.names.get_name" at <.Values.nonexistant.key>: + nil pointer evaluating interface {}.key` v := chartutil.Values{} From c3b83c3c40e17dce5e7f516df33c54f9528cd5e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 22:29:26 +0000 Subject: [PATCH 36/77] build(deps): bump golangci/golangci-lint-action from 7.0.0 to 8.0.0 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 7.0.0 to 8.0.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/1481404843c368bc19ca9406f87d6e0fc97bdcfd...4afd733a84b1f43292c63897423277bb7f4313a9) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-version: 8.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/golangci-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 7ecbcb95d..65f932b7c 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -22,6 +22,6 @@ jobs: go-version: '${{ env.GOLANG_VERSION }}' check-latest: true - name: golangci-lint - uses: golangci/golangci-lint-action@1481404843c368bc19ca9406f87d6e0fc97bdcfd #pin@7.0.0 + uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 #pin@8.0.0 with: version: ${{ env.GOLANGCI_LINT_VERSION }} From 058bc083a862a11f5c94be7444b9bfddb1156409 Mon Sep 17 00:00:00 2001 From: Ayush Tiwari <55987406+ayushontop@users.noreply.github.com> Date: Wed, 7 May 2025 00:38:13 +0530 Subject: [PATCH 37/77] changed Error to print Signed-off-by: Ayush Tiwari <55987406+ayushontop@users.noreply.github.com> --- pkg/cmd/repo_list.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/cmd/repo_list.go b/pkg/cmd/repo_list.go index 60c879984..fbd0ee8c1 100644 --- a/pkg/cmd/repo_list.go +++ b/pkg/cmd/repo_list.go @@ -40,7 +40,8 @@ func newRepoListCmd(out io.Writer) *cobra.Command { RunE: func(_ *cobra.Command, _ []string) error { f, _ := repo.LoadFile(settings.RepositoryConfig) if len(f.Repositories) == 0 && outfmt != output.JSON && outfmt != output.YAML { - return errors.New("no repositories to show") + fmt.Fprintln(out, "no repositories to show") + return nil } return outfmt.Write(out, &repoListWriter{f.Repositories}) From 95328ea0a699edfc0efd06e7de1266a9dcd867e8 Mon Sep 17 00:00:00 2001 From: Ayush Tiwari <55987406+ayushontop@users.noreply.github.com> Date: Wed, 7 May 2025 02:11:46 +0530 Subject: [PATCH 38/77] removed error import Signed-off-by: Ayush Tiwari <55987406+ayushontop@users.noreply.github.com> --- pkg/cmd/repo_list.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/cmd/repo_list.go b/pkg/cmd/repo_list.go index fbd0ee8c1..cbd0a69ad 100644 --- a/pkg/cmd/repo_list.go +++ b/pkg/cmd/repo_list.go @@ -17,7 +17,6 @@ limitations under the License. package cmd import ( - "errors" "fmt" "io" From e63cbae886ad3de2f6c850820d9867b7913a964c Mon Sep 17 00:00:00 2001 From: Ayush Tiwari <55987406+ayushontop@users.noreply.github.com> Date: Wed, 7 May 2025 02:46:58 +0530 Subject: [PATCH 39/77] added cmd.ErrOrStderr() Signed-off-by: Ayush Tiwari <55987406+ayushontop@users.noreply.github.com> --- pkg/cmd/repo_list.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cmd/repo_list.go b/pkg/cmd/repo_list.go index cbd0a69ad..6fd297334 100644 --- a/pkg/cmd/repo_list.go +++ b/pkg/cmd/repo_list.go @@ -39,7 +39,7 @@ func newRepoListCmd(out io.Writer) *cobra.Command { RunE: func(_ *cobra.Command, _ []string) error { f, _ := repo.LoadFile(settings.RepositoryConfig) if len(f.Repositories) == 0 && outfmt != output.JSON && outfmt != output.YAML { - fmt.Fprintln(out, "no repositories to show") + fmt.Fprintln(cmd.ErrOrStderr(), "no repositories to show") return nil } From 7ab768abc0fda04bf2fe5c5eda314a0ffd3a018d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 May 2025 21:48:01 +0000 Subject: [PATCH 40/77] build(deps): bump actions/setup-go from 5.4.0 to 5.5.0 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 5.4.0 to 5.5.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/0aaccfd150d50ccaeb58ebd88d36e91967a5f35b...d35c59abb061a4a6fb18e82ac0862c26744d6ab5) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: 5.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build-test.yml | 2 +- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/govulncheck.yml | 2 +- .github/workflows/release.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 6ed7092dc..11a5c49ec 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -22,7 +22,7 @@ jobs: - name: Add variables to environment file run: cat ".github/env" >> "$GITHUB_ENV" - name: Setup Go - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # pin@5.4.0 + uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # pin@5.5.0 with: go-version: '${{ env.GOLANG_VERSION }}' check-latest: true diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 7ecbcb95d..1c4a2be71 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -17,7 +17,7 @@ jobs: - name: Add variables to environment file run: cat ".github/env" >> "$GITHUB_ENV" - name: Setup Go - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # pin@5.4.0 + uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # pin@5.5.0 with: go-version: '${{ env.GOLANG_VERSION }}' check-latest: true diff --git a/.github/workflows/govulncheck.yml b/.github/workflows/govulncheck.yml index 6befb7954..67cfa4c36 100644 --- a/.github/workflows/govulncheck.yml +++ b/.github/workflows/govulncheck.yml @@ -18,7 +18,7 @@ jobs: - name: Add variables to environment file run: cat ".github/env" >> "$GITHUB_ENV" - name: Setup Go - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # pin@5.4.0 + uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # pin@5.5.0 with: go-version: '${{ env.GOLANG_VERSION }}' check-latest: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 38d13a175..96138caf1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: run: cat ".github/env" >> "$GITHUB_ENV" - name: Setup Go - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # pin@5.4.0 + uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # pin@5.5.0 with: go-version: '${{ env.GOLANG_VERSION }}' - name: Run unit tests @@ -85,7 +85,7 @@ jobs: run: cat ".github/env" >> "$GITHUB_ENV" - name: Setup Go - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # pin@5.4.0 + uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # pin@5.5.0 with: go-version: '${{ env.GOLANG_VERSION }}' check-latest: true From 56b688145fb1844295af25d8f93b47d8cc88fbaf Mon Sep 17 00:00:00 2001 From: Ayush Tiwari <55987406+ayushontop@users.noreply.github.com> Date: Tue, 13 May 2025 18:22:11 +0530 Subject: [PATCH 41/77] added cmd in repo_list.go for pipeline Co-authored-by: Terry Howe Signed-off-by: Ayush Tiwari <55987406+ayushontop@users.noreply.github.com> --- pkg/cmd/repo_list.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cmd/repo_list.go b/pkg/cmd/repo_list.go index 6fd297334..b7a36cbf7 100644 --- a/pkg/cmd/repo_list.go +++ b/pkg/cmd/repo_list.go @@ -36,7 +36,7 @@ func newRepoListCmd(out io.Writer) *cobra.Command { Short: "list chart repositories", Args: require.NoArgs, ValidArgsFunction: noMoreArgsCompFunc, - RunE: func(_ *cobra.Command, _ []string) error { + RunE: func(cmd *cobra.Command, _ []string) error { f, _ := repo.LoadFile(settings.RepositoryConfig) if len(f.Repositories) == 0 && outfmt != output.JSON && outfmt != output.YAML { fmt.Fprintln(cmd.ErrOrStderr(), "no repositories to show") From 9a2ac850776f0b5ac0987d5e1a685baa6ee76d48 Mon Sep 17 00:00:00 2001 From: MichaelMorris Date: Mon, 20 Nov 2023 17:26:27 +0000 Subject: [PATCH 42/77] Consider GroupVersionKind when matching resources This change shall take Group, Version and Kind from GroupVersionKind into consideration instead of the current behavior of only considering the Kind Closes: #12578 Signed-off-by: MichaelMorris --- pkg/kube/resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kube/resource.go b/pkg/kube/resource.go index 600f256b3..d88b171f0 100644 --- a/pkg/kube/resource.go +++ b/pkg/kube/resource.go @@ -81,5 +81,5 @@ func (r ResourceList) Intersect(rs ResourceList) ResourceList { // isMatchingInfo returns true if infos match on Name and GroupVersionKind. func isMatchingInfo(a, b *resource.Info) bool { - return a.Name == b.Name && a.Namespace == b.Namespace && a.Mapping.GroupVersionKind.Kind == b.Mapping.GroupVersionKind.Kind && a.Mapping.GroupVersionKind.Group == b.Mapping.GroupVersionKind.Group + return a.Name == b.Name && a.Namespace == b.Namespace && a.Mapping.GroupVersionKind == b.Mapping.GroupVersionKind } From 1460ebd14a864e89ad8040af24fa180558702701 Mon Sep 17 00:00:00 2001 From: MichaelMorris Date: Tue, 13 May 2025 23:11:22 +0100 Subject: [PATCH 43/77] Added test case to resource_test.go Signed-off-by: MichaelMorris --- pkg/kube/resource_test.go | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pkg/kube/resource_test.go b/pkg/kube/resource_test.go index c405ca382..ccc613c1b 100644 --- a/pkg/kube/resource_test.go +++ b/pkg/kube/resource_test.go @@ -59,3 +59,42 @@ func TestResourceList(t *testing.T) { t.Error("expected intersect to return bar") } } + +func TestIsMatchingInfo(t *testing.T) { + gvk := schema.GroupVersionKind{Group: "group1", Version: "version1", Kind: "pod"} + resourceInfo := resource.Info{Name: "name1", Namespace: "namespace1", Mapping: &meta.RESTMapping{GroupVersionKind: gvk}} + + gvkDiffGroup := schema.GroupVersionKind{Group: "diff", Version: "version1", Kind: "pod"} + resourceInfoDiffGroup := resource.Info{Name: "name1", Namespace: "namespace1", Mapping: &meta.RESTMapping{GroupVersionKind: gvkDiffGroup}} + if isMatchingInfo(&resourceInfo, &resourceInfoDiffGroup) { + t.Error("expected resources not equal") + } + + gvkDiffVersion := schema.GroupVersionKind{Group: "group1", Version: "diff", Kind: "pod"} + resourceInfoDiffVersion := resource.Info{Name: "name1", Namespace: "namespace1", Mapping: &meta.RESTMapping{GroupVersionKind: gvkDiffVersion}} + if isMatchingInfo(&resourceInfo, &resourceInfoDiffVersion) { + t.Error("expected resources not equal") + } + + gvkDiffKind := schema.GroupVersionKind{Group: "group1", Version: "version1", Kind: "deployment"} + resourceInfoDiffKind := resource.Info{Name: "name1", Namespace: "namespace1", Mapping: &meta.RESTMapping{GroupVersionKind: gvkDiffKind}} + if isMatchingInfo(&resourceInfo, &resourceInfoDiffKind) { + t.Error("expected resources not equal") + } + + resourceInfoDiffName := resource.Info{Name: "diff", Namespace: "namespace1", Mapping: &meta.RESTMapping{GroupVersionKind: gvk}} + if isMatchingInfo(&resourceInfo, &resourceInfoDiffName) { + t.Error("expected resources not equal") + } + + resourceInfoDiffNamespace := resource.Info{Name: "name1", Namespace: "diff", Mapping: &meta.RESTMapping{GroupVersionKind: gvk}} + if isMatchingInfo(&resourceInfo, &resourceInfoDiffNamespace) { + t.Error("expected resources not equal") + } + + gvkEqual := schema.GroupVersionKind{Group: "group1", Version: "version1", Kind: "pod"} + resourceInfoEqual := resource.Info{Name: "name1", Namespace: "namespace1", Mapping: &meta.RESTMapping{GroupVersionKind: gvkEqual}} + if !isMatchingInfo(&resourceInfo, &resourceInfoEqual) { + t.Error("expected resources to be equal") + } +} From c47c8fc8689e6056a274fdfda3b36e4aaf73b525 Mon Sep 17 00:00:00 2001 From: Omri Steiner Date: Thu, 15 May 2025 19:55:55 +0200 Subject: [PATCH 44/77] fix: correctly concat absolute URIs in repo cache There used to be two implemenations for concatenating the repo URL with the chart URI / URL. In case the chart specified an absolute URI, one of the implementations performed an incorrect concatenation between the two, resulting in a URL which looks like . This commit removes the faulty implementation and uses the other correct one instead. Signed-off-by: Omri Steiner --- pkg/downloader/chart_downloader_test.go | 1 + pkg/downloader/manager.go | 22 +-------- pkg/downloader/manager_test.go | 45 ++++++++++--------- .../repository/testing-relative-index.yaml | 13 ++++++ pkg/repo/chartrepo_test.go | 4 ++ 5 files changed, 44 insertions(+), 41 deletions(-) diff --git a/pkg/downloader/chart_downloader_test.go b/pkg/downloader/chart_downloader_test.go index 26dcc58ff..766afede1 100644 --- a/pkg/downloader/chart_downloader_test.go +++ b/pkg/downloader/chart_downloader_test.go @@ -46,6 +46,7 @@ func TestResolveChartRef(t *testing.T) { {name: "reference, querystring repo", ref: "testing-querystring/alpine", expect: "http://example.com/alpine-1.2.3.tgz?key=value"}, {name: "reference, testing-relative repo", ref: "testing-relative/foo", expect: "http://example.com/helm/charts/foo-1.2.3.tgz"}, {name: "reference, testing-relative repo", ref: "testing-relative/bar", expect: "http://example.com/helm/bar-1.2.3.tgz"}, + {name: "reference, testing-relative repo", ref: "testing-relative/baz", expect: "http://example.com/path/to/baz-1.2.3.tgz"}, {name: "reference, testing-relative-trailing-slash repo", ref: "testing-relative-trailing-slash/foo", expect: "http://example.com/helm/charts/foo-1.2.3.tgz"}, {name: "reference, testing-relative-trailing-slash repo", ref: "testing-relative-trailing-slash/bar", expect: "http://example.com/helm/bar-1.2.3.tgz"}, {name: "encoded URL", ref: "encoded-url/foobar", expect: "http://example.com/with%2Fslash/charts/foobar-4.2.1.tgz"}, diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go index e884e12d4..348c78edb 100644 --- a/pkg/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -25,7 +25,6 @@ import ( "log" "net/url" "os" - "path" "path/filepath" "regexp" "strings" @@ -728,7 +727,6 @@ func (m *Manager) findChartURL(name, version, repoURL string, repos map[string]* } for _, cr := range repos { - if urlutil.Equal(repoURL, cr.Config.URL) { var entry repo.ChartVersions entry, err = findEntryByName(name, cr) @@ -745,7 +743,7 @@ func (m *Manager) findChartURL(name, version, repoURL string, repos map[string]* //nolint:nakedret return } - url, err = normalizeURL(repoURL, ve.URLs[0]) + url, err = repo.ResolveReferenceURL(repoURL, ve.URLs[0]) if err != nil { //nolint:nakedret return @@ -811,24 +809,6 @@ func versionEquals(v1, v2 string) bool { return sv1.Equal(sv2) } -func normalizeURL(baseURL, urlOrPath string) (string, error) { - u, err := url.Parse(urlOrPath) - if err != nil { - return urlOrPath, err - } - if u.IsAbs() { - return u.String(), nil - } - u2, err := url.Parse(baseURL) - if err != nil { - return urlOrPath, fmt.Errorf("base URL failed to parse: %w", err) - } - - u2.RawPath = path.Join(u2.RawPath, urlOrPath) - u2.Path = path.Join(u2.Path, urlOrPath) - return u2.String(), nil -} - // loadChartRepositories reads the repositories.yaml, and then builds a map of // ChartRepositories. // diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go index fecc8fbef..590686fd5 100644 --- a/pkg/downloader/manager_test.go +++ b/pkg/downloader/manager_test.go @@ -53,26 +53,6 @@ func TestVersionEquals(t *testing.T) { } } -func TestNormalizeURL(t *testing.T) { - tests := []struct { - name, base, path, expect string - }{ - {name: "basic URL", base: "https://example.com", path: "http://helm.sh/foo", expect: "http://helm.sh/foo"}, - {name: "relative path", base: "https://helm.sh/charts", path: "foo", expect: "https://helm.sh/charts/foo"}, - {name: "Encoded path", base: "https://helm.sh/a%2Fb/charts", path: "foo", expect: "https://helm.sh/a%2Fb/charts/foo"}, - } - - for _, tt := range tests { - got, err := normalizeURL(tt.base, tt.path) - if err != nil { - t.Errorf("%s: error %s", tt.name, err) - continue - } else if got != tt.expect { - t.Errorf("%s: expected %q, got %q", tt.name, tt.expect, got) - } - } -} - func TestFindChartURL(t *testing.T) { var b bytes.Buffer m := &Manager{ @@ -134,6 +114,31 @@ func TestFindChartURL(t *testing.T) { if passcredentialsall != false { t.Errorf("Unexpected passcredentialsall %t", passcredentialsall) } + + name = "baz" + version = "1.2.3" + repoURL = "http://example.com/helm" + + churl, username, password, insecureSkipTLSVerify, passcredentialsall, _, _, _, err = m.findChartURL(name, version, repoURL, repos) + if err != nil { + t.Fatal(err) + } + + if churl != "http://example.com/path/to/baz-1.2.3.tgz" { + t.Errorf("Unexpected URL %q", churl) + } + if username != "" { + t.Errorf("Unexpected username %q", username) + } + if password != "" { + t.Errorf("Unexpected password %q", password) + } + if passcredentialsall != false { + t.Errorf("Unexpected passcredentialsall %t", passcredentialsall) + } + if insecureSkipTLSVerify { + t.Errorf("Unexpected insecureSkipTLSVerify %t", insecureSkipTLSVerify) + } } func TestGetRepoNames(t *testing.T) { diff --git a/pkg/downloader/testdata/repository/testing-relative-index.yaml b/pkg/downloader/testdata/repository/testing-relative-index.yaml index ba27ed257..9524daf6e 100644 --- a/pkg/downloader/testdata/repository/testing-relative-index.yaml +++ b/pkg/downloader/testdata/repository/testing-relative-index.yaml @@ -26,3 +26,16 @@ entries: version: 1.2.3 checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d apiVersion: v2 + baz: + - name: baz + description: Baz Chart With Absolute Path + home: https://helm.sh/helm + keywords: [] + maintainers: [] + sources: + - https://github.com/helm/charts + urls: + - /path/to/baz-1.2.3.tgz + version: 1.2.3 + checksum: 0e6661f193211d7a5206918d42f5c2a9470b737d + apiVersion: v2 diff --git a/pkg/repo/chartrepo_test.go b/pkg/repo/chartrepo_test.go index c29c95a7e..bc15560c9 100644 --- a/pkg/repo/chartrepo_test.go +++ b/pkg/repo/chartrepo_test.go @@ -224,11 +224,15 @@ func TestResolveReferenceURL(t *testing.T) { for _, tt := range []struct { baseURL, refURL, chartURL string }{ + {"http://localhost:8123/", "/nginx-0.2.0.tgz", "http://localhost:8123/nginx-0.2.0.tgz"}, {"http://localhost:8123/charts/", "nginx-0.2.0.tgz", "http://localhost:8123/charts/nginx-0.2.0.tgz"}, + {"http://localhost:8123/charts/", "/nginx-0.2.0.tgz", "http://localhost:8123/nginx-0.2.0.tgz"}, {"http://localhost:8123/charts-with-no-trailing-slash", "nginx-0.2.0.tgz", "http://localhost:8123/charts-with-no-trailing-slash/nginx-0.2.0.tgz"}, {"http://localhost:8123", "https://charts.helm.sh/stable/nginx-0.2.0.tgz", "https://charts.helm.sh/stable/nginx-0.2.0.tgz"}, {"http://localhost:8123/charts%2fwith%2fescaped%2fslash", "nginx-0.2.0.tgz", "http://localhost:8123/charts%2fwith%2fescaped%2fslash/nginx-0.2.0.tgz"}, + {"http://localhost:8123/charts%2fwith%2fescaped%2fslash", "/nginx-0.2.0.tgz", "http://localhost:8123/nginx-0.2.0.tgz"}, {"http://localhost:8123/charts?with=queryparameter", "nginx-0.2.0.tgz", "http://localhost:8123/charts/nginx-0.2.0.tgz?with=queryparameter"}, + {"http://localhost:8123/charts?with=queryparameter", "/nginx-0.2.0.tgz", "http://localhost:8123/nginx-0.2.0.tgz?with=queryparameter"}, } { chartURL, err := ResolveReferenceURL(tt.baseURL, tt.refURL) if err != nil { From b5a4781099d4cfa9b3d8746d6cf0bef61422da18 Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Thu, 15 May 2025 14:53:15 -0400 Subject: [PATCH 45/77] Adding test for list command Signed-off-by: Matt Farina --- pkg/cmd/repo_list.go | 3 +++ pkg/cmd/repo_list_test.go | 25 +++++++++++++++++++++ pkg/cmd/testdata/output/repo-list-empty.txt | 1 + pkg/cmd/testdata/output/repo-list.txt | 4 ++++ 4 files changed, 33 insertions(+) create mode 100644 pkg/cmd/testdata/output/repo-list-empty.txt create mode 100644 pkg/cmd/testdata/output/repo-list.txt diff --git a/pkg/cmd/repo_list.go b/pkg/cmd/repo_list.go index b7a36cbf7..70f57992e 100644 --- a/pkg/cmd/repo_list.go +++ b/pkg/cmd/repo_list.go @@ -37,6 +37,9 @@ func newRepoListCmd(out io.Writer) *cobra.Command { Args: require.NoArgs, ValidArgsFunction: noMoreArgsCompFunc, RunE: func(cmd *cobra.Command, _ []string) error { + // The error is silently ignored. If no repository file exists, it cannot be loaded, + // or the file isn't the right format to be parsed the error is ignored. The + // repositories will be 0. f, _ := repo.LoadFile(settings.RepositoryConfig) if len(f.Repositories) == 0 && outfmt != output.JSON && outfmt != output.YAML { fmt.Fprintln(cmd.ErrOrStderr(), "no repositories to show") diff --git a/pkg/cmd/repo_list_test.go b/pkg/cmd/repo_list_test.go index 1da5484cc..2f6a9e4ad 100644 --- a/pkg/cmd/repo_list_test.go +++ b/pkg/cmd/repo_list_test.go @@ -17,6 +17,8 @@ limitations under the License. package cmd import ( + "fmt" + "path/filepath" "testing" ) @@ -27,3 +29,26 @@ func TestRepoListOutputCompletion(t *testing.T) { func TestRepoListFileCompletion(t *testing.T) { checkFileCompletion(t, "repo list", false) } + +func TestRepoList(t *testing.T) { + rootDir := t.TempDir() + repoFile := filepath.Join(rootDir, "repositories.yaml") + repoFile2 := "testdata/repositories.yaml" + + tests := []cmdTestCase{ + { + name: "list with no repos", + cmd: fmt.Sprintf("repo list --repository-config %s --repository-cache %s", repoFile, rootDir), + golden: "output/repo-list-empty.txt", + wantError: false, + }, + { + name: "list with repos", + cmd: fmt.Sprintf("repo list --repository-config %s --repository-cache %s", repoFile2, rootDir), + golden: "output/repo-list.txt", + wantError: false, + }, + } + + runTestCmd(t, tests) +} diff --git a/pkg/cmd/testdata/output/repo-list-empty.txt b/pkg/cmd/testdata/output/repo-list-empty.txt new file mode 100644 index 000000000..c6edb659a --- /dev/null +++ b/pkg/cmd/testdata/output/repo-list-empty.txt @@ -0,0 +1 @@ +no repositories to show diff --git a/pkg/cmd/testdata/output/repo-list.txt b/pkg/cmd/testdata/output/repo-list.txt new file mode 100644 index 000000000..edbd0ecc1 --- /dev/null +++ b/pkg/cmd/testdata/output/repo-list.txt @@ -0,0 +1,4 @@ +NAME URL +charts https://charts.helm.sh/stable +firstexample http://firstexample.com +secondexample http://secondexample.com From 098486d221c04744630f35cb5085c8c19754c00d Mon Sep 17 00:00:00 2001 From: Jesse Simpson Date: Thu, 15 May 2025 20:38:01 -0400 Subject: [PATCH 46/77] fix: remove duplicate error message closes #30857 There are 2 ways the error message from any subcommand is printed: 1. through the debug log line that this PR removes 2. through the spf13/cobra package before the error type is returned to the caller. Since the spf13/cobra package already prints out the error, there is no use in redundantly printing out the error again within the debug log line. Signed-off-by: Jesse Simpson --- cmd/helm/helm.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/helm/helm.go b/cmd/helm/helm.go index eefce5158..0e912cda4 100644 --- a/cmd/helm/helm.go +++ b/cmd/helm/helm.go @@ -41,7 +41,6 @@ func main() { } if err := cmd.Execute(); err != nil { - slog.Debug("error", slog.Any("error", err)) switch e := err.(type) { case helmcmd.PluginError: os.Exit(e.Code) From 706392fabb0cbd3013103146c6a6ce8f9d5cd43e Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Tue, 22 Apr 2025 19:24:53 +0200 Subject: [PATCH 47/77] fix: update json-patch import path and add gomodguard settings Signed-off-by: Matthieu MOREL --- .golangci.yml | 8 ++++++++ go.mod | 3 +-- go.sum | 2 -- pkg/kube/client.go | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index fb62b2ee2..259540db9 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -20,6 +20,7 @@ linters: enable: - depguard - dupl + - gomodguard - govet - ineffassign - misspell @@ -55,6 +56,13 @@ linters: dupl: threshold: 400 + gomodguard: + blocked: + modules: + - github.com/evanphx/json-patch: + recommendations: + - github.com/evanphx/json-patch/v5 + run: timeout: 10m diff --git a/go.mod b/go.mod index da38ffa9a..8eda95bc2 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 github.com/cyphar/filepath-securejoin v0.4.1 github.com/distribution/distribution/v3 v3.0.0 - github.com/evanphx/json-patch v5.9.11+incompatible + github.com/evanphx/json-patch/v5 v5.9.11 github.com/fluxcd/cli-utils v0.36.0-flux.13 github.com/foxcpp/go-mockdns v1.1.0 github.com/gobwas/glob v0.2.3 @@ -68,7 +68,6 @@ require ( github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect github.com/docker/go-metrics v0.0.1 // indirect github.com/emicklei/go-restful/v3 v3.12.1 // indirect - github.com/evanphx/json-patch/v5 v5.9.11 // indirect github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect github.com/fatih/color v1.13.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect diff --git a/go.sum b/go.sum index 5650d4e1f..9d028ab3b 100644 --- a/go.sum +++ b/go.sum @@ -77,8 +77,6 @@ github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQ github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb4Z+d1UQi45df52xW8= -github.com/evanphx/json-patch v5.9.11+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU= github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM= github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2Wvf/TIe2xdyJxTlb6obmF18d8QdkxNDu4= diff --git a/pkg/kube/client.go b/pkg/kube/client.go index a812fc198..9bbd4d9ba 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -30,7 +30,7 @@ import ( "strings" "sync" - jsonpatch "github.com/evanphx/json-patch" + jsonpatch "github.com/evanphx/json-patch/v5" v1 "k8s.io/api/core/v1" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" From 157f0ba10af6f237e70698c3c10cc0e8a1e433e4 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Fri, 16 May 2025 09:55:50 +0200 Subject: [PATCH 48/77] chore: enable thelper Signed-off-by: Matthieu MOREL --- .golangci.yml | 1 + internal/sympath/walk_test.go | 2 ++ internal/test/ensure/ensure.go | 1 + internal/third_party/dep/fs/fs_test.go | 1 + internal/tlsutil/tls_test.go | 5 +++-- pkg/action/action_test.go | 1 + pkg/action/hooks_test.go | 2 ++ pkg/action/install_test.go | 1 + pkg/action/list_test.go | 27 +++++++++++++------------- pkg/action/uninstall_test.go | 1 + pkg/action/upgrade_test.go | 1 + pkg/chart/v2/loader/archive_test.go | 2 ++ pkg/chart/v2/loader/load_test.go | 5 +++++ pkg/chart/v2/util/chartfile_test.go | 2 +- pkg/chart/v2/util/dependencies_test.go | 1 + pkg/chart/v2/util/values_test.go | 1 + pkg/cmd/completion_test.go | 2 ++ pkg/cmd/dependency_update_test.go | 1 + pkg/cmd/flags_test.go | 1 + pkg/cmd/history_test.go | 1 + pkg/cmd/plugin_test.go | 1 + pkg/cmd/repo_add_test.go | 1 + pkg/cmd/repo_remove_test.go | 1 + pkg/cmd/require/args_test.go | 1 + pkg/cmd/upgrade_test.go | 22 +++++++++++---------- pkg/downloader/manager_test.go | 1 + pkg/getter/httpgetter_test.go | 1 + pkg/kube/client_test.go | 2 ++ pkg/kube/statuswait_test.go | 3 +++ pkg/registry/reference_test.go | 1 + pkg/release/util/sorter_test.go | 1 + pkg/repo/index_test.go | 2 ++ pkg/repo/repotest/server.go | 6 +++++- pkg/repo/repotest/tlsconfig.go | 1 + pkg/storage/driver/mock_test.go | 6 ++++++ pkg/time/time_test.go | 1 + 36 files changed, 83 insertions(+), 27 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index fb62b2ee2..a1deb3aeb 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -26,6 +26,7 @@ linters: - nakedret - revive - staticcheck + - thelper - unused - usestdlibvars diff --git a/internal/sympath/walk_test.go b/internal/sympath/walk_test.go index d4e2ceeaa..1eba8b996 100644 --- a/internal/sympath/walk_test.go +++ b/internal/sympath/walk_test.go @@ -76,6 +76,7 @@ func walkTree(n *Node, path string, f func(path string, n *Node)) { } func makeTree(t *testing.T) { + t.Helper() walkTree(tree, tree.name, func(path string, n *Node) { if n.entries == nil { if n.symLinkedTo != "" { @@ -99,6 +100,7 @@ func makeTree(t *testing.T) { } func checkMarks(t *testing.T, report bool) { + t.Helper() walkTree(tree, tree.name, func(path string, n *Node) { if n.marks != n.expectedMarks && report { t.Errorf("node %s mark = %d; expected %d", path, n.marks, n.expectedMarks) diff --git a/internal/test/ensure/ensure.go b/internal/test/ensure/ensure.go index 0d8dd9abc..c131e6da5 100644 --- a/internal/test/ensure/ensure.go +++ b/internal/test/ensure/ensure.go @@ -46,6 +46,7 @@ func HelmHome(t *testing.T) { // tempdir := TempFile(t, "foo", []byte("bar")) // filename := filepath.Join(tempdir, "foo") func TempFile(t *testing.T, name string, data []byte) string { + t.Helper() path := t.TempDir() filename := filepath.Join(path, name) if err := os.WriteFile(filename, data, 0755); err != nil { diff --git a/internal/third_party/dep/fs/fs_test.go b/internal/third_party/dep/fs/fs_test.go index 22c59868c..4c59d17fe 100644 --- a/internal/third_party/dep/fs/fs_test.go +++ b/internal/third_party/dep/fs/fs_test.go @@ -457,6 +457,7 @@ func TestCopyFileFail(t *testing.T) { // files this function creates. It is the caller's responsibility to call // this function before the test is done running, whether there's an error or not. func setupInaccessibleDir(t *testing.T, op func(dir string) error) func() { + t.Helper() dir := t.TempDir() subdir := filepath.Join(dir, "dir") diff --git a/internal/tlsutil/tls_test.go b/internal/tlsutil/tls_test.go index eb1cc183e..3d7e75c86 100644 --- a/internal/tlsutil/tls_test.go +++ b/internal/tlsutil/tls_test.go @@ -30,8 +30,9 @@ const ( ) func testfile(t *testing.T, file string) (path string) { - var err error - if path, err = filepath.Abs(filepath.Join(tlsTestDir, file)); err != nil { + t.Helper() + path, err := filepath.Abs(filepath.Join(tlsTestDir, file)) + if err != nil { t.Fatalf("error getting absolute path to test file %q: %v", file, err) } return path diff --git a/pkg/action/action_test.go b/pkg/action/action_test.go index f808163fb..9436abef5 100644 --- a/pkg/action/action_test.go +++ b/pkg/action/action_test.go @@ -40,6 +40,7 @@ import ( var verbose = flag.Bool("test.log", false, "enable test logging (debug by default)") func actionConfigFixture(t *testing.T) *Configuration { + t.Helper() return actionConfigFixtureWithDummyResources(t, nil) } diff --git a/pkg/action/hooks_test.go b/pkg/action/hooks_test.go index 9ca42ec6a..ad1de2c59 100644 --- a/pkg/action/hooks_test.go +++ b/pkg/action/hooks_test.go @@ -167,6 +167,7 @@ func TestInstallRelease_HooksOutputLogsOnSuccessAndFailure(t *testing.T) { } func runInstallForHooksWithSuccess(t *testing.T, manifest, expectedNamespace string, shouldOutput bool) { + t.Helper() var expectedOutput string if shouldOutput { expectedOutput = fmt.Sprintf("attempted to output logs for namespace: %s", expectedNamespace) @@ -190,6 +191,7 @@ func runInstallForHooksWithSuccess(t *testing.T, manifest, expectedNamespace str } func runInstallForHooksWithFailure(t *testing.T, manifest, expectedNamespace string, shouldOutput bool) { + t.Helper() var expectedOutput string if shouldOutput { expectedOutput = fmt.Sprintf("attempted to output logs for namespace: %s", expectedNamespace) diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go index e39674c80..dabd57b22 100644 --- a/pkg/action/install_test.go +++ b/pkg/action/install_test.go @@ -116,6 +116,7 @@ func installActionWithConfig(config *Configuration) *Install { } func installAction(t *testing.T) *Install { + t.Helper() config := actionConfigFixture(t) instAction := NewInstall(config) instAction.Namespace = "spaced" diff --git a/pkg/action/list_test.go b/pkg/action/list_test.go index e41949310..b6f89fa1e 100644 --- a/pkg/action/list_test.go +++ b/pkg/action/list_test.go @@ -64,13 +64,14 @@ func TestList_Empty(t *testing.T) { } func newListFixture(t *testing.T) *List { + t.Helper() return NewList(actionConfigFixture(t)) } func TestList_OneNamespace(t *testing.T) { is := assert.New(t) lister := newListFixture(t) - makeMeSomeReleases(lister.cfg.Releases, t) + makeMeSomeReleases(t, lister.cfg.Releases) list, err := lister.Run() is.NoError(err) is.Len(list, 3) @@ -79,7 +80,7 @@ func TestList_OneNamespace(t *testing.T) { func TestList_AllNamespaces(t *testing.T) { is := assert.New(t) lister := newListFixture(t) - makeMeSomeReleases(lister.cfg.Releases, t) + makeMeSomeReleases(t, lister.cfg.Releases) lister.AllNamespaces = true lister.SetStateMask() list, err := lister.Run() @@ -91,7 +92,7 @@ func TestList_Sort(t *testing.T) { is := assert.New(t) lister := newListFixture(t) lister.Sort = ByNameDesc // Other sorts are tested elsewhere - makeMeSomeReleases(lister.cfg.Releases, t) + makeMeSomeReleases(t, lister.cfg.Releases) list, err := lister.Run() is.NoError(err) is.Len(list, 3) @@ -104,7 +105,7 @@ func TestList_Limit(t *testing.T) { is := assert.New(t) lister := newListFixture(t) lister.Limit = 2 - makeMeSomeReleases(lister.cfg.Releases, t) + makeMeSomeReleases(t, lister.cfg.Releases) list, err := lister.Run() is.NoError(err) is.Len(list, 2) @@ -117,7 +118,7 @@ func TestList_BigLimit(t *testing.T) { is := assert.New(t) lister := newListFixture(t) lister.Limit = 20 - makeMeSomeReleases(lister.cfg.Releases, t) + makeMeSomeReleases(t, lister.cfg.Releases) list, err := lister.Run() is.NoError(err) is.Len(list, 3) @@ -133,7 +134,7 @@ func TestList_LimitOffset(t *testing.T) { lister := newListFixture(t) lister.Limit = 2 lister.Offset = 1 - makeMeSomeReleases(lister.cfg.Releases, t) + makeMeSomeReleases(t, lister.cfg.Releases) list, err := lister.Run() is.NoError(err) is.Len(list, 2) @@ -148,7 +149,7 @@ func TestList_LimitOffsetOutOfBounds(t *testing.T) { lister := newListFixture(t) lister.Limit = 2 lister.Offset = 3 // Last item is index 2 - makeMeSomeReleases(lister.cfg.Releases, t) + makeMeSomeReleases(t, lister.cfg.Releases) list, err := lister.Run() is.NoError(err) is.Len(list, 0) @@ -163,7 +164,7 @@ func TestList_LimitOffsetOutOfBounds(t *testing.T) { func TestList_StateMask(t *testing.T) { is := assert.New(t) lister := newListFixture(t) - makeMeSomeReleases(lister.cfg.Releases, t) + makeMeSomeReleases(t, lister.cfg.Releases) one, err := lister.cfg.Releases.Get("one", 1) is.NoError(err) one.SetStatus(release.StatusUninstalled, "uninstalled") @@ -193,7 +194,7 @@ func TestList_StateMaskWithStaleRevisions(t *testing.T) { lister := newListFixture(t) lister.StateMask = ListFailed - makeMeSomeReleasesWithStaleFailure(lister.cfg.Releases, t) + makeMeSomeReleasesWithStaleFailure(t, lister.cfg.Releases) res, err := lister.Run() @@ -205,7 +206,7 @@ func TestList_StateMaskWithStaleRevisions(t *testing.T) { is.Equal("failed", res[0].Name) } -func makeMeSomeReleasesWithStaleFailure(store *storage.Storage, t *testing.T) { +func makeMeSomeReleasesWithStaleFailure(t *testing.T, store *storage.Storage) { t.Helper() one := namedReleaseStub("clean", release.StatusDeployed) one.Namespace = "default" @@ -242,7 +243,7 @@ func TestList_Filter(t *testing.T) { is := assert.New(t) lister := newListFixture(t) lister.Filter = "th." - makeMeSomeReleases(lister.cfg.Releases, t) + makeMeSomeReleases(t, lister.cfg.Releases) res, err := lister.Run() is.NoError(err) @@ -254,13 +255,13 @@ func TestList_FilterFailsCompile(t *testing.T) { is := assert.New(t) lister := newListFixture(t) lister.Filter = "t[h.{{{" - makeMeSomeReleases(lister.cfg.Releases, t) + makeMeSomeReleases(t, lister.cfg.Releases) _, err := lister.Run() is.Error(err) } -func makeMeSomeReleases(store *storage.Storage, t *testing.T) { +func makeMeSomeReleases(t *testing.T, store *storage.Storage) { t.Helper() one := releaseStub() one.Name = "one" diff --git a/pkg/action/uninstall_test.go b/pkg/action/uninstall_test.go index a83e4bc75..8b148522c 100644 --- a/pkg/action/uninstall_test.go +++ b/pkg/action/uninstall_test.go @@ -28,6 +28,7 @@ import ( ) func uninstallAction(t *testing.T) *Uninstall { + t.Helper() config := actionConfigFixture(t) unAction := NewUninstall(config) return unAction diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go index 19869f6d6..4476bc44d 100644 --- a/pkg/action/upgrade_test.go +++ b/pkg/action/upgrade_test.go @@ -36,6 +36,7 @@ import ( ) func upgradeAction(t *testing.T) *Upgrade { + t.Helper() config := actionConfigFixture(t) upAction := NewUpgrade(config) upAction.Namespace = "spaced" diff --git a/pkg/chart/v2/loader/archive_test.go b/pkg/chart/v2/loader/archive_test.go index 4d6db9ed4..d16c47563 100644 --- a/pkg/chart/v2/loader/archive_test.go +++ b/pkg/chart/v2/loader/archive_test.go @@ -33,6 +33,7 @@ func TestLoadArchiveFiles(t *testing.T) { name: "empty input should return no files", generate: func(_ *tar.Writer) {}, check: func(t *testing.T, _ []*BufferedFile, err error) { + t.Helper() if err.Error() != "no files in chart archive" { t.Fatalf(`expected "no files in chart archive", got [%#v]`, err) } @@ -61,6 +62,7 @@ func TestLoadArchiveFiles(t *testing.T) { } }, check: func(t *testing.T, files []*BufferedFile, err error) { + t.Helper() if err != nil { t.Fatalf(`got unwanted error [%#v] for tar file with pax_global_header content`, err) } diff --git a/pkg/chart/v2/loader/load_test.go b/pkg/chart/v2/loader/load_test.go index 2e16b8560..41154421c 100644 --- a/pkg/chart/v2/loader/load_test.go +++ b/pkg/chart/v2/loader/load_test.go @@ -648,6 +648,7 @@ func verifyChart(t *testing.T, c *chart.Chart) { } func verifyDependencies(t *testing.T, c *chart.Chart) { + t.Helper() if len(c.Metadata.Dependencies) != 2 { t.Errorf("Expected 2 dependencies, got %d", len(c.Metadata.Dependencies)) } @@ -670,6 +671,7 @@ func verifyDependencies(t *testing.T, c *chart.Chart) { } func verifyDependenciesLock(t *testing.T, c *chart.Chart) { + t.Helper() if len(c.Metadata.Dependencies) != 2 { t.Errorf("Expected 2 dependencies, got %d", len(c.Metadata.Dependencies)) } @@ -692,10 +694,12 @@ func verifyDependenciesLock(t *testing.T, c *chart.Chart) { } func verifyFrobnitz(t *testing.T, c *chart.Chart) { + t.Helper() verifyChartFileAndTemplate(t, c, "frobnitz") } func verifyChartFileAndTemplate(t *testing.T, c *chart.Chart, name string) { + t.Helper() if c.Metadata == nil { t.Fatal("Metadata is nil") } @@ -750,6 +754,7 @@ func verifyChartFileAndTemplate(t *testing.T, c *chart.Chart, name string) { } func verifyBomStripped(t *testing.T, files []*chart.File) { + t.Helper() for _, file := range files { if bytes.HasPrefix(file.Data, utf8bom) { t.Errorf("Byte Order Mark still present in processed file %s", file.Name) diff --git a/pkg/chart/v2/util/chartfile_test.go b/pkg/chart/v2/util/chartfile_test.go index a2896b235..00c530b8a 100644 --- a/pkg/chart/v2/util/chartfile_test.go +++ b/pkg/chart/v2/util/chartfile_test.go @@ -34,7 +34,7 @@ func TestLoadChartfile(t *testing.T) { } func verifyChartfile(t *testing.T, f *chart.Metadata, name string) { - + t.Helper() if f == nil { //nolint:staticcheck t.Fatal("Failed verifyChartfile because f is nil") } diff --git a/pkg/chart/v2/util/dependencies_test.go b/pkg/chart/v2/util/dependencies_test.go index 9b7fe3bef..07b2441e2 100644 --- a/pkg/chart/v2/util/dependencies_test.go +++ b/pkg/chart/v2/util/dependencies_test.go @@ -558,6 +558,7 @@ func TestDependentChartsWithSomeSubchartsSpecifiedInDependency(t *testing.T) { } func validateDependencyTree(t *testing.T, c *chart.Chart) { + t.Helper() for _, dependency := range c.Dependencies() { if dependency.Parent() != c { if dependency.Parent() != c { diff --git a/pkg/chart/v2/util/values_test.go b/pkg/chart/v2/util/values_test.go index 6a5400f78..1a25fafb8 100644 --- a/pkg/chart/v2/util/values_test.go +++ b/pkg/chart/v2/util/values_test.go @@ -224,6 +224,7 @@ chapter: } func matchValues(t *testing.T, data map[string]interface{}) { + t.Helper() if data["poet"] != "Coleridge" { t.Errorf("Unexpected poet: %s", data["poet"]) } diff --git a/pkg/cmd/completion_test.go b/pkg/cmd/completion_test.go index 872da25f3..375a9a97d 100644 --- a/pkg/cmd/completion_test.go +++ b/pkg/cmd/completion_test.go @@ -27,6 +27,7 @@ import ( // Check if file completion should be performed according to parameter 'shouldBePerformed' func checkFileCompletion(t *testing.T, cmdName string, shouldBePerformed bool) { + t.Helper() storage := storageFixture() storage.Create(&release.Release{ Name: "myrelease", @@ -64,6 +65,7 @@ func TestCompletionFileCompletion(t *testing.T) { } func checkReleaseCompletion(t *testing.T, cmdName string, multiReleasesAllowed bool) { + t.Helper() multiReleaseTestGolden := "output/empty_nofile_comp.txt" if multiReleasesAllowed { multiReleaseTestGolden = "output/release_list_repeat_comp.txt" diff --git a/pkg/cmd/dependency_update_test.go b/pkg/cmd/dependency_update_test.go index a450d4b22..9646c6816 100644 --- a/pkg/cmd/dependency_update_test.go +++ b/pkg/cmd/dependency_update_test.go @@ -250,6 +250,7 @@ func TestDependencyUpdateCmd_WithRepoThatWasNotAdded(t *testing.T) { } func setupMockRepoServer(t *testing.T) *repotest.Server { + t.Helper() srv := repotest.NewTempServer( t, repotest.WithChartSourceGlob("testdata/testcharts/*.tgz"), diff --git a/pkg/cmd/flags_test.go b/pkg/cmd/flags_test.go index 9d416f216..cbc2e6419 100644 --- a/pkg/cmd/flags_test.go +++ b/pkg/cmd/flags_test.go @@ -29,6 +29,7 @@ import ( ) func outputFlagCompletionTest(t *testing.T, cmdName string) { + t.Helper() releasesMockWithStatus := func(info *release.Info, hooks ...*release.Hook) []*release.Release { info.LastDeployed = helmtime.Unix(1452902400, 0).UTC() return []*release.Release{{ diff --git a/pkg/cmd/history_test.go b/pkg/cmd/history_test.go index 594d93d21..d26ed9ecf 100644 --- a/pkg/cmd/history_test.go +++ b/pkg/cmd/history_test.go @@ -75,6 +75,7 @@ func TestHistoryOutputCompletion(t *testing.T) { } func revisionFlagCompletionTest(t *testing.T, cmdName string) { + t.Helper() mk := func(name string, vers int, status release.Status) *release.Release { return release.Mock(&release.MockReleaseOptions{ Name: name, diff --git a/pkg/cmd/plugin_test.go b/pkg/cmd/plugin_test.go index 7c36698b1..bc0f7de48 100644 --- a/pkg/cmd/plugin_test.go +++ b/pkg/cmd/plugin_test.go @@ -276,6 +276,7 @@ func TestLoadPluginsForCompletion(t *testing.T) { } func checkCommand(t *testing.T, plugins []*cobra.Command, tests []staticCompletionDetails) { + t.Helper() if len(plugins) != len(tests) { t.Fatalf("Expected commands %v, got %v", tests, plugins) } diff --git a/pkg/cmd/repo_add_test.go b/pkg/cmd/repo_add_test.go index 05b5ee53e..cfa610611 100644 --- a/pkg/cmd/repo_add_test.go +++ b/pkg/cmd/repo_add_test.go @@ -191,6 +191,7 @@ func TestRepoAddConcurrentHiddenFile(t *testing.T) { } func repoAddConcurrent(t *testing.T, testName, repoFile string) { + t.Helper() ts := repotest.NewTempServer( t, repotest.WithChartSourceGlob("testdata/testserver/*.*"), diff --git a/pkg/cmd/repo_remove_test.go b/pkg/cmd/repo_remove_test.go index b8bc7179a..bd8757812 100644 --- a/pkg/cmd/repo_remove_test.go +++ b/pkg/cmd/repo_remove_test.go @@ -153,6 +153,7 @@ func createCacheFiles(rootDir string, repoName string) (cacheIndexFile string, c } func testCacheFiles(t *testing.T, cacheIndexFile string, cacheChartsFile string, repoName string) { + t.Helper() if _, err := os.Stat(cacheIndexFile); err == nil { t.Errorf("Error cache index file was not removed for repository %s", repoName) } diff --git a/pkg/cmd/require/args_test.go b/pkg/cmd/require/args_test.go index cd5850650..b6c430fc0 100644 --- a/pkg/cmd/require/args_test.go +++ b/pkg/cmd/require/args_test.go @@ -63,6 +63,7 @@ type testCase struct { } func runTestCases(t *testing.T, testCases []testCase) { + t.Helper() for i, tc := range testCases { t.Run(fmt.Sprint(i), func(t *testing.T) { cmd := &cobra.Command{ diff --git a/pkg/cmd/upgrade_test.go b/pkg/cmd/upgrade_test.go index 8a840f149..d7375dcad 100644 --- a/pkg/cmd/upgrade_test.go +++ b/pkg/cmd/upgrade_test.go @@ -193,7 +193,7 @@ func TestUpgradeCmd(t *testing.T) { func TestUpgradeWithValue(t *testing.T) { releaseName := "funny-bunny-v2" - relMock, ch, chartPath := prepareMockRelease(releaseName, t) + relMock, ch, chartPath := prepareMockRelease(t, releaseName) defer resetEnv()() @@ -220,7 +220,7 @@ func TestUpgradeWithValue(t *testing.T) { func TestUpgradeWithStringValue(t *testing.T) { releaseName := "funny-bunny-v3" - relMock, ch, chartPath := prepareMockRelease(releaseName, t) + relMock, ch, chartPath := prepareMockRelease(t, releaseName) defer resetEnv()() @@ -248,7 +248,7 @@ func TestUpgradeWithStringValue(t *testing.T) { func TestUpgradeInstallWithSubchartNotes(t *testing.T) { releaseName := "wacky-bunny-v1" - relMock, ch, _ := prepareMockRelease(releaseName, t) + relMock, ch, _ := prepareMockRelease(t, releaseName) defer resetEnv()() @@ -280,7 +280,7 @@ func TestUpgradeInstallWithSubchartNotes(t *testing.T) { func TestUpgradeWithValuesFile(t *testing.T) { releaseName := "funny-bunny-v4" - relMock, ch, chartPath := prepareMockRelease(releaseName, t) + relMock, ch, chartPath := prepareMockRelease(t, releaseName) defer resetEnv()() @@ -308,7 +308,7 @@ func TestUpgradeWithValuesFile(t *testing.T) { func TestUpgradeWithValuesFromStdin(t *testing.T) { releaseName := "funny-bunny-v5" - relMock, ch, chartPath := prepareMockRelease(releaseName, t) + relMock, ch, chartPath := prepareMockRelease(t, releaseName) defer resetEnv()() @@ -340,7 +340,7 @@ func TestUpgradeWithValuesFromStdin(t *testing.T) { func TestUpgradeInstallWithValuesFromStdin(t *testing.T) { releaseName := "funny-bunny-v6" - _, _, chartPath := prepareMockRelease(releaseName, t) + _, _, chartPath := prepareMockRelease(t, releaseName) defer resetEnv()() @@ -368,7 +368,8 @@ func TestUpgradeInstallWithValuesFromStdin(t *testing.T) { } -func prepareMockRelease(releaseName string, t *testing.T) (func(n string, v int, ch *chart.Chart) *release.Release, *chart.Chart, string) { +func prepareMockRelease(t *testing.T, releaseName string) (func(n string, v int, ch *chart.Chart) *release.Release, *chart.Chart, string) { + t.Helper() tmpChart := t.TempDir() configmapData, err := os.ReadFile("testdata/testcharts/upgradetest/templates/configmap.yaml") if err != nil { @@ -445,7 +446,7 @@ func TestUpgradeFileCompletion(t *testing.T) { func TestUpgradeInstallWithLabels(t *testing.T) { releaseName := "funny-bunny-labels" - _, _, chartPath := prepareMockRelease(releaseName, t) + _, _, chartPath := prepareMockRelease(t, releaseName) defer resetEnv()() @@ -471,7 +472,8 @@ func TestUpgradeInstallWithLabels(t *testing.T) { } } -func prepareMockReleaseWithSecret(releaseName string, t *testing.T) (func(n string, v int, ch *chart.Chart) *release.Release, *chart.Chart, string) { +func prepareMockReleaseWithSecret(t *testing.T, releaseName string) (func(n string, v int, ch *chart.Chart) *release.Release, *chart.Chart, string) { + t.Helper() tmpChart := t.TempDir() configmapData, err := os.ReadFile("testdata/testcharts/chart-with-secret/templates/configmap.yaml") if err != nil { @@ -512,7 +514,7 @@ func prepareMockReleaseWithSecret(releaseName string, t *testing.T) (func(n stri func TestUpgradeWithDryRun(t *testing.T) { releaseName := "funny-bunny-labels" - _, _, chartPath := prepareMockReleaseWithSecret(releaseName, t) + _, _, chartPath := prepareMockReleaseWithSecret(t, releaseName) defer resetEnv()() diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go index fecc8fbef..a6434b68e 100644 --- a/pkg/downloader/manager_test.go +++ b/pkg/downloader/manager_test.go @@ -437,6 +437,7 @@ func TestUpdateWithNoRepo(t *testing.T) { // Parent chart includes local-subchart 0.1.0 subchart from a fake repository, by default. // If each of these main fields (name, version, repository) is not supplied by dep param, default value will be used. func checkBuildWithOptionalFields(t *testing.T, chartName string, dep chart.Dependency) { + t.Helper() // Set up a fake repo srv := repotest.NewTempServer( t, diff --git a/pkg/getter/httpgetter_test.go b/pkg/getter/httpgetter_test.go index 510fffd13..a997c7f03 100644 --- a/pkg/getter/httpgetter_test.go +++ b/pkg/getter/httpgetter_test.go @@ -576,6 +576,7 @@ func TestHttpClientInsecureSkipVerify(t *testing.T) { } func verifyInsecureSkipVerify(t *testing.T, g *HTTPGetter, caseName string, expectedValue bool) *http.Transport { + t.Helper() returnVal, err := g.httpClient() if err != nil { diff --git a/pkg/kube/client_test.go b/pkg/kube/client_test.go index f17436a80..cd83a7f9e 100644 --- a/pkg/kube/client_test.go +++ b/pkg/kube/client_test.go @@ -109,6 +109,7 @@ func newResponseJSON(code int, json []byte) (*http.Response, error) { } func newTestClient(t *testing.T) *Client { + t.Helper() testFactory := cmdtesting.NewTestFactory() t.Cleanup(testFactory.Cleanup) @@ -215,6 +216,7 @@ func TestCreate(t *testing.T) { } func testUpdate(t *testing.T, threeWayMerge bool) { + t.Helper() listA := newPodList("starfish", "otter", "squid") listB := newPodList("starfish", "otter", "dolphin") listC := newPodList("starfish", "otter", "dolphin") diff --git a/pkg/kube/statuswait_test.go b/pkg/kube/statuswait_test.go index 0b309b22d..4b06da896 100644 --- a/pkg/kube/statuswait_test.go +++ b/pkg/kube/statuswait_test.go @@ -154,6 +154,7 @@ spec: ` func getGVR(t *testing.T, mapper meta.RESTMapper, obj *unstructured.Unstructured) schema.GroupVersionResource { + t.Helper() gvk := obj.GroupVersionKind() mapping, err := mapper.RESTMapping(gvk.GroupKind(), gvk.Version) require.NoError(t, err) @@ -161,6 +162,7 @@ func getGVR(t *testing.T, mapper meta.RESTMapper, obj *unstructured.Unstructured } func getRuntimeObjFromManifests(t *testing.T, manifests []string) []runtime.Object { + t.Helper() objects := []runtime.Object{} for _, manifest := range manifests { m := make(map[string]interface{}) @@ -173,6 +175,7 @@ func getRuntimeObjFromManifests(t *testing.T, manifests []string) []runtime.Obje } func getResourceListFromRuntimeObjs(t *testing.T, c *Client, objs []runtime.Object) ResourceList { + t.Helper() resourceList := ResourceList{} for _, obj := range objs { list, err := c.Build(objBody(obj), false) diff --git a/pkg/registry/reference_test.go b/pkg/registry/reference_test.go index 31317d18f..b6872cc37 100644 --- a/pkg/registry/reference_test.go +++ b/pkg/registry/reference_test.go @@ -19,6 +19,7 @@ package registry import "testing" func verify(t *testing.T, actual reference, registry, repository, tag, digest string) { + t.Helper() if registry != actual.orasReference.Registry { t.Errorf("Oras reference registry expected %v actual %v", registry, actual.Registry) } diff --git a/pkg/release/util/sorter_test.go b/pkg/release/util/sorter_test.go index 8a766efc9..7ca540441 100644 --- a/pkg/release/util/sorter_test.go +++ b/pkg/release/util/sorter_test.go @@ -43,6 +43,7 @@ func tsRelease(name string, vers int, dur time.Duration, status rspb.Status) *rs } func check(t *testing.T, by string, fn func(int, int) bool) { + t.Helper() for i := len(releases) - 1; i > 0; i-- { if fn(i, i-1) { t.Errorf("release at positions '(%d,%d)' not sorted by %s", i-1, i, by) diff --git a/pkg/repo/index_test.go b/pkg/repo/index_test.go index 2a33cd1a9..d40719b12 100644 --- a/pkg/repo/index_test.go +++ b/pkg/repo/index_test.go @@ -352,6 +352,7 @@ func TestDownloadIndexFile(t *testing.T) { } func verifyLocalIndex(t *testing.T, i *IndexFile) { + t.Helper() numEntries := len(i.Entries) if numEntries != 3 { t.Errorf("Expected 3 entries in index file but got %d", numEntries) @@ -450,6 +451,7 @@ func verifyLocalIndex(t *testing.T, i *IndexFile) { } func verifyLocalChartsFile(t *testing.T, chartsContent []byte, indexContent *IndexFile) { + t.Helper() var expected, reald []string for chart := range indexContent.Entries { expected = append(expected, chart) diff --git a/pkg/repo/repotest/server.go b/pkg/repo/repotest/server.go index 709a6f5fd..b366572d8 100644 --- a/pkg/repo/repotest/server.go +++ b/pkg/repo/repotest/server.go @@ -42,6 +42,7 @@ import ( ) func BasicAuthMiddleware(t *testing.T) http.HandlerFunc { + t.Helper() return http.HandlerFunc(func(_ http.ResponseWriter, r *http.Request) { username, password, ok := r.BasicAuth() if !ok || username != "username" || password != "password" { @@ -89,7 +90,7 @@ type Server struct { // // The temp dir will be removed by testing package automatically when test finished. func NewTempServer(t *testing.T, options ...ServerOption) *Server { - + t.Helper() docrootTempDir, err := os.MkdirTemp("", "helm-repotest-") if err != nil { t.Fatal(err) @@ -110,6 +111,7 @@ func NewTempServer(t *testing.T, options ...ServerOption) *Server { // Create the server, but don't yet start it func newServer(t *testing.T, docroot string, options ...ServerOption) *Server { + t.Helper() absdocroot, err := filepath.Abs(docroot) if err != nil { t.Fatal(err) @@ -162,6 +164,7 @@ func WithDependingChart(c *chart.Chart) OCIServerOpt { } func NewOCIServer(t *testing.T, dir string) (*OCIServer, error) { + t.Helper() testHtpasswdFileBasename := "authtest.htpasswd" testUsername, testPassword := "username", "password" @@ -209,6 +212,7 @@ func NewOCIServer(t *testing.T, dir string) (*OCIServer, error) { } func (srv *OCIServer) Run(t *testing.T, opts ...OCIServerOpt) { + t.Helper() cfg := &OCIServerRunConfig{} for _, fn := range opts { fn(cfg) diff --git a/pkg/repo/repotest/tlsconfig.go b/pkg/repo/repotest/tlsconfig.go index 3914a4d3f..3ea7338ff 100644 --- a/pkg/repo/repotest/tlsconfig.go +++ b/pkg/repo/repotest/tlsconfig.go @@ -26,6 +26,7 @@ import ( ) func MakeTestTLSConfig(t *testing.T, path string) *tls.Config { + t.Helper() ca, pub, priv := filepath.Join(path, "rootca.crt"), filepath.Join(path, "crt.pem"), filepath.Join(path, "key.pem") insecure := false diff --git a/pkg/storage/driver/mock_test.go b/pkg/storage/driver/mock_test.go index 1dda258bb..7dba5fea2 100644 --- a/pkg/storage/driver/mock_test.go +++ b/pkg/storage/driver/mock_test.go @@ -52,6 +52,7 @@ func testKey(name string, vers int) string { } func tsFixtureMemory(t *testing.T) *Memory { + t.Helper() hs := []*rspb.Release{ // rls-a releaseStub("rls-a", 4, "default", rspb.StatusDeployed), @@ -83,6 +84,7 @@ func tsFixtureMemory(t *testing.T) *Memory { // newTestFixtureCfgMaps initializes a MockConfigMapsInterface. // ConfigMaps are created for each release provided. func newTestFixtureCfgMaps(t *testing.T, releases ...*rspb.Release) *ConfigMaps { + t.Helper() var mock MockConfigMapsInterface mock.Init(t, releases...) @@ -98,6 +100,7 @@ type MockConfigMapsInterface struct { // Init initializes the MockConfigMapsInterface with the set of releases. func (mock *MockConfigMapsInterface) Init(t *testing.T, releases ...*rspb.Release) { + t.Helper() mock.objects = map[string]*v1.ConfigMap{} for _, rls := range releases { @@ -169,6 +172,7 @@ func (mock *MockConfigMapsInterface) Delete(_ context.Context, name string, _ me // newTestFixtureSecrets initializes a MockSecretsInterface. // Secrets are created for each release provided. func newTestFixtureSecrets(t *testing.T, releases ...*rspb.Release) *Secrets { + t.Helper() var mock MockSecretsInterface mock.Init(t, releases...) @@ -184,6 +188,7 @@ type MockSecretsInterface struct { // Init initializes the MockSecretsInterface with the set of releases. func (mock *MockSecretsInterface) Init(t *testing.T, releases ...*rspb.Release) { + t.Helper() mock.objects = map[string]*v1.Secret{} for _, rls := range releases { @@ -254,6 +259,7 @@ func (mock *MockSecretsInterface) Delete(_ context.Context, name string, _ metav // newTestFixtureSQL mocks the SQL database (for testing purposes) func newTestFixtureSQL(t *testing.T, _ ...*rspb.Release) (*SQL, sqlmock.Sqlmock) { + t.Helper() sqlDB, mock, err := sqlmock.New() if err != nil { t.Fatalf("error when opening stub database connection: %v", err) diff --git a/pkg/time/time_test.go b/pkg/time/time_test.go index 86b43355b..342ca4a10 100644 --- a/pkg/time/time_test.go +++ b/pkg/time/time_test.go @@ -31,6 +31,7 @@ var ( ) func givenTime(t *testing.T) Time { + t.Helper() result, err := Parse(time.RFC3339, "1977-09-02T22:04:05Z") require.NoError(t, err) return result From e4a48558716ad6770e7c179fbdb9f8f974921852 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 May 2025 21:16:29 +0000 Subject: [PATCH 49/77] build(deps): bump the k8s-io group with 7 updates Bumps the k8s-io group with 7 updates: | Package | From | To | | --- | --- | --- | | [k8s.io/api](https://github.com/kubernetes/api) | `0.33.0` | `0.33.1` | | [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.33.0` | `0.33.1` | | [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.33.0` | `0.33.1` | | [k8s.io/apiserver](https://github.com/kubernetes/apiserver) | `0.33.0` | `0.33.1` | | [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) | `0.33.0` | `0.33.1` | | [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.33.0` | `0.33.1` | | [k8s.io/kubectl](https://github.com/kubernetes/kubectl) | `0.33.0` | `0.33.1` | Updates `k8s.io/api` from 0.33.0 to 0.33.1 - [Commits](https://github.com/kubernetes/api/compare/v0.33.0...v0.33.1) Updates `k8s.io/apiextensions-apiserver` from 0.33.0 to 0.33.1 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](https://github.com/kubernetes/apiextensions-apiserver/compare/v0.33.0...v0.33.1) Updates `k8s.io/apimachinery` from 0.33.0 to 0.33.1 - [Commits](https://github.com/kubernetes/apimachinery/compare/v0.33.0...v0.33.1) Updates `k8s.io/apiserver` from 0.33.0 to 0.33.1 - [Commits](https://github.com/kubernetes/apiserver/compare/v0.33.0...v0.33.1) Updates `k8s.io/cli-runtime` from 0.33.0 to 0.33.1 - [Commits](https://github.com/kubernetes/cli-runtime/compare/v0.33.0...v0.33.1) Updates `k8s.io/client-go` from 0.33.0 to 0.33.1 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/kubernetes/client-go/compare/v0.33.0...v0.33.1) Updates `k8s.io/kubectl` from 0.33.0 to 0.33.1 - [Commits](https://github.com/kubernetes/kubectl/compare/v0.33.0...v0.33.1) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-io - dependency-name: k8s.io/apiextensions-apiserver dependency-version: 0.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-io - dependency-name: k8s.io/apimachinery dependency-version: 0.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-io - dependency-name: k8s.io/apiserver dependency-version: 0.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-io - dependency-name: k8s.io/cli-runtime dependency-version: 0.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-io - dependency-name: k8s.io/client-go dependency-version: 0.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-io - dependency-name: k8s.io/kubectl dependency-version: 0.33.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-io ... Signed-off-by: dependabot[bot] --- go.mod | 16 ++++++++-------- go.sum | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index da38ffa9a..46d9ce97a 100644 --- a/go.mod +++ b/go.mod @@ -35,14 +35,14 @@ require ( golang.org/x/term v0.32.0 golang.org/x/text v0.25.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.33.0 - k8s.io/apiextensions-apiserver v0.33.0 - k8s.io/apimachinery v0.33.0 - k8s.io/apiserver v0.33.0 - k8s.io/cli-runtime v0.33.0 - k8s.io/client-go v0.33.0 + k8s.io/api v0.33.1 + k8s.io/apiextensions-apiserver v0.33.1 + k8s.io/apimachinery v0.33.1 + k8s.io/apiserver v0.33.1 + k8s.io/cli-runtime v0.33.1 + k8s.io/client-go v0.33.1 k8s.io/klog/v2 v2.130.1 - k8s.io/kubectl v0.33.0 + k8s.io/kubectl v0.33.1 oras.land/oras-go/v2 v2.6.0 sigs.k8s.io/controller-runtime v0.20.4 sigs.k8s.io/yaml v1.4.0 @@ -169,7 +169,7 @@ require ( gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/component-base v0.33.0 // indirect + k8s.io/component-base v0.33.1 // indirect k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect diff --git a/go.sum b/go.sum index 5650d4e1f..b98d3165d 100644 --- a/go.sum +++ b/go.sum @@ -504,26 +504,26 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.33.0 h1:yTgZVn1XEe6opVpP1FylmNrIFWuDqe2H0V8CT5gxfIU= -k8s.io/api v0.33.0/go.mod h1:CTO61ECK/KU7haa3qq8sarQ0biLq2ju405IZAd9zsiM= -k8s.io/apiextensions-apiserver v0.33.0 h1:d2qpYL7Mngbsc1taA4IjJPRJ9ilnsXIrndH+r9IimOs= -k8s.io/apiextensions-apiserver v0.33.0/go.mod h1:VeJ8u9dEEN+tbETo+lFkwaaZPg6uFKLGj5vyNEwwSzc= -k8s.io/apimachinery v0.33.0 h1:1a6kHrJxb2hs4t8EE5wuR/WxKDwGN1FKH3JvDtA0CIQ= -k8s.io/apimachinery v0.33.0/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= -k8s.io/apiserver v0.33.0 h1:QqcM6c+qEEjkOODHppFXRiw/cE2zP85704YrQ9YaBbc= -k8s.io/apiserver v0.33.0/go.mod h1:EixYOit0YTxt8zrO2kBU7ixAtxFce9gKGq367nFmqI8= -k8s.io/cli-runtime v0.33.0 h1:Lbl/pq/1o8BaIuyn+aVLdEPHVN665tBAXUePs8wjX7c= -k8s.io/cli-runtime v0.33.0/go.mod h1:QcA+r43HeUM9jXFJx7A+yiTPfCooau/iCcP1wQh4NFw= -k8s.io/client-go v0.33.0 h1:UASR0sAYVUzs2kYuKn/ZakZlcs2bEHaizrrHUZg0G98= -k8s.io/client-go v0.33.0/go.mod h1:kGkd+l/gNGg8GYWAPr0xF1rRKvVWvzh9vmZAMXtaKOg= -k8s.io/component-base v0.33.0 h1:Ot4PyJI+0JAD9covDhwLp9UNkUja209OzsJ4FzScBNk= -k8s.io/component-base v0.33.0/go.mod h1:aXYZLbw3kihdkOPMDhWbjGCO6sg+luw554KP51t8qCU= +k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw= +k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw= +k8s.io/apiextensions-apiserver v0.33.1 h1:N7ccbSlRN6I2QBcXevB73PixX2dQNIW0ZRuguEE91zI= +k8s.io/apiextensions-apiserver v0.33.1/go.mod h1:uNQ52z1A1Gu75QSa+pFK5bcXc4hq7lpOXbweZgi4dqA= +k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4= +k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= +k8s.io/apiserver v0.33.1 h1:yLgLUPDVC6tHbNcw5uE9mo1T6ELhJj7B0geifra3Qdo= +k8s.io/apiserver v0.33.1/go.mod h1:VMbE4ArWYLO01omz+k8hFjAdYfc3GVAYPrhP2tTKccs= +k8s.io/cli-runtime v0.33.1 h1:TvpjEtF71ViFmPeYMj1baZMJR4iWUEplklsUQ7D3quA= +k8s.io/cli-runtime v0.33.1/go.mod h1:9dz5Q4Uh8io4OWCLiEf/217DXwqNgiTS/IOuza99VZE= +k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4= +k8s.io/client-go v0.33.1/go.mod h1:JAsUrl1ArO7uRVFWfcj6kOomSlCv+JpvIsp6usAGefA= +k8s.io/component-base v0.33.1 h1:EoJ0xA+wr77T+G8p6T3l4efT2oNwbqBVKR71E0tBIaI= +k8s.io/component-base v0.33.1/go.mod h1:guT/w/6piyPfTgq7gfvgetyXMIh10zuXA6cRRm3rDuY= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4= k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8= -k8s.io/kubectl v0.33.0 h1:HiRb1yqibBSCqic4pRZP+viiOBAnIdwYDpzUFejs07g= -k8s.io/kubectl v0.33.0/go.mod h1:gAlGBuS1Jq1fYZ9AjGWbI/5Vk3M/VW2DK4g10Fpyn/0= +k8s.io/kubectl v0.33.1 h1:OJUXa6FV5bap6iRy345ezEjU9dTLxqv1zFTVqmeHb6A= +k8s.io/kubectl v0.33.1/go.mod h1:Z07pGqXoP4NgITlPRrnmiM3qnoo1QrK1zjw85Aiz8J0= k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e h1:KqK5c/ghOm8xkHYhlodbp6i6+r+ChV2vuAuVRdFbLro= k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc= From 8ba181c343d115ad90927cac053203b14831e196 Mon Sep 17 00:00:00 2001 From: George Jenkins Date: Mon, 2 Dec 2024 17:44:42 -0500 Subject: [PATCH 50/77] Run test OCI registry localhost Signed-off-by: George Jenkins --- pkg/registry/utils_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/registry/utils_test.go b/pkg/registry/utils_test.go index 174d7ccd1..e8fcba4e3 100644 --- a/pkg/registry/utils_test.go +++ b/pkg/registry/utils_test.go @@ -141,7 +141,7 @@ func setup(suite *TestSuite, tlsEnabled, insecure bool) *registry.Registry { suite.Nil(err, "no error creating mock DNS server") suite.srv.PatchNet(net.DefaultResolver) - config.HTTP.Addr = fmt.Sprintf(":%d", port) + config.HTTP.Addr = fmt.Sprintf("127.0.0.1:%d", port) config.HTTP.DrainTimeout = time.Duration(10) * time.Second config.Storage = map[string]configuration.Parameters{"inmemory": map[string]interface{}{}} From a418064a3d9f09c7528c605927ab33a87e53f637 Mon Sep 17 00:00:00 2001 From: Benoit Tigeot Date: Mon, 19 May 2025 23:05:24 +0200 Subject: [PATCH 51/77] Bump golangci lint to match golangci-lint Github Action version Signed-off-by: Benoit Tigeot --- .github/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/env b/.github/env index b321f6ef7..4384ba074 100644 --- a/.github/env +++ b/.github/env @@ -1,2 +1,2 @@ GOLANG_VERSION=1.24 -GOLANGCI_LINT_VERSION=v2.0.2 +GOLANGCI_LINT_VERSION=v2.1.0 From 30e82e4d0d1de06d46d5efdc1ad2fbb2e22e9081 Mon Sep 17 00:00:00 2001 From: Chris Aniszczyk Date: Tue, 20 May 2025 11:15:48 -0500 Subject: [PATCH 52/77] Add new LFX Insights Health Score Badge https://insights.linuxfoundation.org/project/helm Signed-off-by: Chris Aniszczyk --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5f4d71d4c..39b70fb7e 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ [![GoDoc](https://img.shields.io/static/v1?label=godoc&message=reference&color=blue)](https://pkg.go.dev/helm.sh/helm/v4) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3131/badge)](https://bestpractices.coreinfrastructure.org/projects/3131) [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/helm/helm/badge)](https://scorecard.dev/viewer/?uri=github.com/helm/helm) +[![LFX Health Score](https://img.shields.io/static/v1?label=Health%20Score&message=Healthy&color=A7F3D0&logo=linuxfoundation&logoColor=white&style=flat)](https://insights.linuxfoundation.org/project/helm) Helm is a tool for managing Charts. Charts are packages of pre-configured Kubernetes resources. From cf7613ba6b3008464014a88fc4b8dc2cc93bf914 Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Tue, 20 May 2025 15:46:20 -0400 Subject: [PATCH 53/77] Reverting fix "renders int as float" This reverts #13533 This change has caused issues with numerous charts around things unrelated to toml. This is because of functions like typeIs/typeOf being used and acted upon. The change caused a significant regression. Note: This kind of change can be put into v3 charts, that are in active development, without causing a regression. Closes #30880 Signed-off-by: Matt Farina --- pkg/chart/v2/loader/load.go | 6 +----- pkg/chart/v2/util/dependencies_test.go | 19 ------------------- pkg/chart/v2/util/values.go | 6 +----- pkg/cmd/template_test.go | 12 ------------ pkg/cmd/testdata/output/issue-totoml.txt | 8 -------- .../testcharts/issue-totoml/Chart.yaml | 3 --- .../issue-totoml/templates/configmap.yaml | 6 ------ .../testcharts/issue-totoml/values.yaml | 2 -- 8 files changed, 2 insertions(+), 60 deletions(-) delete mode 100644 pkg/cmd/testdata/output/issue-totoml.txt delete mode 100644 pkg/cmd/testdata/testcharts/issue-totoml/Chart.yaml delete mode 100644 pkg/cmd/testdata/testcharts/issue-totoml/templates/configmap.yaml delete mode 100644 pkg/cmd/testdata/testcharts/issue-totoml/values.yaml diff --git a/pkg/chart/v2/loader/load.go b/pkg/chart/v2/loader/load.go index f0905e508..75c73e959 100644 --- a/pkg/chart/v2/loader/load.go +++ b/pkg/chart/v2/loader/load.go @@ -19,7 +19,6 @@ package loader import ( "bufio" "bytes" - "encoding/json" "errors" "fmt" "io" @@ -224,10 +223,7 @@ func LoadValues(data io.Reader) (map[string]interface{}, error) { } return nil, fmt.Errorf("error reading yaml document: %w", err) } - if err := yaml.Unmarshal(raw, ¤tMap, func(d *json.Decoder) *json.Decoder { - d.UseNumber() - return d - }); err != nil { + if err := yaml.Unmarshal(raw, ¤tMap); err != nil { return nil, fmt.Errorf("cannot unmarshal yaml document: %w", err) } values = MergeMaps(values, currentMap) diff --git a/pkg/chart/v2/util/dependencies_test.go b/pkg/chart/v2/util/dependencies_test.go index 07b2441e2..5947eac69 100644 --- a/pkg/chart/v2/util/dependencies_test.go +++ b/pkg/chart/v2/util/dependencies_test.go @@ -15,7 +15,6 @@ limitations under the License. package util import ( - "encoding/json" "os" "path/filepath" "sort" @@ -238,20 +237,6 @@ func TestProcessDependencyImportValues(t *testing.T) { if b := strconv.FormatBool(pv); b != vv { t.Errorf("failed to match imported bool value %v with expected %v for key %q", b, vv, kk) } - case json.Number: - if fv, err := pv.Float64(); err == nil { - if sfv := strconv.FormatFloat(fv, 'f', -1, 64); sfv != vv { - t.Errorf("failed to match imported float value %v with expected %v for key %q", sfv, vv, kk) - } - } - if iv, err := pv.Int64(); err == nil { - if siv := strconv.FormatInt(iv, 10); siv != vv { - t.Errorf("failed to match imported int value %v with expected %v for key %q", siv, vv, kk) - } - } - if pv.String() != vv { - t.Errorf("failed to match imported string value %q with expected %q for key %q", pv, vv, kk) - } default: if pv != vv { t.Errorf("failed to match imported string value %q with expected %q for key %q", pv, vv, kk) @@ -356,10 +341,6 @@ func TestProcessDependencyImportValuesMultiLevelPrecedence(t *testing.T) { if s := strconv.FormatFloat(pv, 'f', -1, 64); s != vv { t.Errorf("failed to match imported float value %v with expected %v", s, vv) } - case json.Number: - if pv.String() != vv { - t.Errorf("failed to match imported string value %q with expected %q", pv, vv) - } default: if pv != vv { t.Errorf("failed to match imported string value %q with expected %q", pv, vv) diff --git a/pkg/chart/v2/util/values.go b/pkg/chart/v2/util/values.go index 42b1a28e8..6850e8b9b 100644 --- a/pkg/chart/v2/util/values.go +++ b/pkg/chart/v2/util/values.go @@ -17,7 +17,6 @@ limitations under the License. package util import ( - "encoding/json" "errors" "fmt" "io" @@ -106,10 +105,7 @@ func tableLookup(v Values, simple string) (Values, error) { // ReadValues will parse YAML byte data into a Values. func ReadValues(data []byte) (vals Values, err error) { - err = yaml.Unmarshal(data, &vals, func(d *json.Decoder) *json.Decoder { - d.UseNumber() - return d - }) + err = yaml.Unmarshal(data, &vals) if len(vals) == 0 { vals = Values{} } diff --git a/pkg/cmd/template_test.go b/pkg/cmd/template_test.go index c478fced4..a6c848e08 100644 --- a/pkg/cmd/template_test.go +++ b/pkg/cmd/template_test.go @@ -22,18 +22,6 @@ import ( "testing" ) -func TestTemplateCmdWithToml(t *testing.T) { - - tests := []cmdTestCase{ - { - name: "check toToml function rendering", - cmd: fmt.Sprintf("template '%s'", "testdata/testcharts/issue-totoml"), - golden: "output/issue-totoml.txt", - }, - } - runTestCmd(t, tests) -} - var chartPath = "testdata/testcharts/subchart" func TestTemplateCmd(t *testing.T) { diff --git a/pkg/cmd/testdata/output/issue-totoml.txt b/pkg/cmd/testdata/output/issue-totoml.txt deleted file mode 100644 index 06cf4bb8d..000000000 --- a/pkg/cmd/testdata/output/issue-totoml.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- -# Source: issue-totoml/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: issue-totoml -data: | - key = 13 diff --git a/pkg/cmd/testdata/testcharts/issue-totoml/Chart.yaml b/pkg/cmd/testdata/testcharts/issue-totoml/Chart.yaml deleted file mode 100644 index f4be7a213..000000000 --- a/pkg/cmd/testdata/testcharts/issue-totoml/Chart.yaml +++ /dev/null @@ -1,3 +0,0 @@ -apiVersion: v2 -name: issue-totoml -version: 0.1.0 diff --git a/pkg/cmd/testdata/testcharts/issue-totoml/templates/configmap.yaml b/pkg/cmd/testdata/testcharts/issue-totoml/templates/configmap.yaml deleted file mode 100644 index 621e70d48..000000000 --- a/pkg/cmd/testdata/testcharts/issue-totoml/templates/configmap.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: issue-totoml -data: | - {{ .Values.global | toToml }} diff --git a/pkg/cmd/testdata/testcharts/issue-totoml/values.yaml b/pkg/cmd/testdata/testcharts/issue-totoml/values.yaml deleted file mode 100644 index dd0140449..000000000 --- a/pkg/cmd/testdata/testcharts/issue-totoml/values.yaml +++ /dev/null @@ -1,2 +0,0 @@ -global: - key: 13 \ No newline at end of file From 875e149d6b677f4a865c9ecd6d804fce0e2ff395 Mon Sep 17 00:00:00 2001 From: Benoit Tigeot Date: Wed, 21 May 2025 21:30:05 +0200 Subject: [PATCH 54/77] Prevent failure when resolving version tags in oras memory store - The newReference() function transforms version tags by replacing + with _ for OCI compatibility - But the code was using the original ref (with +) for TagBytes() - Then it tries to find the tagged reference using parsedRef.String() (with _) - This mismatch causes the Resolve method to fail with "not found" - By using parsedRef.String() consistently in both places, the references will match and the lookup will succeed. I extracted the TagBytes function to improve testability. Push() includes several external calls that are hard to mock, so isolating this logic makes testing more manageable. Close: #30881 Signed-off-by: Benoit Tigeot --- pkg/registry/client.go | 40 ++++++++++++++++++++--------- pkg/registry/client_test.go | 51 +++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 12 deletions(-) create mode 100644 pkg/registry/client_test.go diff --git a/pkg/registry/client.go b/pkg/registry/client.go index 2d131dc47..d035609c2 100644 --- a/pkg/registry/client.go +++ b/pkg/registry/client.go @@ -685,19 +685,9 @@ func (c *Client) Push(data []byte, ref string, options ...PushOption) (*PushResu }) ociAnnotations := generateOCIAnnotations(meta, operation.creationTime) - manifest := ocispec.Manifest{ - Versioned: specs.Versioned{SchemaVersion: 2}, - Config: configDescriptor, - Layers: layers, - Annotations: ociAnnotations, - } - manifestData, err := json.Marshal(manifest) - if err != nil { - return nil, err - } - - manifestDescriptor, err := oras.TagBytes(ctx, memoryStore, ocispec.MediaTypeImageManifest, manifestData, ref) + manifestDescriptor, err := c.tagManifest(ctx, memoryStore, ref, configDescriptor, + layers, ociAnnotations) if err != nil { return nil, err } @@ -898,3 +888,29 @@ func (c *Client) ValidateReference(ref, version string, u *url.URL) (*url.URL, e return u, err } + +// tagManifest prepares and tags a manifest in memory storage +func (c *Client) tagManifest(ctx context.Context, memoryStore *memory.Store, + ref string, configDescriptor ocispec.Descriptor, layers []ocispec.Descriptor, + ociAnnotations map[string]string) (ocispec.Descriptor, error) { + + manifest := ocispec.Manifest{ + Versioned: specs.Versioned{SchemaVersion: 2}, + Config: configDescriptor, + Layers: layers, + Annotations: ociAnnotations, + } + + manifestData, err := json.Marshal(manifest) + if err != nil { + return ocispec.Descriptor{}, err + } + + parsedRef, err := newReference(ref) + if err != nil { + return ocispec.Descriptor{}, err + } + + return oras.TagBytes(ctx, memoryStore, ocispec.MediaTypeImageManifest, + manifestData, parsedRef.String()) +} diff --git a/pkg/registry/client_test.go b/pkg/registry/client_test.go new file mode 100644 index 000000000..bf1ce66da --- /dev/null +++ b/pkg/registry/client_test.go @@ -0,0 +1,51 @@ +/* +Copyright The Helm Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package registry + +import ( + "context" + "io" + "testing" + + ocispec "github.com/opencontainers/image-spec/specs-go/v1" + "github.com/stretchr/testify/require" + "oras.land/oras-go/v2/content/memory" +) + +// Inspired by oras test +// https://github.com/oras-project/oras-go/blob/05a2b09cbf2eab1df691411884dc4df741ec56ab/content_test.go#L1802 +func TestTagManifestTransformsReferences(t *testing.T) { + memStore := memory.New() + client := &Client{out: io.Discard} + ctx := context.Background() + + refWithPlus := "test-registry.io/charts/test:1.0.0+metadata" + expectedRef := "test-registry.io/charts/test:1.0.0_metadata" // + becomes _ + + configDesc := ocispec.Descriptor{MediaType: ConfigMediaType, Digest: "sha256:config", Size: 100} + layers := []ocispec.Descriptor{{MediaType: ChartLayerMediaType, Digest: "sha256:layer", Size: 200}} + + desc, err := client.tagManifest(ctx, memStore, refWithPlus, configDesc, layers, nil) + require.NoError(t, err) + + transformedDesc, err := memStore.Resolve(ctx, expectedRef) + require.NoError(t, err, "Should find the reference with _ instead of +") + require.Equal(t, desc.Digest, transformedDesc.Digest) + + _, err = memStore.Resolve(ctx, refWithPlus) + require.Error(t, err, "Should NOT find the reference with the original +") +} From 85ba33bb1dbeb5fc537e302c23cc4c57f0ddc3b2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 May 2025 21:32:21 +0000 Subject: [PATCH 55/77] build(deps): bump sigs.k8s.io/controller-runtime from 0.20.4 to 0.21.0 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.20.4 to 0.21.0. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](https://github.com/kubernetes-sigs/controller-runtime/compare/v0.20.4...v0.21.0) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-version: 0.21.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index dc8ffab39..d93e5eb80 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( k8s.io/klog/v2 v2.130.1 k8s.io/kubectl v0.33.1 oras.land/oras-go/v2 v2.6.0 - sigs.k8s.io/controller-runtime v0.20.4 + sigs.k8s.io/controller-runtime v0.21.0 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index ebc7ed7f2..39c715621 100644 --- a/go.sum +++ b/go.sum @@ -526,8 +526,8 @@ k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e h1:KqK5c/ghOm8xkHYhlodbp6i6+r+Ch k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc= oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o= -sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU= -sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY= +sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8= +sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ= From cb730c94b53bcd914e47a01619c07d74d3d35fbb Mon Sep 17 00:00:00 2001 From: Benoit Tigeot Date: Fri, 23 May 2025 11:39:10 +0200 Subject: [PATCH 56/77] Help users avoid specifying URL scheme an path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We’ve noticed that some users still include the URL scheme and full path when logging into an OCI registry, for example: ```sh helm registry login -u $OCI_REGISTRY_USER --password-stdin oci://ghcr.io/org/repo ``` This is no longer necessary and will not be supported in Helm v4. To guide users toward the correct usage, we should show an example of the ideal command. Signed-off-by: Benoit Tigeot --- pkg/cmd/registry_login.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/cmd/registry_login.go b/pkg/cmd/registry_login.go index 1dfb3c798..2ee3f2649 100644 --- a/pkg/cmd/registry_login.go +++ b/pkg/cmd/registry_login.go @@ -33,6 +33,10 @@ import ( const registryLoginDesc = ` Authenticate to a remote registry. + +For example for Github Container Registry: + + echo "$GITHUB_TOKEN" | helm registry login ghcr.io -u $GITHUB_USER --password-stdin ` type registryLoginOptions struct { From f939f6145f3bd2117400393753aab3151238a106 Mon Sep 17 00:00:00 2001 From: Benoit Tigeot Date: Fri, 23 May 2025 08:13:41 +0200 Subject: [PATCH 57/77] Prevent fetching newReference again as we have in calling method Signed-off-by: Benoit Tigeot --- pkg/registry/client.go | 13 ++++--------- pkg/registry/client_test.go | 5 ++++- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkg/registry/client.go b/pkg/registry/client.go index d035609c2..f31821166 100644 --- a/pkg/registry/client.go +++ b/pkg/registry/client.go @@ -686,8 +686,8 @@ func (c *Client) Push(data []byte, ref string, options ...PushOption) (*PushResu ociAnnotations := generateOCIAnnotations(meta, operation.creationTime) - manifestDescriptor, err := c.tagManifest(ctx, memoryStore, ref, configDescriptor, - layers, ociAnnotations) + manifestDescriptor, err := c.tagManifest(ctx, memoryStore, configDescriptor, + layers, ociAnnotations, parsedRef) if err != nil { return nil, err } @@ -891,8 +891,8 @@ func (c *Client) ValidateReference(ref, version string, u *url.URL) (*url.URL, e // tagManifest prepares and tags a manifest in memory storage func (c *Client) tagManifest(ctx context.Context, memoryStore *memory.Store, - ref string, configDescriptor ocispec.Descriptor, layers []ocispec.Descriptor, - ociAnnotations map[string]string) (ocispec.Descriptor, error) { + configDescriptor ocispec.Descriptor, layers []ocispec.Descriptor, + ociAnnotations map[string]string, parsedRef reference) (ocispec.Descriptor, error) { manifest := ocispec.Manifest{ Versioned: specs.Versioned{SchemaVersion: 2}, @@ -906,11 +906,6 @@ func (c *Client) tagManifest(ctx context.Context, memoryStore *memory.Store, return ocispec.Descriptor{}, err } - parsedRef, err := newReference(ref) - if err != nil { - return ocispec.Descriptor{}, err - } - return oras.TagBytes(ctx, memoryStore, ocispec.MediaTypeImageManifest, manifestData, parsedRef.String()) } diff --git a/pkg/registry/client_test.go b/pkg/registry/client_test.go index bf1ce66da..8fc392336 100644 --- a/pkg/registry/client_test.go +++ b/pkg/registry/client_test.go @@ -39,7 +39,10 @@ func TestTagManifestTransformsReferences(t *testing.T) { configDesc := ocispec.Descriptor{MediaType: ConfigMediaType, Digest: "sha256:config", Size: 100} layers := []ocispec.Descriptor{{MediaType: ChartLayerMediaType, Digest: "sha256:layer", Size: 200}} - desc, err := client.tagManifest(ctx, memStore, refWithPlus, configDesc, layers, nil) + parsedRef, err := newReference(refWithPlus) + require.NoError(t, err) + + desc, err := client.tagManifest(ctx, memStore, configDesc, layers, nil, parsedRef) require.NoError(t, err) transformedDesc, err := memStore.Resolve(ctx, expectedRef) From 937c533e37f3a636edd217d956af62dec38995fc Mon Sep 17 00:00:00 2001 From: Robert Sirchia Date: Fri, 23 May 2025 16:19:03 -0400 Subject: [PATCH 58/77] forward porting 30902 Signed-off-by: Robert Sirchia --- pkg/registry/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/registry/client.go b/pkg/registry/client.go index f31821166..ec7715d5b 100644 --- a/pkg/registry/client.go +++ b/pkg/registry/client.go @@ -463,7 +463,7 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) { PreCopy: func(_ context.Context, desc ocispec.Descriptor) error { mediaType := desc.MediaType if i := sort.SearchStrings(allowedMediaTypes, mediaType); i >= len(allowedMediaTypes) || allowedMediaTypes[i] != mediaType { - return fmt.Errorf("media type %q is not allowed, found in descriptor with digest: %q", mediaType, desc.Digest) + return oras.SkipNode } mu.Lock() From b7e127dd6b745a91a78368e70fe8460830c353b9 Mon Sep 17 00:00:00 2001 From: Robert Sirchia Date: Fri, 23 May 2025 16:22:39 -0400 Subject: [PATCH 59/77] amending missed line to delete Signed-off-by: Robert Sirchia --- pkg/registry/client.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/registry/client.go b/pkg/registry/client.go index ec7715d5b..c5ab0b4ba 100644 --- a/pkg/registry/client.go +++ b/pkg/registry/client.go @@ -477,7 +477,6 @@ func (c *Client) Pull(ref string, options ...PullOption) (*PullResult, error) { return nil, err } - descriptors = append(descriptors, manifest) descriptors = append(descriptors, layers...) numDescriptors := len(descriptors) From 6638935d742faf67ffea2bdc997637273d5b4759 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 May 2025 21:48:49 +0000 Subject: [PATCH 60/77] build(deps): bump github.com/santhosh-tekuri/jsonschema/v6 Bumps [github.com/santhosh-tekuri/jsonschema/v6](https://github.com/santhosh-tekuri/jsonschema) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/santhosh-tekuri/jsonschema/releases) - [Commits](https://github.com/santhosh-tekuri/jsonschema/compare/v6.0.1...v6.0.2) --- updated-dependencies: - dependency-name: github.com/santhosh-tekuri/jsonschema/v6 dependency-version: 6.0.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d93e5eb80..f08dfc7a1 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/opencontainers/image-spec v1.1.1 github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5 github.com/rubenv/sql-migrate v1.8.0 - github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 + github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 github.com/spf13/cobra v1.9.1 github.com/spf13/pflag v1.0.6 github.com/stretchr/testify v1.10.0 diff --git a/go.sum b/go.sum index 39c715621..7fd86290d 100644 --- a/go.sum +++ b/go.sum @@ -290,8 +290,8 @@ github.com/rubenv/sql-migrate v1.8.0 h1:dXnYiJk9k3wetp7GfQbKJcPHjVJL6YK19tKj8t2N github.com/rubenv/sql-migrate v1.8.0/go.mod h1:F2bGFBwCU+pnmbtNYDeKvSuvL6lBVtXDXUUv5t+u1qw= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 h1:PKK9DyHxif4LZo+uQSgXNqs0jj5+xZwwfKHgph2lxBw= -github.com/santhosh-tekuri/jsonschema/v6 v6.0.1/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU= +github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ= +github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= From 6f8e9e09a4e8db22667afef34878f4226cddb030 Mon Sep 17 00:00:00 2001 From: jinjiadu Date: Sat, 24 May 2025 13:23:03 +0800 Subject: [PATCH 61/77] refactor: replace HasPrefix+TrimPrefix with CutPrefix Signed-off-by: jinjiadu --- pkg/ignore/rules.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/ignore/rules.go b/pkg/ignore/rules.go index 5281c3d59..3511c2d40 100644 --- a/pkg/ignore/rules.go +++ b/pkg/ignore/rules.go @@ -170,10 +170,10 @@ func (r *Rules) parseRule(rule string) error { rule = strings.TrimSuffix(rule, "/") } - if strings.HasPrefix(rule, "/") { + if after, ok := strings.CutPrefix(rule, "/"); ok { // Require path matches the root path. p.match = func(n string, _ os.FileInfo) bool { - rule = strings.TrimPrefix(rule, "/") + rule = after ok, err := filepath.Match(rule, n) if err != nil { slog.Error("failed to compile", "rule", rule, slog.Any("error", err)) From b2fd91b8d07341b2003d8eaba9a9ddb81726fcc9 Mon Sep 17 00:00:00 2001 From: Benoit Tigeot Date: Mon, 26 May 2025 09:44:02 +0200 Subject: [PATCH 62/77] Adapt error of invalid json schema with the new expected output Closes: https://github.com/helm/helm/pull/30907 To be able to upgrade to v6.0.2 for jsonschema lib we need to upgrade this test. I am wondering if it's related to this commit: https://github.com/santhosh-tekuri/jsonschema/commit/86cca28795c9e34c43371b70608d243667bee2a9 Signed-off-by: Benoit Tigeot --- pkg/chart/v2/util/jsonschema_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/chart/v2/util/jsonschema_test.go b/pkg/chart/v2/util/jsonschema_test.go index d781aa4be..3279eb0db 100644 --- a/pkg/chart/v2/util/jsonschema_test.go +++ b/pkg/chart/v2/util/jsonschema_test.go @@ -55,8 +55,8 @@ func TestValidateAgainstInvalidSingleSchema(t *testing.T) { errString = err.Error() } - expectedErrString := "unable to validate schema: runtime error: invalid " + - "memory address or nil pointer dereference" + expectedErrString := `"file:///values.schema.json#" is not valid against metaschema: jsonschema validation failed with 'https://json-schema.org/draft/2020-12/schema#' +- at '': got number, want boolean or object` if errString != expectedErrString { t.Errorf("Error string :\n`%s`\ndoes not match expected\n`%s`", errString, expectedErrString) } From cc39d2428f16a837be5f26bafaff1d61d8e80cbf Mon Sep 17 00:00:00 2001 From: Terry Howe Date: Tue, 27 May 2025 13:33:59 -0600 Subject: [PATCH 63/77] fix: plugin installer test with no Internet Signed-off-by: Terry Howe --- pkg/plugin/installer/vcs_installer_test.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkg/plugin/installer/vcs_installer_test.go b/pkg/plugin/installer/vcs_installer_test.go index fbb5d354e..491d58a3f 100644 --- a/pkg/plugin/installer/vcs_installer_test.go +++ b/pkg/plugin/installer/vcs_installer_test.go @@ -19,6 +19,7 @@ import ( "fmt" "os" "path/filepath" + "strings" "testing" "github.com/Masterminds/vcs" @@ -119,6 +120,8 @@ func TestVCSInstallerNonExistentVersion(t *testing.T) { if err := Install(i); err == nil { t.Fatalf("expected error for version does not exists, got none") + } else if strings.Contains(err.Error(), "Could not resolve host: github.com") { + t.Skip("Unable to run test without Internet access") } else if err.Error() != fmt.Sprintf("requested version %q does not exist for plugin %q", version, source) { t.Fatalf("expected error for version does not exists, got (%v)", err) } @@ -146,7 +149,11 @@ func TestVCSInstallerUpdate(t *testing.T) { // Install plugin before update if err := Install(i); err != nil { - t.Fatal(err) + if strings.Contains(err.Error(), "Could not resolve host: github.com") { + t.Skip("Unable to run test without Internet access") + } else { + t.Fatal(err) + } } // Test FindSource method for positive result From 6df8eb3b3b433b5b1fc91133937ab1ab15091ba0 Mon Sep 17 00:00:00 2001 From: Benoit Tigeot Date: Wed, 28 May 2025 18:55:13 +0200 Subject: [PATCH 64/77] Fix flaky TestFindChartURL due to non-deterministic map iteration The test was failing intermittently because Go's map iteration order is randomized (see `range repos` in `findChartUrl`). When looking up the `baz` chart with repository URL http://example.com/helm, two repositories match due to trailing slash equivalence: - testing-relative (URL: http://example.com/helm) - contains baz chart GOOD - testing-relative-trailing-slash (URL: http://example.com/helm/) - does not contain baz chart.. NOT GOOD The urlutil.Equal() function treats these URLs as equivalent, but depending on which repository the random map iterator encounters first, the test would either pass or fail with "entry not found". So I changed the third test case from baz to foo chart, since foo exists in both matching repositories. This eliminates the race condition while preserving all test expectations and logic. `findChartURL()` iterates over a map without deterministic ordering, causing the first-match-wins behavior to be non-deterministic when multiple repositories match the same URL pattern. Signed-off-by: Benoit Tigeot --- pkg/downloader/manager_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go index 01df5ecc1..53955c45b 100644 --- a/pkg/downloader/manager_test.go +++ b/pkg/downloader/manager_test.go @@ -115,7 +115,7 @@ func TestFindChartURL(t *testing.T) { t.Errorf("Unexpected passcredentialsall %t", passcredentialsall) } - name = "baz" + name = "foo" version = "1.2.3" repoURL = "http://example.com/helm" @@ -124,7 +124,7 @@ func TestFindChartURL(t *testing.T) { t.Fatal(err) } - if churl != "http://example.com/path/to/baz-1.2.3.tgz" { + if churl != "http://example.com/helm/charts/foo-1.2.3.tgz" { t.Errorf("Unexpected URL %q", churl) } if username != "" { From 5fe7a87138a3fb4903575fb20b5bb9b98c87a56b Mon Sep 17 00:00:00 2001 From: Terry Howe Date: Mon, 26 May 2025 11:48:24 -0600 Subject: [PATCH 65/77] fix: add debug logging to oci transport Signed-off-by: Terry Howe Co-authored-by: Billy Zha --- pkg/registry/client.go | 26 +-- pkg/registry/transport.go | 175 +++++++++++++++ pkg/registry/transport_test.go | 399 +++++++++++++++++++++++++++++++++ 3 files changed, 580 insertions(+), 20 deletions(-) create mode 100644 pkg/registry/transport.go create mode 100644 pkg/registry/transport_test.go diff --git a/pkg/registry/client.go b/pkg/registry/client.go index c5ab0b4ba..b8235927b 100644 --- a/pkg/registry/client.go +++ b/pkg/registry/client.go @@ -100,27 +100,8 @@ func NewClient(options ...ClientOption) (*Client, error) { client.credentialsFile = helmpath.ConfigPath(CredentialsFileBasename) } if client.httpClient == nil { - type cloner[T any] interface { - Clone() T - } - - // try to copy (clone) the http.DefaultTransport so any mutations we - // perform on it (e.g. TLS config) are not reflected globally - // follow https://github.com/golang/go/issues/39299 for a more elegant - // solution in the future - transport := http.DefaultTransport - if t, ok := transport.(cloner[*http.Transport]); ok { - transport = t.Clone() - } else if t, ok := transport.(cloner[http.RoundTripper]); ok { - // this branch will not be used with go 1.20, it was added - // optimistically to try to clone if the http.DefaultTransport - // implementation changes, still the Clone method in that case - // might not return http.RoundTripper... - transport = t.Clone() - } - client.httpClient = &http.Client{ - Transport: retry.NewTransport(transport), + Transport: NewTransport(client.debug), } } @@ -296,6 +277,11 @@ func ensureTLSConfig(client *auth.Client) (*tls.Config, error) { switch t := t.Base.(type) { case *http.Transport: transport = t + case *LoggingTransport: + switch t := t.RoundTripper.(type) { + case *http.Transport: + transport = t + } } } diff --git a/pkg/registry/transport.go b/pkg/registry/transport.go new file mode 100644 index 000000000..7b9c6744b --- /dev/null +++ b/pkg/registry/transport.go @@ -0,0 +1,175 @@ +/* +Copyright The Helm Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package registry + +import ( + "bytes" + "fmt" + "io" + "log/slog" + "mime" + "net/http" + "strings" + "sync/atomic" + + "oras.land/oras-go/v2/registry/remote/retry" +) + +var ( + // requestCount records the number of logged request-response pairs and will + // be used as the unique id for the next pair. + requestCount uint64 + + // toScrub is a set of headers that should be scrubbed from the log. + toScrub = []string{ + "Authorization", + "Set-Cookie", + } +) + +// payloadSizeLimit limits the maximum size of the response body to be printed. +const payloadSizeLimit int64 = 16 * 1024 // 16 KiB + +// LoggingTransport is an http.RoundTripper that keeps track of the in-flight +// request and add hooks to report HTTP tracing events. +type LoggingTransport struct { + http.RoundTripper +} + +// NewTransport creates and returns a new instance of LoggingTransport +func NewTransport(debug bool) *retry.Transport { + type cloner[T any] interface { + Clone() T + } + + // try to copy (clone) the http.DefaultTransport so any mutations we + // perform on it (e.g. TLS config) are not reflected globally + // follow https://github.com/golang/go/issues/39299 for a more elegant + // solution in the future + transport := http.DefaultTransport + if t, ok := transport.(cloner[*http.Transport]); ok { + transport = t.Clone() + } else if t, ok := transport.(cloner[http.RoundTripper]); ok { + // this branch will not be used with go 1.20, it was added + // optimistically to try to clone if the http.DefaultTransport + // implementation changes, still the Clone method in that case + // might not return http.RoundTripper... + transport = t.Clone() + } + if debug { + transport = &LoggingTransport{RoundTripper: transport} + } + + return retry.NewTransport(transport) +} + +// RoundTrip calls base round trip while keeping track of the current request. +func (t *LoggingTransport) RoundTrip(req *http.Request) (resp *http.Response, err error) { + id := atomic.AddUint64(&requestCount, 1) - 1 + + slog.Debug("Request", "id", id, "url", req.URL, "method", req.Method, "header", logHeader(req.Header)) + resp, err = t.RoundTripper.RoundTrip(req) + if err != nil { + slog.Debug("Response", "id", id, "error", err) + } else if resp != nil { + slog.Debug("Response", "id", id, "status", resp.Status, "header", logHeader(resp.Header), "body", logResponseBody(resp)) + } else { + slog.Debug("Response", "id", id, "response", "nil") + } + + return resp, err +} + +// logHeader prints out the provided header keys and values, with auth header scrubbed. +func logHeader(header http.Header) string { + if len(header) > 0 { + headers := []string{} + for k, v := range header { + for _, h := range toScrub { + if strings.EqualFold(k, h) { + v = []string{"*****"} + } + } + headers = append(headers, fmt.Sprintf(" %q: %q", k, strings.Join(v, ", "))) + } + return strings.Join(headers, "\n") + } + return " Empty header" +} + +// logResponseBody prints out the response body if it is printable and within size limit. +func logResponseBody(resp *http.Response) string { + if resp.Body == nil || resp.Body == http.NoBody { + return " No response body to print" + } + + // non-applicable body is not printed and remains untouched for subsequent processing + contentType := resp.Header.Get("Content-Type") + if contentType == "" { + return " Response body without a content type is not printed" + } + if !isPrintableContentType(contentType) { + return fmt.Sprintf(" Response body of content type %q is not printed", contentType) + } + + buf := bytes.NewBuffer(nil) + body := resp.Body + // restore the body by concatenating the read body with the remaining body + resp.Body = struct { + io.Reader + io.Closer + }{ + Reader: io.MultiReader(buf, body), + Closer: body, + } + // read the body up to limit+1 to check if the body exceeds the limit + if _, err := io.CopyN(buf, body, payloadSizeLimit+1); err != nil && err != io.EOF { + return fmt.Sprintf(" Error reading response body: %v", err) + } + + readBody := buf.String() + if len(readBody) == 0 { + return " Response body is empty" + } + if containsCredentials(readBody) { + return " Response body redacted due to potential credentials" + } + if len(readBody) > int(payloadSizeLimit) { + return readBody[:payloadSizeLimit] + "\n...(truncated)" + } + return readBody +} + +// isPrintableContentType returns true if the contentType is printable. +func isPrintableContentType(contentType string) bool { + mediaType, _, err := mime.ParseMediaType(contentType) + if err != nil { + return false + } + + switch mediaType { + case "application/json", // JSON types + "text/plain", "text/html": // text types + return true + } + return strings.HasSuffix(mediaType, "+json") +} + +// containsCredentials returns true if the body contains potential credentials. +func containsCredentials(body string) bool { + return strings.Contains(body, `"token"`) || strings.Contains(body, `"access_token"`) +} diff --git a/pkg/registry/transport_test.go b/pkg/registry/transport_test.go new file mode 100644 index 000000000..b4990c526 --- /dev/null +++ b/pkg/registry/transport_test.go @@ -0,0 +1,399 @@ +/* +Copyright The Helm Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package registry + +import ( + "bytes" + "errors" + "io" + "net/http" + "testing" +) + +var errMockRead = errors.New("mock read error") + +type errorReader struct{} + +func (e *errorReader) Read(_ []byte) (n int, err error) { + return 0, errMockRead +} + +func Test_isPrintableContentType(t *testing.T) { + tests := []struct { + name string + contentType string + want bool + }{ + { + name: "Empty content type", + contentType: "", + want: false, + }, + { + name: "General JSON type", + contentType: "application/json", + want: true, + }, + { + name: "General JSON type with charset", + contentType: "application/json; charset=utf-8", + want: true, + }, + { + name: "Random type with application/json prefix", + contentType: "application/jsonwhatever", + want: false, + }, + { + name: "Manifest type in JSON", + contentType: "application/vnd.oci.image.manifest.v1+json", + want: true, + }, + { + name: "Manifest type in JSON with charset", + contentType: "application/vnd.oci.image.manifest.v1+json; charset=utf-8", + want: true, + }, + { + name: "Random content type in JSON", + contentType: "application/whatever+json", + want: true, + }, + { + name: "Plain text type", + contentType: "text/plain", + want: true, + }, + { + name: "Plain text type with charset", + contentType: "text/plain; charset=utf-8", + want: true, + }, + { + name: "Random type with text/plain prefix", + contentType: "text/plainnnnn", + want: false, + }, + { + name: "HTML type", + contentType: "text/html", + want: true, + }, + { + name: "Plain text type with charset", + contentType: "text/html; charset=utf-8", + want: true, + }, + { + name: "Random type with text/html prefix", + contentType: "text/htmlllll", + want: false, + }, + { + name: "Binary type", + contentType: "application/octet-stream", + want: false, + }, + { + name: "Unknown type", + contentType: "unknown/unknown", + want: false, + }, + { + name: "Invalid type", + contentType: "text/", + want: false, + }, + { + name: "Random string", + contentType: "random123!@#", + want: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := isPrintableContentType(tt.contentType); got != tt.want { + t.Errorf("isPrintableContentType() = %v, want %v", got, tt.want) + } + }) + } +} + +func Test_logResponseBody(t *testing.T) { + tests := []struct { + name string + resp *http.Response + want string + wantData []byte + }{ + { + name: "Nil body", + resp: &http.Response{ + Body: nil, + Header: http.Header{"Content-Type": []string{"application/json"}}, + }, + want: " No response body to print", + }, + { + name: "No body", + wantData: nil, + resp: &http.Response{ + Body: http.NoBody, + ContentLength: 100, // in case of HEAD response, the content length is set but the body is empty + Header: http.Header{"Content-Type": []string{"application/json"}}, + }, + want: " No response body to print", + }, + { + name: "Empty body", + wantData: []byte(""), + resp: &http.Response{ + Body: io.NopCloser(bytes.NewReader([]byte(""))), + ContentLength: 0, + Header: http.Header{"Content-Type": []string{"text/plain"}}, + }, + want: " Response body is empty", + }, + { + name: "Unknown content length", + wantData: []byte("whatever"), + resp: &http.Response{ + Body: io.NopCloser(bytes.NewReader([]byte("whatever"))), + ContentLength: -1, + Header: http.Header{"Content-Type": []string{"text/plain"}}, + }, + want: "whatever", + }, + { + name: "Missing content type header", + wantData: []byte("whatever"), + resp: &http.Response{ + Body: io.NopCloser(bytes.NewReader([]byte("whatever"))), + ContentLength: 8, + }, + want: " Response body without a content type is not printed", + }, + { + name: "Empty content type header", + wantData: []byte("whatever"), + resp: &http.Response{ + Body: io.NopCloser(bytes.NewReader([]byte("whatever"))), + ContentLength: 8, + Header: http.Header{"Content-Type": []string{""}}, + }, + want: " Response body without a content type is not printed", + }, + { + name: "Non-printable content type", + wantData: []byte("binary data"), + resp: &http.Response{ + Body: io.NopCloser(bytes.NewReader([]byte("binary data"))), + ContentLength: 11, + Header: http.Header{"Content-Type": []string{"application/octet-stream"}}, + }, + want: " Response body of content type \"application/octet-stream\" is not printed", + }, + { + name: "Body at the limit", + wantData: bytes.Repeat([]byte("a"), int(payloadSizeLimit)), + resp: &http.Response{ + Body: io.NopCloser(bytes.NewReader(bytes.Repeat([]byte("a"), int(payloadSizeLimit)))), + ContentLength: payloadSizeLimit, + Header: http.Header{"Content-Type": []string{"text/plain"}}, + }, + want: string(bytes.Repeat([]byte("a"), int(payloadSizeLimit))), + }, + { + name: "Body larger than limit", + wantData: bytes.Repeat([]byte("a"), int(payloadSizeLimit+1)), + resp: &http.Response{ + Body: io.NopCloser(bytes.NewReader(bytes.Repeat([]byte("a"), int(payloadSizeLimit+1)))), // 1 byte larger than limit + ContentLength: payloadSizeLimit + 1, + Header: http.Header{"Content-Type": []string{"text/plain"}}, + }, + want: string(bytes.Repeat([]byte("a"), int(payloadSizeLimit))) + "\n...(truncated)", + }, + { + name: "Printable content type within limit", + wantData: []byte("data"), + resp: &http.Response{ + Body: io.NopCloser(bytes.NewReader([]byte("data"))), + ContentLength: 4, + Header: http.Header{"Content-Type": []string{"text/plain"}}, + }, + want: "data", + }, + { + name: "Actual body size is larger than content length", + wantData: []byte("data"), + resp: &http.Response{ + Body: io.NopCloser(bytes.NewReader([]byte("data"))), + ContentLength: 3, // mismatched content length + Header: http.Header{"Content-Type": []string{"text/plain"}}, + }, + want: "data", + }, + { + name: "Actual body size is larger than content length and exceeds limit", + wantData: bytes.Repeat([]byte("a"), int(payloadSizeLimit+1)), + resp: &http.Response{ + Body: io.NopCloser(bytes.NewReader(bytes.Repeat([]byte("a"), int(payloadSizeLimit+1)))), // 1 byte larger than limit + ContentLength: 1, // mismatched content length + Header: http.Header{"Content-Type": []string{"text/plain"}}, + }, + want: string(bytes.Repeat([]byte("a"), int(payloadSizeLimit))) + "\n...(truncated)", + }, + { + name: "Actual body size is smaller than content length", + wantData: []byte("data"), + resp: &http.Response{ + Body: io.NopCloser(bytes.NewReader([]byte("data"))), + ContentLength: 5, // mismatched content length + Header: http.Header{"Content-Type": []string{"text/plain"}}, + }, + want: "data", + }, + { + name: "Body contains token", + resp: &http.Response{ + Body: io.NopCloser(bytes.NewReader([]byte(`{"token":"12345"}`))), + ContentLength: 17, + Header: http.Header{"Content-Type": []string{"application/json"}}, + }, + wantData: []byte(`{"token":"12345"}`), + want: " Response body redacted due to potential credentials", + }, + { + name: "Body contains access_token", + resp: &http.Response{ + Body: io.NopCloser(bytes.NewReader([]byte(`{"access_token":"12345"}`))), + ContentLength: 17, + Header: http.Header{"Content-Type": []string{"application/json"}}, + }, + wantData: []byte(`{"access_token":"12345"}`), + want: " Response body redacted due to potential credentials", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := logResponseBody(tt.resp); got != tt.want { + t.Errorf("logResponseBody() = %v, want %v", got, tt.want) + } + // validate the response body + if tt.resp.Body != nil { + readBytes, err := io.ReadAll(tt.resp.Body) + if err != nil { + t.Errorf("failed to read body after logResponseBody(), err= %v", err) + } + if !bytes.Equal(readBytes, tt.wantData) { + t.Errorf("resp.Body after logResponseBody() = %v, want %v", readBytes, tt.wantData) + } + if closeErr := tt.resp.Body.Close(); closeErr != nil { + t.Errorf("failed to close body after logResponseBody(), err= %v", closeErr) + } + } + }) + } +} + +func Test_logResponseBody_error(t *testing.T) { + tests := []struct { + name string + resp *http.Response + want string + }{ + { + name: "Error reading body", + resp: &http.Response{ + Body: io.NopCloser(&errorReader{}), + ContentLength: 10, + Header: http.Header{"Content-Type": []string{"text/plain"}}, + }, + want: " Error reading response body: mock read error", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := logResponseBody(tt.resp); got != tt.want { + t.Errorf("logResponseBody() = %v, want %v", got, tt.want) + } + if closeErr := tt.resp.Body.Close(); closeErr != nil { + t.Errorf("failed to close body after logResponseBody(), err= %v", closeErr) + } + }) + } +} + +func Test_containsCredentials(t *testing.T) { + tests := []struct { + name string + body string + want bool + }{ + { + name: "Contains token keyword", + body: `{"token": "12345"}`, + want: true, + }, + { + name: "Contains quoted token keyword", + body: `whatever "token" blah`, + want: true, + }, + { + name: "Contains unquoted token keyword", + body: `whatever token blah`, + want: false, + }, + { + name: "Contains access_token keyword", + body: `{"access_token": "12345"}`, + want: true, + }, + { + name: "Contains quoted access_token keyword", + body: `whatever "access_token" blah`, + want: true, + }, + { + name: "Contains unquoted access_token keyword", + body: `whatever access_token blah`, + want: false, + }, + { + name: "Does not contain credentials", + body: `{"key": "value"}`, + want: false, + }, + { + name: "Empty body", + body: ``, + want: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := containsCredentials(tt.body); got != tt.want { + t.Errorf("containsCredentials() = %v, want %v", got, tt.want) + } + }) + } +} From 6ab7aa3612a524ffdf78759faab98086ef5faf17 Mon Sep 17 00:00:00 2001 From: Terry Howe Date: Thu, 29 May 2025 19:32:55 -0400 Subject: [PATCH 66/77] fix: legacy docker support broken for login Signed-off-by: Terry Howe --- pkg/registry/client.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/registry/client.go b/pkg/registry/client.go index c5ab0b4ba..63160cd07 100644 --- a/pkg/registry/client.go +++ b/pkg/registry/client.go @@ -262,6 +262,7 @@ func (c *Client) Login(host string, options ...LoginOption) error { } key := credentials.ServerAddressFromRegistry(host) + key = credentials.ServerAddressFromHostname(key) if err := c.credentialsStore.Put(ctx, key, cred); err != nil { return err } From 56a2bb4188dea25710e01ce8eb5321665b171069 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Sun, 27 Apr 2025 22:22:57 +0200 Subject: [PATCH 67/77] chore: enable usetesting linter Signed-off-by: Matthieu MOREL --- .golangci.yml | 1 + internal/test/ensure/ensure.go | 14 +++---- pkg/action/install_test.go | 6 +-- pkg/action/upgrade_test.go | 19 ++++------ pkg/cli/environment_test.go | 8 +--- pkg/cmd/create_test.go | 19 +++++----- pkg/cmd/helpers_test.go | 12 ------ pkg/cmd/package_test.go | 4 +- pkg/cmd/plugin_test.go | 5 +-- pkg/cmd/repo_add_test.go | 6 +-- pkg/cmd/root_test.go | 2 +- pkg/gates/gates_test.go | 3 +- pkg/helmpath/home_unix_test.go | 9 ++--- pkg/helmpath/lazypath_unix_test.go | 13 ++----- pkg/kube/ready_test.go | 60 +++++++++++++++--------------- pkg/plugin/installer/base_test.go | 4 +- pkg/postrender/exec_test.go | 8 +--- pkg/provenance/sign_test.go | 2 +- pkg/registry/client_test.go | 3 +- pkg/repo/chartrepo_test.go | 2 +- pkg/repo/repo_test.go | 2 +- pkg/repo/repotest/server.go | 16 +++----- 22 files changed, 87 insertions(+), 131 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 156dd0509..a9b13c35f 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -30,6 +30,7 @@ linters: - thelper - unused - usestdlibvars + - usetesting exclusions: generated: lax diff --git a/internal/test/ensure/ensure.go b/internal/test/ensure/ensure.go index c131e6da5..a72f48c2d 100644 --- a/internal/test/ensure/ensure.go +++ b/internal/test/ensure/ensure.go @@ -29,12 +29,12 @@ import ( func HelmHome(t *testing.T) { t.Helper() base := t.TempDir() - os.Setenv(xdg.CacheHomeEnvVar, base) - os.Setenv(xdg.ConfigHomeEnvVar, base) - os.Setenv(xdg.DataHomeEnvVar, base) - os.Setenv(helmpath.CacheHomeEnvVar, "") - os.Setenv(helmpath.ConfigHomeEnvVar, "") - os.Setenv(helmpath.DataHomeEnvVar, "") + t.Setenv(xdg.CacheHomeEnvVar, base) + t.Setenv(xdg.ConfigHomeEnvVar, base) + t.Setenv(xdg.DataHomeEnvVar, base) + t.Setenv(helmpath.CacheHomeEnvVar, "") + t.Setenv(helmpath.ConfigHomeEnvVar, "") + t.Setenv(helmpath.DataHomeEnvVar, "") } // TempFile ensures a temp file for unit testing purposes. @@ -49,7 +49,7 @@ func TempFile(t *testing.T, name string, data []byte) string { t.Helper() path := t.TempDir() filename := filepath.Join(path, name) - if err := os.WriteFile(filename, data, 0755); err != nil { + if err := os.WriteFile(filename, data, 0o755); err != nil { t.Fatal(err) } return path diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go index dabd57b22..7a88d82b5 100644 --- a/pkg/action/install_test.go +++ b/pkg/action/install_test.go @@ -131,7 +131,7 @@ func TestInstallRelease(t *testing.T) { instAction := installAction(t) vals := map[string]interface{}{} - ctx, done := context.WithCancel(context.Background()) + ctx, done := context.WithCancel(t.Context()) res, err := instAction.RunWithContext(ctx, buildChart(), vals) if err != nil { t.Fatalf("Failed install: %s", err) @@ -557,7 +557,7 @@ func TestInstallRelease_Wait_Interrupted(t *testing.T) { instAction.WaitStrategy = kube.StatusWatcherStrategy vals := map[string]interface{}{} - ctx, cancel := context.WithCancel(context.Background()) + ctx, cancel := context.WithCancel(t.Context()) time.AfterFunc(time.Second, cancel) goroutines := runtime.NumGoroutine() @@ -641,7 +641,7 @@ func TestInstallRelease_Atomic_Interrupted(t *testing.T) { instAction.Atomic = true vals := map[string]interface{}{} - ctx, cancel := context.WithCancel(context.Background()) + ctx, cancel := context.WithCancel(t.Context()) time.AfterFunc(time.Second, cancel) goroutines := runtime.NumGoroutine() diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go index 4476bc44d..e20955560 100644 --- a/pkg/action/upgrade_test.go +++ b/pkg/action/upgrade_test.go @@ -57,7 +57,7 @@ func TestUpgradeRelease_Success(t *testing.T) { upAction.WaitStrategy = kube.StatusWatcherStrategy vals := map[string]interface{}{} - ctx, done := context.WithCancel(context.Background()) + ctx, done := context.WithCancel(t.Context()) res, err := upAction.RunWithContext(ctx, rel.Name, buildChart(), vals) done() req.NoError(err) @@ -384,7 +384,6 @@ func TestUpgradeRelease_Pending(t *testing.T) { } func TestUpgradeRelease_Interrupted_Wait(t *testing.T) { - is := assert.New(t) req := require.New(t) @@ -400,8 +399,7 @@ func TestUpgradeRelease_Interrupted_Wait(t *testing.T) { upAction.WaitStrategy = kube.StatusWatcherStrategy vals := map[string]interface{}{} - ctx := context.Background() - ctx, cancel := context.WithCancel(ctx) + ctx, cancel := context.WithCancel(t.Context()) time.AfterFunc(time.Second, cancel) res, err := upAction.RunWithContext(ctx, rel.Name, buildChart(), vals) @@ -409,11 +407,9 @@ func TestUpgradeRelease_Interrupted_Wait(t *testing.T) { req.Error(err) is.Contains(res.Info.Description, "Upgrade \"interrupted-release\" failed: context canceled") is.Equal(res.Info.Status, release.StatusFailed) - } func TestUpgradeRelease_Interrupted_Atomic(t *testing.T) { - is := assert.New(t) req := require.New(t) @@ -429,8 +425,7 @@ func TestUpgradeRelease_Interrupted_Atomic(t *testing.T) { upAction.Atomic = true vals := map[string]interface{}{} - ctx := context.Background() - ctx, cancel := context.WithCancel(ctx) + ctx, cancel := context.WithCancel(t.Context()) time.AfterFunc(time.Second, cancel) res, err := upAction.RunWithContext(ctx, rel.Name, buildChart(), vals) @@ -446,7 +441,7 @@ func TestUpgradeRelease_Interrupted_Atomic(t *testing.T) { } func TestMergeCustomLabels(t *testing.T) { - var tests = [][3]map[string]string{ + tests := [][3]map[string]string{ {nil, nil, map[string]string{}}, {map[string]string{}, map[string]string{}, map[string]string{}}, {map[string]string{"k1": "v1", "k2": "v2"}, nil, map[string]string{"k1": "v1", "k2": "v2"}}, @@ -551,7 +546,7 @@ func TestUpgradeRelease_DryRun(t *testing.T) { upAction.DryRun = true vals := map[string]interface{}{} - ctx, done := context.WithCancel(context.Background()) + ctx, done := context.WithCancel(t.Context()) res, err := upAction.RunWithContext(ctx, rel.Name, buildChart(withSampleSecret()), vals) done() req.NoError(err) @@ -567,7 +562,7 @@ func TestUpgradeRelease_DryRun(t *testing.T) { upAction.HideSecret = true vals = map[string]interface{}{} - ctx, done = context.WithCancel(context.Background()) + ctx, done = context.WithCancel(t.Context()) res, err = upAction.RunWithContext(ctx, rel.Name, buildChart(withSampleSecret()), vals) done() req.NoError(err) @@ -583,7 +578,7 @@ func TestUpgradeRelease_DryRun(t *testing.T) { upAction.DryRun = false vals = map[string]interface{}{} - ctx, done = context.WithCancel(context.Background()) + ctx, done = context.WithCancel(t.Context()) _, err = upAction.RunWithContext(ctx, rel.Name, buildChart(withSampleSecret()), vals) done() req.Error(err) diff --git a/pkg/cli/environment_test.go b/pkg/cli/environment_test.go index 8a3b87936..52326eeff 100644 --- a/pkg/cli/environment_test.go +++ b/pkg/cli/environment_test.go @@ -38,7 +38,6 @@ func TestSetNamespace(t *testing.T) { if settings.namespace != "testns" { t.Errorf("Expected namespace testns, got %s", settings.namespace) } - } func TestEnvSettings(t *testing.T) { @@ -126,7 +125,7 @@ func TestEnvSettings(t *testing.T) { defer resetEnv()() for k, v := range tt.envvars { - os.Setenv(k, v) + t.Setenv(k, v) } flags := pflag.NewFlagSet("testing", pflag.ContinueOnError) @@ -233,10 +232,7 @@ func TestEnvOrBool(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { if tt.env != "" { - t.Cleanup(func() { - os.Unsetenv(tt.env) - }) - os.Setenv(tt.env, tt.val) + t.Setenv(tt.env, tt.val) } actual := envBoolOr(tt.env, tt.def) if actual != tt.expected { diff --git a/pkg/cmd/create_test.go b/pkg/cmd/create_test.go index 26eabbfc3..103cd3bc0 100644 --- a/pkg/cmd/create_test.go +++ b/pkg/cmd/create_test.go @@ -33,7 +33,7 @@ func TestCreateCmd(t *testing.T) { ensure.HelmHome(t) cname := "testchart" dir := t.TempDir() - defer testChdir(t, dir)() + defer t.Chdir(dir) // Run a create if _, _, err := executeActionCommand("create " + cname); err != nil { @@ -64,19 +64,19 @@ func TestCreateStarterCmd(t *testing.T) { ensure.HelmHome(t) cname := "testchart" defer resetEnv()() - os.MkdirAll(helmpath.CachePath(), 0755) - defer testChdir(t, helmpath.CachePath())() + os.MkdirAll(helmpath.CachePath(), 0o755) + defer t.Chdir(helmpath.CachePath()) // Create a starter. starterchart := helmpath.DataPath("starters") - os.MkdirAll(starterchart, 0755) + os.MkdirAll(starterchart, 0o755) if dest, err := chartutil.Create("starterchart", starterchart); err != nil { t.Fatalf("Could not create chart: %s", err) } else { t.Logf("Created %s", dest) } tplpath := filepath.Join(starterchart, "starterchart", "templates", "foo.tpl") - if err := os.WriteFile(tplpath, []byte("test"), 0644); err != nil { + if err := os.WriteFile(tplpath, []byte("test"), 0o644); err != nil { t.Fatalf("Could not write template: %s", err) } @@ -122,7 +122,6 @@ func TestCreateStarterCmd(t *testing.T) { if !found { t.Error("Did not find foo.tpl") } - } func TestCreateStarterAbsoluteCmd(t *testing.T) { @@ -132,19 +131,19 @@ func TestCreateStarterAbsoluteCmd(t *testing.T) { // Create a starter. starterchart := helmpath.DataPath("starters") - os.MkdirAll(starterchart, 0755) + os.MkdirAll(starterchart, 0o755) if dest, err := chartutil.Create("starterchart", starterchart); err != nil { t.Fatalf("Could not create chart: %s", err) } else { t.Logf("Created %s", dest) } tplpath := filepath.Join(starterchart, "starterchart", "templates", "foo.tpl") - if err := os.WriteFile(tplpath, []byte("test"), 0644); err != nil { + if err := os.WriteFile(tplpath, []byte("test"), 0o644); err != nil { t.Fatalf("Could not write template: %s", err) } - os.MkdirAll(helmpath.CachePath(), 0755) - defer testChdir(t, helmpath.CachePath())() + os.MkdirAll(helmpath.CachePath(), 0o755) + defer t.Chdir(helmpath.CachePath()) starterChartPath := filepath.Join(starterchart, "starterchart") diff --git a/pkg/cmd/helpers_test.go b/pkg/cmd/helpers_test.go index b48f802b5..5d71fecad 100644 --- a/pkg/cmd/helpers_test.go +++ b/pkg/cmd/helpers_test.go @@ -149,15 +149,3 @@ func resetEnv() func() { settings = cli.New() } } - -func testChdir(t *testing.T, dir string) func() { - t.Helper() - old, err := os.Getwd() - if err != nil { - t.Fatal(err) - } - if err := os.Chdir(dir); err != nil { - t.Fatal(err) - } - return func() { os.Chdir(old) } -} diff --git a/pkg/cmd/package_test.go b/pkg/cmd/package_test.go index 54358fc12..b17684aa6 100644 --- a/pkg/cmd/package_test.go +++ b/pkg/cmd/package_test.go @@ -111,9 +111,9 @@ func TestPackage(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { cachePath := t.TempDir() - defer testChdir(t, cachePath)() + defer t.Chdir(cachePath) - if err := os.MkdirAll("toot", 0777); err != nil { + if err := os.MkdirAll("toot", 0o777); err != nil { t.Fatal(err) } diff --git a/pkg/cmd/plugin_test.go b/pkg/cmd/plugin_test.go index bc0f7de48..74f7a276a 100644 --- a/pkg/cmd/plugin_test.go +++ b/pkg/cmd/plugin_test.go @@ -79,7 +79,6 @@ func TestManuallyProcessArgs(t *testing.T) { t.Errorf("expected unknown flag %d to be %q, got %q", i, expectUnknown[i], k) } } - } func TestLoadPlugins(t *testing.T) { @@ -327,7 +326,6 @@ func checkCommand(t *testing.T, plugins []*cobra.Command, tests []staticCompleti } func TestPluginDynamicCompletion(t *testing.T) { - tests := []cmdTestCase{{ name: "completion for plugin", cmd: "__complete args ''", @@ -364,7 +362,7 @@ func TestLoadPlugins_HelmNoPlugins(t *testing.T) { settings.PluginsDirectory = "testdata/helmhome/helm/plugins" settings.RepositoryConfig = "testdata/helmhome/helm/repository" - os.Setenv("HELM_NO_PLUGINS", "1") + t.Setenv("HELM_NO_PLUGINS", "1") out := bytes.NewBuffer(nil) cmd := &cobra.Command{} @@ -377,7 +375,6 @@ func TestLoadPlugins_HelmNoPlugins(t *testing.T) { } func TestPluginCmdsCompletion(t *testing.T) { - tests := []cmdTestCase{{ name: "completion for plugin update", cmd: "__complete plugin update ''", diff --git a/pkg/cmd/repo_add_test.go b/pkg/cmd/repo_add_test.go index cfa610611..aa6c4eaad 100644 --- a/pkg/cmd/repo_add_test.go +++ b/pkg/cmd/repo_add_test.go @@ -50,7 +50,7 @@ func TestRepoAddCmd(t *testing.T) { defer srv2.Stop() tmpdir := filepath.Join(t.TempDir(), "path-component.yaml/data") - if err := os.MkdirAll(tmpdir, 0777); err != nil { + if err := os.MkdirAll(tmpdir, 0o777); err != nil { t.Fatal(err) } repoFile := filepath.Join(tmpdir, "repositories.yaml") @@ -99,7 +99,7 @@ func TestRepoAdd(t *testing.T) { forceUpdate: false, repoFile: repoFile, } - os.Setenv(xdg.CacheHomeEnvVar, rootDir) + t.Setenv(xdg.CacheHomeEnvVar, rootDir) if err := o.run(io.Discard); err != nil { t.Error(err) @@ -153,7 +153,7 @@ func TestRepoAddCheckLegalName(t *testing.T) { forceUpdate: false, repoFile: repoFile, } - os.Setenv(xdg.CacheHomeEnvVar, rootDir) + t.Setenv(xdg.CacheHomeEnvVar, rootDir) wantErrorMsg := fmt.Sprintf("repository name (%s) contains '/', please specify a different name without '/'", testRepoName) diff --git a/pkg/cmd/root_test.go b/pkg/cmd/root_test.go index 9521a5aa2..84e3d9ed2 100644 --- a/pkg/cmd/root_test.go +++ b/pkg/cmd/root_test.go @@ -80,7 +80,7 @@ func TestRootCmd(t *testing.T) { ensure.HelmHome(t) for k, v := range tt.envvars { - os.Setenv(k, v) + t.Setenv(k, v) } if _, _, err := executeActionCommand(tt.args); err != nil { diff --git a/pkg/gates/gates_test.go b/pkg/gates/gates_test.go index 6bdd17ed6..4d77199e6 100644 --- a/pkg/gates/gates_test.go +++ b/pkg/gates/gates_test.go @@ -23,14 +23,13 @@ import ( const name string = "HELM_EXPERIMENTAL_FEATURE" func TestIsEnabled(t *testing.T) { - os.Unsetenv(name) g := Gate(name) if g.IsEnabled() { t.Errorf("feature gate shows as available, but the environment variable %s was not set", name) } - os.Setenv(name, "1") + t.Setenv(name, "1") if !g.IsEnabled() { t.Errorf("feature gate shows as disabled, but the environment variable %s was set", name) diff --git a/pkg/helmpath/home_unix_test.go b/pkg/helmpath/home_unix_test.go index 6e4189bc9..a64c9bcd6 100644 --- a/pkg/helmpath/home_unix_test.go +++ b/pkg/helmpath/home_unix_test.go @@ -16,7 +16,6 @@ package helmpath import ( - "os" "runtime" "testing" @@ -24,9 +23,9 @@ import ( ) func TestHelmHome(t *testing.T) { - os.Setenv(xdg.CacheHomeEnvVar, "/cache") - os.Setenv(xdg.ConfigHomeEnvVar, "/config") - os.Setenv(xdg.DataHomeEnvVar, "/data") + t.Setenv(xdg.CacheHomeEnvVar, "/cache") + t.Setenv(xdg.ConfigHomeEnvVar, "/config") + t.Setenv(xdg.DataHomeEnvVar, "/data") isEq := func(t *testing.T, got, expected string) { t.Helper() if expected != got { @@ -40,7 +39,7 @@ func TestHelmHome(t *testing.T) { isEq(t, DataPath(), "/data/helm") // test to see if lazy-loading environment variables at runtime works - os.Setenv(xdg.CacheHomeEnvVar, "/cache2") + t.Setenv(xdg.CacheHomeEnvVar, "/cache2") isEq(t, CachePath(), "/cache2/helm") } diff --git a/pkg/helmpath/lazypath_unix_test.go b/pkg/helmpath/lazypath_unix_test.go index 534735d10..4b0f2429b 100644 --- a/pkg/helmpath/lazypath_unix_test.go +++ b/pkg/helmpath/lazypath_unix_test.go @@ -16,7 +16,6 @@ package helmpath import ( - "os" "path/filepath" "testing" @@ -32,15 +31,13 @@ const ( ) func TestDataPath(t *testing.T) { - os.Unsetenv(xdg.DataHomeEnvVar) - expected := filepath.Join(homedir.HomeDir(), ".local", "share", appName, testFile) if lazy.dataPath(testFile) != expected { t.Errorf("expected '%s', got '%s'", expected, lazy.dataPath(testFile)) } - os.Setenv(xdg.DataHomeEnvVar, "/tmp") + t.Setenv(xdg.DataHomeEnvVar, "/tmp") expected = filepath.Join("/tmp", appName, testFile) @@ -50,15 +47,13 @@ func TestDataPath(t *testing.T) { } func TestConfigPath(t *testing.T) { - os.Unsetenv(xdg.ConfigHomeEnvVar) - expected := filepath.Join(homedir.HomeDir(), ".config", appName, testFile) if lazy.configPath(testFile) != expected { t.Errorf("expected '%s', got '%s'", expected, lazy.configPath(testFile)) } - os.Setenv(xdg.ConfigHomeEnvVar, "/tmp") + t.Setenv(xdg.ConfigHomeEnvVar, "/tmp") expected = filepath.Join("/tmp", appName, testFile) @@ -68,15 +63,13 @@ func TestConfigPath(t *testing.T) { } func TestCachePath(t *testing.T) { - os.Unsetenv(xdg.CacheHomeEnvVar) - expected := filepath.Join(homedir.HomeDir(), ".cache", appName, testFile) if lazy.cachePath(testFile) != expected { t.Errorf("expected '%s', got '%s'", expected, lazy.cachePath(testFile)) } - os.Setenv(xdg.CacheHomeEnvVar, "/tmp") + t.Setenv(xdg.CacheHomeEnvVar, "/tmp") expected = filepath.Join("/tmp", appName, testFile) diff --git a/pkg/kube/ready_test.go b/pkg/kube/ready_test.go index 9d1dfd272..db0d02cbe 100644 --- a/pkg/kube/ready_test.go +++ b/pkg/kube/ready_test.go @@ -60,7 +60,7 @@ func Test_ReadyChecker_IsReady_Pod(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &corev1.Pod{}, Name: "foo", Namespace: defaultNamespace}, }, pod: newPodWithCondition("foo", corev1.ConditionTrue), @@ -75,7 +75,7 @@ func Test_ReadyChecker_IsReady_Pod(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &corev1.Pod{}, Name: "foo", Namespace: defaultNamespace}, }, pod: newPodWithCondition("bar", corev1.ConditionTrue), @@ -90,7 +90,7 @@ func Test_ReadyChecker_IsReady_Pod(t *testing.T) { checkJobs: tt.fields.checkJobs, pausedAsReady: tt.fields.pausedAsReady, } - if _, err := c.client.CoreV1().Pods(defaultNamespace).Create(context.TODO(), tt.pod, metav1.CreateOptions{}); err != nil { + if _, err := c.client.CoreV1().Pods(defaultNamespace).Create(t.Context(), tt.pod, metav1.CreateOptions{}); err != nil { t.Errorf("Failed to create Pod error: %v", err) return } @@ -132,7 +132,7 @@ func Test_ReadyChecker_IsReady_Job(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &batchv1.Job{}, Name: "foo", Namespace: defaultNamespace}, }, job: newJob("bar", 1, intToInt32(1), 1, 0), @@ -147,7 +147,7 @@ func Test_ReadyChecker_IsReady_Job(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &batchv1.Job{}, Name: "foo", Namespace: defaultNamespace}, }, job: newJob("foo", 1, intToInt32(1), 1, 0), @@ -162,7 +162,7 @@ func Test_ReadyChecker_IsReady_Job(t *testing.T) { checkJobs: tt.fields.checkJobs, pausedAsReady: tt.fields.pausedAsReady, } - if _, err := c.client.BatchV1().Jobs(defaultNamespace).Create(context.TODO(), tt.job, metav1.CreateOptions{}); err != nil { + if _, err := c.client.BatchV1().Jobs(defaultNamespace).Create(t.Context(), tt.job, metav1.CreateOptions{}); err != nil { t.Errorf("Failed to create Job error: %v", err) return } @@ -204,7 +204,7 @@ func Test_ReadyChecker_IsReady_Deployment(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &appsv1.Deployment{}, Name: "foo", Namespace: defaultNamespace}, }, replicaSet: newReplicaSet("foo", 0, 0, true), @@ -220,7 +220,7 @@ func Test_ReadyChecker_IsReady_Deployment(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &appsv1.Deployment{}, Name: "foo", Namespace: defaultNamespace}, }, replicaSet: newReplicaSet("foo", 0, 0, true), @@ -236,11 +236,11 @@ func Test_ReadyChecker_IsReady_Deployment(t *testing.T) { checkJobs: tt.fields.checkJobs, pausedAsReady: tt.fields.pausedAsReady, } - if _, err := c.client.AppsV1().Deployments(defaultNamespace).Create(context.TODO(), tt.deployment, metav1.CreateOptions{}); err != nil { + if _, err := c.client.AppsV1().Deployments(defaultNamespace).Create(t.Context(), tt.deployment, metav1.CreateOptions{}); err != nil { t.Errorf("Failed to create Deployment error: %v", err) return } - if _, err := c.client.AppsV1().ReplicaSets(defaultNamespace).Create(context.TODO(), tt.replicaSet, metav1.CreateOptions{}); err != nil { + if _, err := c.client.AppsV1().ReplicaSets(defaultNamespace).Create(t.Context(), tt.replicaSet, metav1.CreateOptions{}); err != nil { t.Errorf("Failed to create ReplicaSet error: %v", err) return } @@ -281,7 +281,7 @@ func Test_ReadyChecker_IsReady_PersistentVolumeClaim(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &corev1.PersistentVolumeClaim{}, Name: "foo", Namespace: defaultNamespace}, }, pvc: newPersistentVolumeClaim("foo", corev1.ClaimPending), @@ -296,7 +296,7 @@ func Test_ReadyChecker_IsReady_PersistentVolumeClaim(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &corev1.PersistentVolumeClaim{}, Name: "foo", Namespace: defaultNamespace}, }, pvc: newPersistentVolumeClaim("bar", corev1.ClaimPending), @@ -311,7 +311,7 @@ func Test_ReadyChecker_IsReady_PersistentVolumeClaim(t *testing.T) { checkJobs: tt.fields.checkJobs, pausedAsReady: tt.fields.pausedAsReady, } - if _, err := c.client.CoreV1().PersistentVolumeClaims(defaultNamespace).Create(context.TODO(), tt.pvc, metav1.CreateOptions{}); err != nil { + if _, err := c.client.CoreV1().PersistentVolumeClaims(defaultNamespace).Create(t.Context(), tt.pvc, metav1.CreateOptions{}); err != nil { t.Errorf("Failed to create PersistentVolumeClaim error: %v", err) return } @@ -352,7 +352,7 @@ func Test_ReadyChecker_IsReady_Service(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &corev1.Service{}, Name: "foo", Namespace: defaultNamespace}, }, svc: newService("foo", corev1.ServiceSpec{Type: corev1.ServiceTypeLoadBalancer, ClusterIP: ""}), @@ -367,7 +367,7 @@ func Test_ReadyChecker_IsReady_Service(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &corev1.Service{}, Name: "foo", Namespace: defaultNamespace}, }, svc: newService("bar", corev1.ServiceSpec{Type: corev1.ServiceTypeExternalName, ClusterIP: ""}), @@ -382,7 +382,7 @@ func Test_ReadyChecker_IsReady_Service(t *testing.T) { checkJobs: tt.fields.checkJobs, pausedAsReady: tt.fields.pausedAsReady, } - if _, err := c.client.CoreV1().Services(defaultNamespace).Create(context.TODO(), tt.svc, metav1.CreateOptions{}); err != nil { + if _, err := c.client.CoreV1().Services(defaultNamespace).Create(t.Context(), tt.svc, metav1.CreateOptions{}); err != nil { t.Errorf("Failed to create Service error: %v", err) return } @@ -423,7 +423,7 @@ func Test_ReadyChecker_IsReady_DaemonSet(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &appsv1.DaemonSet{}, Name: "foo", Namespace: defaultNamespace}, }, ds: newDaemonSet("foo", 0, 0, 1, 0, true), @@ -438,7 +438,7 @@ func Test_ReadyChecker_IsReady_DaemonSet(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &appsv1.DaemonSet{}, Name: "foo", Namespace: defaultNamespace}, }, ds: newDaemonSet("bar", 0, 1, 1, 1, true), @@ -453,7 +453,7 @@ func Test_ReadyChecker_IsReady_DaemonSet(t *testing.T) { checkJobs: tt.fields.checkJobs, pausedAsReady: tt.fields.pausedAsReady, } - if _, err := c.client.AppsV1().DaemonSets(defaultNamespace).Create(context.TODO(), tt.ds, metav1.CreateOptions{}); err != nil { + if _, err := c.client.AppsV1().DaemonSets(defaultNamespace).Create(t.Context(), tt.ds, metav1.CreateOptions{}); err != nil { t.Errorf("Failed to create DaemonSet error: %v", err) return } @@ -494,7 +494,7 @@ func Test_ReadyChecker_IsReady_StatefulSet(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &appsv1.StatefulSet{}, Name: "foo", Namespace: defaultNamespace}, }, ss: newStatefulSet("foo", 1, 0, 0, 1, true), @@ -509,7 +509,7 @@ func Test_ReadyChecker_IsReady_StatefulSet(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &appsv1.StatefulSet{}, Name: "foo", Namespace: defaultNamespace}, }, ss: newStatefulSet("bar", 1, 0, 1, 1, true), @@ -524,7 +524,7 @@ func Test_ReadyChecker_IsReady_StatefulSet(t *testing.T) { checkJobs: tt.fields.checkJobs, pausedAsReady: tt.fields.pausedAsReady, } - if _, err := c.client.AppsV1().StatefulSets(defaultNamespace).Create(context.TODO(), tt.ss, metav1.CreateOptions{}); err != nil { + if _, err := c.client.AppsV1().StatefulSets(defaultNamespace).Create(t.Context(), tt.ss, metav1.CreateOptions{}); err != nil { t.Errorf("Failed to create StatefulSet error: %v", err) return } @@ -565,7 +565,7 @@ func Test_ReadyChecker_IsReady_ReplicationController(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &corev1.ReplicationController{}, Name: "foo", Namespace: defaultNamespace}, }, rc: newReplicationController("foo", false), @@ -580,7 +580,7 @@ func Test_ReadyChecker_IsReady_ReplicationController(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &corev1.ReplicationController{}, Name: "foo", Namespace: defaultNamespace}, }, rc: newReplicationController("bar", false), @@ -595,7 +595,7 @@ func Test_ReadyChecker_IsReady_ReplicationController(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &corev1.ReplicationController{}, Name: "foo", Namespace: defaultNamespace}, }, rc: newReplicationController("foo", true), @@ -610,7 +610,7 @@ func Test_ReadyChecker_IsReady_ReplicationController(t *testing.T) { checkJobs: tt.fields.checkJobs, pausedAsReady: tt.fields.pausedAsReady, } - if _, err := c.client.CoreV1().ReplicationControllers(defaultNamespace).Create(context.TODO(), tt.rc, metav1.CreateOptions{}); err != nil { + if _, err := c.client.CoreV1().ReplicationControllers(defaultNamespace).Create(t.Context(), tt.rc, metav1.CreateOptions{}); err != nil { t.Errorf("Failed to create ReplicationController error: %v", err) return } @@ -651,7 +651,7 @@ func Test_ReadyChecker_IsReady_ReplicaSet(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &appsv1.ReplicaSet{}, Name: "foo", Namespace: defaultNamespace}, }, rs: newReplicaSet("foo", 1, 1, true), @@ -666,7 +666,7 @@ func Test_ReadyChecker_IsReady_ReplicaSet(t *testing.T) { pausedAsReady: false, }, args: args{ - ctx: context.TODO(), + ctx: t.Context(), resource: &resource.Info{Object: &appsv1.ReplicaSet{}, Name: "foo", Namespace: defaultNamespace}, }, rs: newReplicaSet("bar", 1, 1, false), @@ -1014,12 +1014,12 @@ func Test_ReadyChecker_podsReadyForObject(t *testing.T) { t.Run(tt.name, func(t *testing.T) { c := NewReadyChecker(fake.NewClientset()) for _, pod := range tt.existPods { - if _, err := c.client.CoreV1().Pods(defaultNamespace).Create(context.TODO(), &pod, metav1.CreateOptions{}); err != nil { + if _, err := c.client.CoreV1().Pods(defaultNamespace).Create(t.Context(), &pod, metav1.CreateOptions{}); err != nil { t.Errorf("Failed to create Pod error: %v", err) return } } - got, err := c.podsReadyForObject(context.TODO(), tt.args.namespace, tt.args.obj) + got, err := c.podsReadyForObject(t.Context(), tt.args.namespace, tt.args.obj) if (err != nil) != tt.wantErr { t.Errorf("podsReadyForObject() error = %v, wantErr %v", err, tt.wantErr) return diff --git a/pkg/plugin/installer/base_test.go b/pkg/plugin/installer/base_test.go index f4dd6d6be..732ac7927 100644 --- a/pkg/plugin/installer/base_test.go +++ b/pkg/plugin/installer/base_test.go @@ -14,7 +14,6 @@ limitations under the License. package installer // import "helm.sh/helm/v4/pkg/plugin/installer" import ( - "os" "testing" ) @@ -37,12 +36,11 @@ func TestPath(t *testing.T) { for _, tt := range tests { - os.Setenv("HELM_PLUGINS", tt.helmPluginsDir) + t.Setenv("HELM_PLUGINS", tt.helmPluginsDir) baseIns := newBase(tt.source) baseInsPath := baseIns.Path() if baseInsPath != tt.expectPath { t.Errorf("expected name %s, got %s", tt.expectPath, baseInsPath) } - os.Unsetenv("HELM_PLUGINS") } } diff --git a/pkg/postrender/exec_test.go b/pkg/postrender/exec_test.go index 2b091cc12..a10ad2cc4 100644 --- a/pkg/postrender/exec_test.go +++ b/pkg/postrender/exec_test.go @@ -60,11 +60,7 @@ func TestGetFullPath(t *testing.T) { t.Run("binary in PATH resolves correctly", func(t *testing.T) { testpath := setupTestingScript(t) - realPath := os.Getenv("PATH") - os.Setenv("PATH", filepath.Dir(testpath)) - defer func() { - os.Setenv("PATH", realPath) - }() + t.Setenv("PATH", filepath.Dir(testpath)) fullPath, err := getFullPath(filepath.Base(testpath)) is.NoError(err) @@ -183,7 +179,7 @@ func setupTestingScript(t *testing.T) (filepath string) { t.Fatalf("unable to write tempfile for testing: %s", err) } - err = f.Chmod(0755) + err = f.Chmod(0o755) if err != nil { t.Fatalf("unable to make tempfile executable for testing: %s", err) } diff --git a/pkg/provenance/sign_test.go b/pkg/provenance/sign_test.go index 69a6dad5b..9a60fd19c 100644 --- a/pkg/provenance/sign_test.go +++ b/pkg/provenance/sign_test.go @@ -276,7 +276,7 @@ func TestDecodeSignature(t *testing.T) { t.Fatal(err) } - f, err := os.CreateTemp("", "helm-test-sig-") + f, err := os.CreateTemp(t.TempDir(), "helm-test-sig-") if err != nil { t.Fatal(err) } diff --git a/pkg/registry/client_test.go b/pkg/registry/client_test.go index 8fc392336..2ffd691c2 100644 --- a/pkg/registry/client_test.go +++ b/pkg/registry/client_test.go @@ -17,7 +17,6 @@ limitations under the License. package registry import ( - "context" "io" "testing" @@ -31,7 +30,7 @@ import ( func TestTagManifestTransformsReferences(t *testing.T) { memStore := memory.New() client := &Client{out: io.Discard} - ctx := context.Background() + ctx := t.Context() refWithPlus := "test-registry.io/charts/test:1.0.0+metadata" expectedRef := "test-registry.io/charts/test:1.0.0_metadata" // + becomes _ diff --git a/pkg/repo/chartrepo_test.go b/pkg/repo/chartrepo_test.go index bc15560c9..05e034dd8 100644 --- a/pkg/repo/chartrepo_test.go +++ b/pkg/repo/chartrepo_test.go @@ -70,7 +70,7 @@ func TestIndexCustomSchemeDownload(t *testing.T) { } repo.CachePath = t.TempDir() - tempIndexFile, err := os.CreateTemp("", "test-repo") + tempIndexFile, err := os.CreateTemp(t.TempDir(), "test-repo") if err != nil { t.Fatalf("Failed to create temp index file: %v", err) } diff --git a/pkg/repo/repo_test.go b/pkg/repo/repo_test.go index c2087ebbe..bdaa61eda 100644 --- a/pkg/repo/repo_test.go +++ b/pkg/repo/repo_test.go @@ -197,7 +197,7 @@ func TestWriteFile(t *testing.T) { }, ) - file, err := os.CreateTemp("", "helm-repo") + file, err := os.CreateTemp(t.TempDir(), "helm-repo") if err != nil { t.Errorf("failed to create test-file (%v)", err) } diff --git a/pkg/repo/repotest/server.go b/pkg/repo/repotest/server.go index b366572d8..ea9d5290c 100644 --- a/pkg/repo/repotest/server.go +++ b/pkg/repo/repotest/server.go @@ -16,7 +16,6 @@ limitations under the License. package repotest import ( - "context" "crypto/tls" "fmt" "net/http" @@ -91,10 +90,7 @@ type Server struct { // The temp dir will be removed by testing package automatically when test finished. func NewTempServer(t *testing.T, options ...ServerOption) *Server { t.Helper() - docrootTempDir, err := os.MkdirTemp("", "helm-repotest-") - if err != nil { - t.Fatal(err) - } + docrootTempDir := t.TempDir() srv := newServer(t, docrootTempDir, options...) @@ -173,7 +169,7 @@ func NewOCIServer(t *testing.T, dir string) (*OCIServer, error) { t.Fatal("error generating bcrypt password for test htpasswd file") } htpasswdPath := filepath.Join(dir, testHtpasswdFileBasename) - err = os.WriteFile(htpasswdPath, []byte(fmt.Sprintf("%s:%s\n", testUsername, string(pwBytes))), 0644) + err = os.WriteFile(htpasswdPath, []byte(fmt.Sprintf("%s:%s\n", testUsername, string(pwBytes))), 0o644) if err != nil { t.Fatalf("error creating test htpasswd file") } @@ -197,7 +193,7 @@ func NewOCIServer(t *testing.T, dir string) (*OCIServer, error) { registryURL := fmt.Sprintf("localhost:%d", port) - r, err := registry.NewRegistry(context.Background(), config) + r, err := registry.NewRegistry(t.Context(), config) if err != nil { t.Fatal(err) } @@ -331,7 +327,7 @@ func (s *Server) CopyCharts(origin string) ([]string, error) { if err != nil { return []string{}, err } - if err := os.WriteFile(newname, data, 0644); err != nil { + if err := os.WriteFile(newname, data, 0o644); err != nil { return []string{}, err } copied[i] = newname @@ -355,7 +351,7 @@ func (s *Server) CreateIndex() error { } ifile := filepath.Join(s.docroot, "index.yaml") - return os.WriteFile(ifile, d, 0644) + return os.WriteFile(ifile, d, 0o644) } func (s *Server) start() { @@ -407,5 +403,5 @@ func setTestingRepository(url, fname string) error { Name: "test", URL: url, }) - return r.WriteFile(fname, 0640) + return r.WriteFile(fname, 0o640) } From a8cbf3aa51d98bf75e3f437e84eb084d5370bf16 Mon Sep 17 00:00:00 2001 From: Terry Howe Date: Tue, 27 May 2025 11:40:46 -0600 Subject: [PATCH 68/77] fix: action hooks delete policy mutex Signed-off-by: Terry Howe --- pkg/action/action.go | 3 +++ pkg/action/hooks.go | 28 +++++++++++++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/pkg/action/action.go b/pkg/action/action.go index 6905f3f44..40194dfd7 100644 --- a/pkg/action/action.go +++ b/pkg/action/action.go @@ -26,6 +26,7 @@ import ( "path" "path/filepath" "strings" + "sync" "text/template" "k8s.io/apimachinery/pkg/api/meta" @@ -86,6 +87,8 @@ type Configuration struct { // HookOutputFunc called with container name and returns and expects writer that will receive the log output. HookOutputFunc func(namespace, pod, container string) io.Writer + + mutex sync.Mutex } // renderResources renders the templates in a chart diff --git a/pkg/action/hooks.go b/pkg/action/hooks.go index 591371e44..7f265797b 100644 --- a/pkg/action/hooks.go +++ b/pkg/action/hooks.go @@ -49,13 +49,7 @@ func (cfg *Configuration) execHook(rl *release.Release, hook release.HookEvent, for i, h := range executingHooks { // Set default delete policy to before-hook-creation - if len(h.DeletePolicies) == 0 { - // TODO(jlegrone): Only apply before-hook-creation delete policy to run to completion - // resources. For all other resource types update in place if a - // resource with the same name already exists and is owned by the - // current release. - h.DeletePolicies = []release.HookDeletePolicy{release.HookBeforeHookCreation} - } + cfg.hookSetDeletePolicy(h) if err := cfg.deleteHookByPolicy(h, release.HookBeforeHookCreation, waitStrategy, timeout); err != nil { return err @@ -154,7 +148,7 @@ func (cfg *Configuration) deleteHookByPolicy(h *release.Hook, policy release.Hoo if h.Kind == "CustomResourceDefinition" { return nil } - if hookHasDeletePolicy(h, policy) { + if cfg.hookHasDeletePolicy(h, policy) { resources, err := cfg.KubeClient.Build(bytes.NewBufferString(h.Manifest), false) if err != nil { return fmt.Errorf("unable to build kubernetes object for deleting hook %s: %w", h.Path, err) @@ -188,10 +182,26 @@ func (cfg *Configuration) deleteHooksByPolicy(hooks []*release.Hook, policy rele // hookHasDeletePolicy determines whether the defined hook deletion policy matches the hook deletion polices // supported by helm. If so, mark the hook as one should be deleted. -func hookHasDeletePolicy(h *release.Hook, policy release.HookDeletePolicy) bool { +func (cfg *Configuration) hookHasDeletePolicy(h *release.Hook, policy release.HookDeletePolicy) bool { + cfg.mutex.Lock() + defer cfg.mutex.Unlock() return slices.Contains(h.DeletePolicies, policy) } +// hookClearDeletePolicy determines whether the defined hook deletion policy matches the hook deletion polices +// supported by helm. If so, mark the hook as one should be deleted. +func (cfg *Configuration) hookSetDeletePolicy(h *release.Hook) { + cfg.mutex.Lock() + defer cfg.mutex.Unlock() + if len(h.DeletePolicies) == 0 { + // TODO(jlegrone): Only apply before-hook-creation delete policy to run to completion + // resources. For all other resource types update in place if a + // resource with the same name already exists and is owned by the + // current release. + h.DeletePolicies = []release.HookDeletePolicy{release.HookBeforeHookCreation} + } +} + // outputLogsByPolicy outputs a pods logs if the hook policy instructs it to func (cfg *Configuration) outputLogsByPolicy(h *release.Hook, releaseNamespace string, policy release.HookOutputLogPolicy) error { if !hookHasOutputLogPolicy(h, policy) { From 8706c441c4e9e3b3005b280e14500a351cc9d5df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 May 2025 21:34:15 +0000 Subject: [PATCH 69/77] build(deps): bump ossf/scorecard-action from 2.4.1 to 2.4.2 Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.1 to 2.4.2. - [Release notes](https://github.com/ossf/scorecard-action/releases) - [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md) - [Commits](https://github.com/ossf/scorecard-action/compare/f49aabe0b5af0936a0987cfb85d86b75731b0186...05b42c624433fc40578a4040d5cf5e36ddca8cde) --- updated-dependencies: - dependency-name: ossf/scorecard-action dependency-version: 2.4.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index a8c2e8a15..4b135bb2a 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -33,7 +33,7 @@ jobs: persist-credentials: false - name: "Run analysis" - uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1 + uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2 with: results_file: results.sarif results_format: sarif From f8204031f1b557bc2372f498487de654b7f544a4 Mon Sep 17 00:00:00 2001 From: Carlos Lima Date: Wed, 4 Jun 2025 08:40:05 +0800 Subject: [PATCH 70/77] Fix tests deleting XDG_DATA_HOME That includes ~/.local/share/keyrings which was the most immediatelly visible effect. Signed-off-by: Carlos Lima --- pkg/plugin/installer/local_installer_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/plugin/installer/local_installer_test.go b/pkg/plugin/installer/local_installer_test.go index b28920af4..9effcd2c4 100644 --- a/pkg/plugin/installer/local_installer_test.go +++ b/pkg/plugin/installer/local_installer_test.go @@ -20,12 +20,14 @@ import ( "path/filepath" "testing" + "helm.sh/helm/v4/internal/test/ensure" "helm.sh/helm/v4/pkg/helmpath" ) var _ Installer = new(LocalInstaller) func TestLocalInstaller(t *testing.T) { + ensure.HelmHome(t) // Make a temp dir tdir := t.TempDir() if err := os.WriteFile(filepath.Join(tdir, "plugin.yaml"), []byte{}, 0644); err != nil { From 9623fb80f1fe8ec782cd873902913d32b7daab36 Mon Sep 17 00:00:00 2001 From: acceptacross Date: Wed, 4 Jun 2025 23:54:30 +0800 Subject: [PATCH 71/77] chore: fix some function names in comment Signed-off-by: acceptacross --- pkg/action/hooks.go | 2 +- pkg/chart/v2/util/chartfile.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/action/hooks.go b/pkg/action/hooks.go index 7f265797b..1213e87e2 100644 --- a/pkg/action/hooks.go +++ b/pkg/action/hooks.go @@ -188,7 +188,7 @@ func (cfg *Configuration) hookHasDeletePolicy(h *release.Hook, policy release.Ho return slices.Contains(h.DeletePolicies, policy) } -// hookClearDeletePolicy determines whether the defined hook deletion policy matches the hook deletion polices +// hookSetDeletePolicy determines whether the defined hook deletion policy matches the hook deletion polices // supported by helm. If so, mark the hook as one should be deleted. func (cfg *Configuration) hookSetDeletePolicy(h *release.Hook) { cfg.mutex.Lock() diff --git a/pkg/chart/v2/util/chartfile.go b/pkg/chart/v2/util/chartfile.go index 6748c6a91..1f9c712b2 100644 --- a/pkg/chart/v2/util/chartfile.go +++ b/pkg/chart/v2/util/chartfile.go @@ -39,7 +39,7 @@ func LoadChartfile(filename string) (*chart.Metadata, error) { return y, err } -// StrictLoadChartFile loads a Chart.yaml into a *chart.Metadata using a strict unmarshaling +// StrictLoadChartfile loads a Chart.yaml into a *chart.Metadata using a strict unmarshaling func StrictLoadChartfile(filename string) (*chart.Metadata, error) { b, err := os.ReadFile(filename) if err != nil { From fee9907a801e1ab904f447f955b94b558c895d8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Jun 2025 21:58:39 +0000 Subject: [PATCH 72/77] build(deps): bump golang.org/x/text from 0.25.0 to 0.26.0 Bumps [golang.org/x/text](https://github.com/golang/text) from 0.25.0 to 0.26.0. - [Release notes](https://github.com/golang/text/releases) - [Commits](https://github.com/golang/text/compare/v0.25.0...v0.26.0) --- updated-dependencies: - dependency-name: golang.org/x/text dependency-version: 0.26.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index f08dfc7a1..eab1612e9 100644 --- a/go.mod +++ b/go.mod @@ -33,7 +33,7 @@ require ( github.com/stretchr/testify v1.10.0 golang.org/x/crypto v0.38.0 golang.org/x/term v0.32.0 - golang.org/x/text v0.25.0 + golang.org/x/text v0.26.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.33.1 k8s.io/apiextensions-apiserver v0.33.1 @@ -154,13 +154,13 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect go.opentelemetry.io/otel/trace v1.34.0 // indirect go.opentelemetry.io/proto/otlp v1.4.0 // indirect - golang.org/x/mod v0.24.0 // indirect - golang.org/x/net v0.39.0 // indirect + golang.org/x/mod v0.25.0 // indirect + golang.org/x/net v0.40.0 // indirect golang.org/x/oauth2 v0.29.0 // indirect - golang.org/x/sync v0.14.0 // indirect + golang.org/x/sync v0.15.0 // indirect golang.org/x/sys v0.33.0 // indirect golang.org/x/time v0.11.0 // indirect - golang.org/x/tools v0.32.0 // indirect + golang.org/x/tools v0.33.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect google.golang.org/grpc v1.68.1 // indirect diff --git a/go.sum b/go.sum index 7fd86290d..1101b2582 100644 --- a/go.sum +++ b/go.sum @@ -392,8 +392,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= -golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= +golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w= +golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -407,8 +407,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= -golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= -golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= +golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= +golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98= golang.org/x/oauth2 v0.29.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -421,8 +421,8 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= -golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8= +golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -462,8 +462,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= -golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= +golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -474,8 +474,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= -golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU= -golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s= +golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= +golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 93ec064640867f2642a293732ffb9b5f4602eb18 Mon Sep 17 00:00:00 2001 From: Terry Howe Date: Tue, 27 May 2025 11:39:35 -0600 Subject: [PATCH 73/77] fix: repo update cmd mutex Signed-off-by: Terry Howe --- pkg/cmd/repo_update.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/cmd/repo_update.go b/pkg/cmd/repo_update.go index 9f4a603ae..6547446f0 100644 --- a/pkg/cmd/repo_update.go +++ b/pkg/cmd/repo_update.go @@ -113,14 +113,19 @@ func updateCharts(repos []*repo.ChartRepository, out io.Writer) error { var wg sync.WaitGroup failRepoURLChan := make(chan string, len(repos)) + writeMutex := sync.Mutex{} for _, re := range repos { wg.Add(1) go func(re *repo.ChartRepository) { defer wg.Done() if _, err := re.DownloadIndexFile(); err != nil { + writeMutex.Lock() + defer writeMutex.Unlock() fmt.Fprintf(out, "...Unable to get an update from the %q chart repository (%s):\n\t%s\n", re.Config.Name, re.Config.URL, err) failRepoURLChan <- re.Config.URL } else { + writeMutex.Lock() + defer writeMutex.Unlock() fmt.Fprintf(out, "...Successfully got an update from the %q chart repository\n", re.Config.Name) } }(re) From b250b1de82e4d0381eabb1ddacb559d9c75a0d7a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 17:37:49 +0000 Subject: [PATCH 74/77] build(deps): bump golang.org/x/crypto from 0.38.0 to 0.39.0 Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.38.0 to 0.39.0. - [Commits](https://github.com/golang/crypto/compare/v0.38.0...v0.39.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.39.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index eab1612e9..66de5f821 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/spf13/cobra v1.9.1 github.com/spf13/pflag v1.0.6 github.com/stretchr/testify v1.10.0 - golang.org/x/crypto v0.38.0 + golang.org/x/crypto v0.39.0 golang.org/x/term v0.32.0 golang.org/x/text v0.26.0 gopkg.in/yaml.v3 v3.0.1 diff --git a/go.sum b/go.sum index 1101b2582..29ce847c9 100644 --- a/go.sum +++ b/go.sum @@ -384,8 +384,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g= -golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= -golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= +golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM= +golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= From 744c6b5a97320b0adc596c8d3817b58d325edc2f Mon Sep 17 00:00:00 2001 From: Terry Howe Date: Tue, 27 May 2025 11:44:20 -0600 Subject: [PATCH 75/77] fix: kube client create mutex Signed-off-by: Terry Howe --- pkg/kube/client.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/kube/client.go b/pkg/kube/client.go index 9bbd4d9ba..78ed4e088 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -585,10 +585,14 @@ func batchPerform(infos ResourceList, fn func(*resource.Info) error, errs chan<- } } +var createMutex sync.Mutex + func createResource(info *resource.Info) error { return retry.RetryOnConflict( retry.DefaultRetry, func() error { + createMutex.Lock() + defer createMutex.Unlock() obj, err := resource.NewHelper(info.Client, info.Mapping).WithFieldManager(getManagedFieldsManager()).Create(info.Namespace, true, info.Object) if err != nil { return err From bc44614a78e160ce60822f7b7769af4f6f15d830 Mon Sep 17 00:00:00 2001 From: manslaughter03 Date: Wed, 11 Jun 2025 00:15:26 +0200 Subject: [PATCH 76/77] fix: wrap run release test error in case GetPodLogs failed. Signed-off-by: manslaughter03 --- pkg/cmd/release_testing.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/cmd/release_testing.go b/pkg/cmd/release_testing.go index 4904aa9f1..1dac28534 100644 --- a/pkg/cmd/release_testing.go +++ b/pkg/cmd/release_testing.go @@ -17,6 +17,7 @@ limitations under the License. package cmd import ( + "errors" "fmt" "io" "regexp" @@ -85,7 +86,7 @@ func newReleaseTestCmd(cfg *action.Configuration, out io.Writer) *cobra.Command // Print a newline to stdout to separate the output fmt.Fprintln(out) if err := client.GetPodLogs(out, rel); err != nil { - return err + return errors.Join(runErr, err) } } From df482346db851f31f127e2ef3455d816cca28b91 Mon Sep 17 00:00:00 2001 From: Terry Howe Date: Sun, 15 Jun 2025 08:50:39 -0600 Subject: [PATCH 77/77] fix: lint test SetEnv errors Signed-off-by: Terry Howe --- pkg/helmpath/lazypath_darwin_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/helmpath/lazypath_darwin_test.go b/pkg/helmpath/lazypath_darwin_test.go index e04e20756..e3006d0d5 100644 --- a/pkg/helmpath/lazypath_darwin_test.go +++ b/pkg/helmpath/lazypath_darwin_test.go @@ -40,7 +40,7 @@ func TestDataPath(t *testing.T) { t.Errorf("expected '%s', got '%s'", expected, lazy.dataPath(testFile)) } - os.Setenv(xdg.DataHomeEnvVar, "/tmp") + t.Setenv(xdg.DataHomeEnvVar, "/tmp") expected = filepath.Join("/tmp", appName, testFile) @@ -58,7 +58,7 @@ func TestConfigPath(t *testing.T) { t.Errorf("expected '%s', got '%s'", expected, lazy.configPath(testFile)) } - os.Setenv(xdg.ConfigHomeEnvVar, "/tmp") + t.Setenv(xdg.ConfigHomeEnvVar, "/tmp") expected = filepath.Join("/tmp", appName, testFile) @@ -76,7 +76,7 @@ func TestCachePath(t *testing.T) { t.Errorf("expected '%s', got '%s'", expected, lazy.cachePath(testFile)) } - os.Setenv(xdg.CacheHomeEnvVar, "/tmp") + t.Setenv(xdg.CacheHomeEnvVar, "/tmp") expected = filepath.Join("/tmp", appName, testFile)