Skip to content

Improve error handling in Connect gateway integration test #19145

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
ravicious merged 3 commits into from
Dec 15, 2022
Merged

Improve error handling in Connect gateway integration test #19145

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16c950b
Improve error handling in Connect gateway integration test
ravicious Dec 7, 2022
ed10c5f
Merge branch 'master' into ravicious/proxy-teleterm-err
ravicious Dec 14, 2022
dd0312b
Merge branch 'master' into ravicious/proxy-teleterm-err
ravicious Dec 15, 2022
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
14 changes: 9 additions & 5 deletions integration/proxy/teleterm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ func testGatewayCertRenewal(t *testing.T, pack *dbhelpers.DatabasePack, creds *h
require.NoError(t, err)

tshdEventsClient := &mockTSHDEventsClient{
t: t,
tc: tc,
pack: pack,
callCounts: make(map[string]int),
Expand Down Expand Up @@ -145,7 +144,8 @@ func testGatewayCertRenewal(t *testing.T, pack *dbhelpers.DatabasePack, creds *h
TTL: -time.Hour,
})
require.NoError(t, err)
helpers.SetupUserCreds(tc, pack.Root.Cluster.Config.Proxy.SSHAddr.Addr, *expiredCreds)
err = helpers.SetupUserCreds(tc, pack.Root.Cluster.Config.Proxy.SSHAddr.Addr, *expiredCreds)
require.NoError(t, err)

// Open a new connection.
// This should trigger the relogin flow. The middleware will notice that the db cert has expired
Expand All @@ -172,7 +172,6 @@ func testGatewayCertRenewal(t *testing.T, pack *dbhelpers.DatabasePack, creds *h
}

type mockTSHDEventsClient struct {
t *testing.T
tc *libclient.TeleportClient
pack *dbhelpers.DatabasePack
callCounts map[string]int
Expand All @@ -186,8 +185,13 @@ func (c *mockTSHDEventsClient) Relogin(context.Context, *api.ReloginRequest, ...
Process: c.pack.Root.Cluster.Process,
Username: c.pack.Root.User.GetName(),
})
require.NoError(c.t, err)
helpers.SetupUserCreds(c.tc, c.pack.Root.Cluster.Config.Proxy.SSHAddr.Addr, *creds)
if err != nil {
return nil, trace.Wrap(err)
}
err = helpers.SetupUserCreds(c.tc, c.pack.Root.Cluster.Config.Proxy.SSHAddr.Addr, *creds)
if err != nil {
return nil, trace.Wrap(err)
}

return &api.ReloginResponse{}, nil
}
Expand Down