Skip to content

fix(chartvalidator): fixed error handling bug #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bosbaber merged 1 commit into from
Dec 12, 2025
Merged

fix(chartvalidator): fixed error handling bug #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion chartvalidator/checker/engine_app_checker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func NewAppCheckerEngine(context context.Context, outputDir string, apiVersions
return &AppCheckerEngine{
inputChan: make(chan AppCheckInstruction),
resultChan: make(chan AppCheckResult),
errorChan: make(chan ErrorResult),
errorChan: errorChan,

context: context,
executor: &RealCommandExecutor{},
Expand Down Expand Up @@ -120,11 +120,15 @@ func (engine *AppCheckerEngine) Start(workerCount int) {
engine.ImageExtractionEngine.Start(workerCount)
engine.DockerValidationEngine.Start(workerCount)

go engine.closeErrorChanWhenEnginesDone()

// Pour the input instructions into the chart renderer
engine.workerWaitGroup.Add(1)
go engine.pumpAppCheckInstructionsToChartRenderer()
engine.workerWaitGroup.Add(1)
go engine.pumpOutputsToAppCheckResults()
engine.workerWaitGroup.Add(1)
go engine.pumpErrorsToAppCheckResults()

go engine.allDoneWorker()
}
Expand Down Expand Up @@ -154,10 +158,31 @@ func (engine *AppCheckerEngine) pumpOutputsToAppCheckResults() {
logEngineDebug(engine.name, -1, "docker validation output closed")
}

func (engine *AppCheckerEngine) pumpErrorsToAppCheckResults() {
defer engine.workerWaitGroup.Done()
for errResult := range engine.errorChan {
engine.resultChan <- AppCheckResult{
Chart: errResult.Chart,
Image: "",
Error: errResult.Error,
}
}
logEngineDebug(engine.name, -1, "error channel closed")
}

func (engine *AppCheckerEngine) pumpAppCheckInstructionsToChartRenderer() {
defer engine.workerWaitGroup.Done()
for instruction := range engine.inputChan {
engine.ChartRenderingEngine.inputChan <- instruction.Chart
}
close(engine.ChartRenderingEngine.inputChan)
}

func (engine *AppCheckerEngine) closeErrorChanWhenEnginesDone() {
engine.ChartRenderingEngine.workerWaitGroup.Wait()
engine.ManifestValidationEngine.workerWaitGroup.Wait()
engine.ImageExtractionEngine.workerWaitGroup.Wait()
engine.DockerValidationEngine.workerWaitGroup.Wait()
logEngineDebug(engine.name, -1, "all child engines done, closing error channel")
close(engine.errorChan)
}
74 changes: 74 additions & 0 deletions chartvalidator/checker/engine_app_checker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
package main

import (
"context"
"fmt"
"testing"
"time"

"github.com/stretchr/testify/assert"
)

func TestAppCheckerEnginePropagatesRenderErrors(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

outputDir := t.TempDir()

engine := NewAppCheckerEngine(ctx, outputDir, nil)

mockExecutor := createMockExecutor()
mockExecutor.Error = fmt.Errorf("helm exploded")
mockExecutor.Output = []byte("nope")
mockExecutor.FileExistsMap = map[string]bool{
"values.yaml": true,
"override.yaml": true,
}

engine.ChartRenderingEngine.executor = mockExecutor

engine.Start(1)

testChart := ChartRenderParams{
Env: "test",
ChartName: "chart",
RepoURL: "https://example.com/charts",
ChartVersion: "1.0.0",
BaseValuesFile: "values.yaml",
ValuesOverride: "override.yaml",
}

go func() {
engine.inputChan <- AppCheckInstruction{Chart: testChart}
close(engine.inputChan)
}()

var (
result AppCheckResult
ok bool
)

select {
case result, ok = <-engine.resultChan:
if !ok {
t.Fatalf("result channel closed before emitting result")
}
case <-time.After(2 * time.Second):
t.Fatalf("timeout waiting for app checker result (possible deadlock)")
}

assert.Equal(t, testChart.ChartName, result.Chart.ChartName)
assert.Error(t, result.Error)
if result.Error != nil {
assert.Contains(t, result.Error.Error(), "helm command failed")
}

select {
case _, ok = <-engine.resultChan:
if ok {
t.Fatalf("expected result channel to close after delivering error result")
}
case <-time.After(2 * time.Second):
t.Fatalf("timeout waiting for result channel to close")
}
}