Skip to content

fix(tunnel): surface agent command failure instead of masking it #646

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

Draft
skevetter wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(tunnel): surface agent command failure instead of masking it #646

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
3 changes: 3 additions & 0 deletions pkg/tunnel/connerror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ func IsEOF(err error) bool {

func ClassifyTunnelErrors(tunnelErr, handlerErr error) error {
if handlerErr == nil {
if ClassifyError(tunnelErr) == ErrorPermanent {
return fmt.Errorf("agent command: %w", tunnelErr)
}
return nil
}
if IsEOF(handlerErr) {
Expand Down
5 changes: 4 additions & 1 deletion pkg/tunnel/connerror_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ func TestClassifyTunnelErrors(t *testing.T) {
wantNil bool
wantSubstr string
}{
{"handler nil", tunnelErr, nil, true, ""},
{"handler nil, no tunnel err", nil, nil, true, ""},
{"handler nil, permanent tunnel err", tunnelErr, nil, false, "agent command: dial failed"},
{"handler nil, shutdown tunnel err", context.Canceled, nil, true, ""},
{"handler nil, EOF tunnel err", io.EOF, nil, true, ""},
{"handler EOF with tunnel err", tunnelErr, io.EOF, false, "connect to server: dial failed"},
{"handler EOF no tunnel err", nil, io.EOF, true, ""},
{"handler non-EOF", nil, handlerNonEOF, false, "tunnel to container: handler broke"},
Expand Down
Loading