ignore healthCommands, those go via healthcheck anyway

Author: Crow-Control

pkg/containertest/yaml_runner.go

@@ -18,7 +18,6 @@ var (
 	checkHealthFn           = CheckHealth
 	checkWaitsFn            = CheckWaits
 	checkFilesExistFn       = CheckFilesExist
-	checkHealthCommandsFn   = CheckHealthCommands
 	checkStandardRunFn      = CheckStandardRun
 	checkRunnerOutputFn     = CheckRunnerOutput
 )
@@ -149,7 +148,7 @@ func buildRunnerContainerConfig(runner RunnerConfig, base *ContainerConfig, yaml
 // For each runner:
 //   - If expectedOutput is non-empty, an output check is performed first.
 //   - If runTests is true (the default when omitted), the normal check sequence follows:
-//     health (when tcp/http/healthCommands are configured) → file → tcp/http waits → healthCommands → standardRun.
+//     health (when tcp/http are configured) → file → tcp/http waits → standardRun.
 //   - If runTests is explicitly false, health/file/wait/health-command checks are skipped,
 //     but a standard container run is still performed for that runner.
 //
@@ -161,13 +160,7 @@ func RunChecksFromYAML(ctx context.Context, image string, yamlPath string, conta
 		return err
 	}
 
-	logInfo("Loaded container test YAML: path=%s runners=%d http=%d tcp=%d healthCommands=%d", yamlPath, len(config.Runners), len(config.HTTP), len(config.TCP), len(config.HealthCommands))
-
-	for index, command := range config.HealthCommands {
-		if strings.TrimSpace(command.Command) == "" {
-			return fmt.Errorf("healthCommands[%d].command must not be empty", index)
-		}
-	}
+	logInfo("Loaded container test YAML: path=%s runners=%d http=%d tcp=%d", yamlPath, len(config.Runners), len(config.HTTP), len(config.TCP))
 
 	for index, mount := range config.Mounts {
 		trimmedPath := strings.TrimSpace(mount.Path)
@@ -186,7 +179,7 @@ func RunChecksFromYAML(ctx context.Context, image string, yamlPath string, conta
 		runners = []RunnerConfig{{}}
 	}
 
-	hasHealthCheckPreconditions := len(config.HTTP) > 0 || len(config.TCP) > 0 || len(config.HealthCommands) > 0
+	hasHealthCheckPreconditions := len(config.HTTP) > 0 || len(config.TCP) > 0
 
 	for i, runner := range runners {
 		runnerFilePath := strings.TrimSpace(runner.FilePath)
@@ -244,14 +237,14 @@ func RunChecksFromYAML(ctx context.Context, image string, yamlPath string, conta
 			continue
 		}
 
-		// Normal check sequence: health (when tcp/http/healthCommands are configured) → file → tcp/http waits → healthCommands → standardRun.
+		// Normal check sequence: health (when tcp/http are configured) → file → tcp/http waits → standardRun.
 		if hasHealthCheckPreconditions {
 			logInfo("Runner[%d]: running health check", i)
 			if err := checkHealthFn(healthCtx, image, runnerCfg); err != nil {
 				return err
 			}
 		} else {
-			logInfo("Runner[%d]: skipping health check (no tcp/http/healthCommands configured)", i)
+			logInfo("Runner[%d]: skipping health check (no tcp/http configured)", i)
 		}
 
 		if runnerFilePath != "" {
@@ -268,13 +261,6 @@ func RunChecksFromYAML(ctx context.Context, image string, yamlPath string, conta
 			}
 		}
 
-		if len(config.HealthCommands) > 0 {
-			logInfo("Runner[%d]: running health commands (%d)", i, len(config.HealthCommands))
-			if err := checkHealthCommandsFn(runnerCtx, image, runnerCfg, config.HealthCommands); err != nil {
-				return err
-			}
-		}
-
 		logInfo("Runner[%d]: running standard run check", i)
 		if err := checkStandardRunFn(runnerCtx, image, runnerCfg); err != nil {
 			return err

pkg/containertest/yaml_runner_test.go

@@ -20,15 +20,13 @@ func setYAMLRunnerSeams(t *testing.T) {
 	oldHealth := checkHealthFn
 	oldWaits := checkWaitsFn
 	oldFiles := checkFilesExistFn
-	oldHealthCommands := checkHealthCommandsFn
 	oldStandardRun := checkStandardRunFn
 	oldRunnerOutput := checkRunnerOutputFn
 	t.Cleanup(func() {
 		loadContainerTestYAMLFn = oldLoad
 		checkHealthFn = oldHealth
 		checkWaitsFn = oldWaits
 		checkFilesExistFn = oldFiles
-		checkHealthCommandsFn = oldHealthCommands
 		checkStandardRunFn = oldStandardRun
 		checkRunnerOutputFn = oldRunnerOutput
 	})
@@ -157,13 +155,6 @@ func TestRunChecksFromYAMLValidationAndErrors(t *testing.T) {
 		t.Fatalf("expected standard run error")
 	}
 
-	loadContainerTestYAMLFn = func(string) (ContainerTestYAML, error) {
-		return ContainerTestYAML{HealthCommands: []HealthCommandTestConfig{{Command: " "}}}, nil
-	}
-	if err := RunChecksFromYAML(ctx, "img", "cfg.yaml", nil); err == nil || !strings.Contains(err.Error(), "healthCommands[0].command") {
-		t.Fatalf("expected health command validation error, got %v", err)
-	}
-
 	loadContainerTestYAMLFn = func(string) (ContainerTestYAML, error) {
 		return ContainerTestYAML{Runners: []RunnerConfig{{FilePath: " "}}}, nil
 	}
@@ -205,14 +196,23 @@ func TestRunChecksFromYAMLValidationAndErrors(t *testing.T) {
 	}
 
 	loadContainerTestYAMLFn = func(string) (ContainerTestYAML, error) {
-		return ContainerTestYAML{HealthCommands: []HealthCommandTestConfig{{Command: "mycommand"}}}, nil
+		return ContainerTestYAML{HealthCommands: []HealthCommandTestConfig{{Command: " "}}}, nil
 	}
-	checkFilesExistFn = CheckFilesExist
-	checkHealthCommandsFn = func(context.Context, string, *ContainerConfig, []HealthCommandTestConfig) error {
-		return errors.New("health commands boom")
+	checkFilesExistFn = func(context.Context, string, []string, *ContainerConfig) error {
+		t.Fatalf("did not expect file checks")
+		return nil
 	}
-	if err := RunChecksFromYAML(ctx, "img", "cfg.yaml", nil); err == nil {
-		t.Fatalf("expected health commands error")
+	checkWaitsFn = func(context.Context, string, []HTTPTestConfig, []TCPTestConfig, *ContainerConfig) error {
+		t.Fatalf("did not expect wait checks")
+		return nil
+	}
+	checkHealthFn = func(context.Context, string, *ContainerConfig) error {
+		t.Fatalf("did not expect health check")
+		return nil
+	}
+	checkStandardRunFn = func(context.Context, string, *ContainerConfig) error { return nil }
+	if err := RunChecksFromYAML(ctx, "img", "cfg.yaml", nil); err != nil {
+		t.Fatalf("expected healthCommands to be ignored, got %v", err)
 	}
 }
 
@@ -289,7 +289,6 @@ func TestRunChecksFromYAMLCallsAllCheckTypes(t *testing.T) {
 	calledHealth := 0
 	calledWaits := 0
 	calledFiles := 0
-	calledHealthCommands := 0
 	calledStandardRun := 0
 
 	loadContainerTestYAMLFn = func(string) (ContainerTestYAML, error) {
@@ -300,7 +299,6 @@ func TestRunChecksFromYAMLCallsAllCheckTypes(t *testing.T) {
 				TimeoutSeconds: 1,
 				FilePath:       "/etc/hosts",
 			}},
-			HealthCommands: []HealthCommandTestConfig{{Command: "mycommand", ExpectedExitCode: intPtr(7), ExpectedContent: "ok", MatchContent: true}},
 		}, nil
 	}
 
@@ -329,11 +327,6 @@ func TestRunChecksFromYAMLCallsAllCheckTypes(t *testing.T) {
 		callOrder = append(callOrder, "files")
 		return nil
 	}
-	checkHealthCommandsFn = func(context.Context, string, *ContainerConfig, []HealthCommandTestConfig) error {
-		calledHealthCommands++
-		callOrder = append(callOrder, "healthCommands")
-		return nil
-	}
 	checkStandardRunFn = func(context.Context, string, *ContainerConfig) error {
 		calledStandardRun++
 		return nil
@@ -343,13 +336,13 @@ func TestRunChecksFromYAMLCallsAllCheckTypes(t *testing.T) {
 		t.Fatalf("unexpected run error: %v", err)
 	}
 
-	if calledHealth != 1 || calledWaits != 1 || calledFiles != 1 || calledHealthCommands != 1 || calledStandardRun != 1 {
-		t.Fatalf("expected all checks once, got health=%d waits=%d files=%d healthCommands=%d standardRun=%d", calledHealth, calledWaits, calledFiles, calledHealthCommands, calledStandardRun)
+	if calledHealth != 1 || calledWaits != 1 || calledFiles != 1 || calledStandardRun != 1 {
+		t.Fatalf("expected all checks once, got health=%d waits=%d files=%d standardRun=%d", calledHealth, calledWaits, calledFiles, calledStandardRun)
 	}
 
-	// New order: health → files → waits → healthCommands
-	if len(callOrder) < 4 || callOrder[0] != "health" || callOrder[1] != "files" || callOrder[2] != "waits" || callOrder[3] != "healthCommands" {
-		t.Fatalf("expected health→files→waits→healthCommands call order, got %v", callOrder)
+	// New order: health → files → waits
+	if len(callOrder) < 3 || callOrder[0] != "health" || callOrder[1] != "files" || callOrder[2] != "waits" {
+		t.Fatalf("expected health→files→waits call order, got %v", callOrder)
 	}
 }