self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-20 17:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling in Connect gateway integration test (#19145)

Browse source 
mockTSHDEventsClient will most likely be called outside of the test
goroutine, so we shouldn't use require.NoError there.

helpers.SetupUserCreds returns an error which I did not inspect. The linter
didn't warn me about it for some reason.
This commit is contained in:
Rafał Cieślak 2022-12-15 10:49:20 +01:00 committed by GitHub
parent 7895fddc57
commit 519c9aa0df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
integration/proxy/teleterm_test.go
View file

@ -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),
@ -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
@ -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
@ -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
}