fix: return correct error on diagaction ctx deadline exceeded (#5417)

kruskall · web-flow · commit cdff3784f567 · 2024-09-04T23:06:59.000+02:00
swap errors.Is arg
diff --git a/pkg/component/runtime/manager.go b/pkg/component/runtime/manager.go
@@ -1058,7 +1058,7 @@ func (m *Manager) performDiagAction(ctx context.Context, comp component.Componen
 	res, err := runtime.performAction(ctx, req)
 	// the only way this can return an error is a context Done(), be sure to make that explicit.
 	if err != nil {
-		if errors.Is(context.DeadlineExceeded, err) {
+		if errors.Is(err, context.DeadlineExceeded) {
 			return nil, fmt.Errorf("diagnostic action timed out, deadline is %s: %w", finalDiagnosticTime, err)
 		}
 		return nil, fmt.Errorf("error running performAction: %w", err)

Original file line number	Diff line number	Diff line change
`@@ -1058,7 +1058,7 @@ func (m *Manager) performDiagAction(ctx context.Context, comp component.Componen`
`1058`	`1058`	`res, err := runtime.performAction(ctx, req)`
`1059`	`1059`	`// the only way this can return an error is a context Done(), be sure to make that explicit.`
`1060`	`1060`	`if err != nil {`
`1061`		`- if errors.Is(context.DeadlineExceeded, err) {`
	`1061`	`+ if errors.Is(err, context.DeadlineExceeded) {`
`1062`	`1062`	`return nil, fmt.Errorf("diagnostic action timed out, deadline is %s: %w", finalDiagnosticTime, err)`
`1063`	`1063`	`}`
`1064`	`1064`	`return nil, fmt.Errorf("error running performAction: %w", err)`