Skip to content

[VC-35738] Append errgroup errors to the error returned by Agent.Run #606

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
wallrj merged 2 commits into from
Nov 7, 2024
Merged

[VC-35738] Append errgroup errors to the error returned by Agent.Run #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc1b8a0
Fail TestRunOneShot if Run returns errors
wallrj Nov 6, 2024
53474d1
Append errgroup errors to Run return error
wallrj Nov 6, 2024
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
6 changes: 3 additions & 3 deletions pkg/agent/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var Flags AgentCmdFlags
const schemaVersion string = "v2.0.0"

// Run starts the agent process
func Run(cmd *cobra.Command, args []string) error {
func Run(cmd *cobra.Command, args []string) (returnErr error) {
logs.Log.Printf("Preflight agent version: %s (%s)", version.PreflightVersion, version.Commit)
ctx, cancel := context.WithCancel(
klog.NewContext(
Expand Down Expand Up @@ -85,8 +85,8 @@ func Run(cmd *cobra.Command, args []string) error {
defer func() {
cancel()
if groupErr := group.Wait(); groupErr != nil {
err = multierror.Append(
err,
returnErr = multierror.Append(
returnErr,
fmt.Errorf("failed to wait for controller-runtime component to stop: %v", groupErr),
)
}
Expand Down
7 changes: 5 additions & 2 deletions pkg/agent/run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@ func TestRunOneShot(t *testing.T) {
require.NoError(t, err)

logs.Initialize()
Run(c, nil)
klog.Flush()
defer klog.Flush()

runErr := Run(c, nil)
require.NoError(t, runErr, "Run returned an unexpected error")

return
}
t.Log("Running child process")
Expand Down