CyberCoveLLC/threshold
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ce: refact(e2e): Update WaitForSessionCli to accept e2e options

Browse Source 
(cherry picked from commit ab3b5fb361e6f2f854f24306979565a28664fc0a)
This commit is contained in:
Tony committed 2025-11-18 14:36:08 -05:00
1 parent d3b2e7402b
commit 94c32d2173
20 files changed
+33 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

testing/internal/e2e/boundary/session.go
+12 -3
View File
@@ -20,19 +20,28 @@ import (
// WaitForSessionCli waits for sessions to appear in the session list and returns the most recent session
// information. If the WithExpectedSessionsCount option is provided, expects to find specified amount of sessions
// or only 1 otherwise.
func WaitForSessionCli(t testing.TB, ctx context.Context, projectId string, opt ...SessionOption) *sessions.Session {
opts := getSessionOpts(opt...)
func WaitForSessionCli(t testing.TB, ctx context.Context, projectId string, sessionOpts []SessionOption, e2eOpts ...e2e.Option) *sessions.Session {
opts := getSessionOpts(sessionOpts...)
var options []e2e.Option
options = append(options,
e2e.WithArgs("sessions", "list", "-scope-id", projectId, "-include-terminated", "-format", "json"),
)
options = append(options, e2eOpts...)
t.Log("Waiting for session to appear...")
var session *sessions.Session
err := backoff.RetryNotify(
func() error {
// List sessions
output := e2e.RunCommand(ctx, "boundary",
e2e.WithArgs("sessions", "list", "-scope-id", projectId, "-include-terminated", "-format", "json"),
options...,
)
if output.Err != nil {
return backoff.Permanent(errors.New(string(output.Stderr)))
}
var sessionListResult sessions.SessionListResult
err := json.Unmarshal(output.Stdout, &sessionListResult)
if err != nil {
testing/internal/e2e/tests/aws/dynamichostcatalog_host_set_test.go
+1 -1
View File
@@ -156,7 +156,7 @@ func TestCliCreateAwsDynamicHostCatalogWithHostSet(t *testing.T) {
}()
t.Cleanup(cancel)
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusActive.String())
output = e2e.RunCommand(ctx, "boundary",
testing/internal/e2e/tests/base/bytes_up_down_empty_test.go
+1 -1
View File
@@ -70,7 +70,7 @@ func TestCliBytesUpDownEmpty(t *testing.T) {
}()
t.Cleanup(cancel)
session := boundary.WaitForSessionCli(t, ctx, projectId)
session := boundary.WaitForSessionCli(t, ctx, projectId, nil)
assert.Equal(t, targetId, session.TargetId)
// Wait until bytes up and down is greater than 0
testing/internal/e2e/tests/base/bytes_up_down_test.go
+1 -1
View File
@@ -73,7 +73,7 @@ func TestCliBytesUpDownTransferData(t *testing.T) {
)
}()
t.Cleanup(cancel)
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusActive.String())
assert.Equal(t, targetId, s.TargetId)
testing/internal/e2e/tests/base/session_cancel_admin_test.go
+1 -1
View File
@@ -68,7 +68,7 @@ func TestCliSessionCancelAdmin(t *testing.T) {
)
}()
t.Cleanup(cancel)
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusActive.String())
assert.Equal(t, targetId, s.TargetId)
assert.Equal(t, hostId, s.HostId)
testing/internal/e2e/tests/base/session_cancel_group_test.go
+1 -1
View File
@@ -145,7 +145,7 @@ func TestCliSessionCancelGroup(t *testing.T) {
)
}()
t.Cleanup(cancel)
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusActive.String())
assert.Equal(t, targetId, s.TargetId)
assert.Equal(t, hostId, s.HostId)
testing/internal/e2e/tests/base/session_cancel_user_test.go
+1 -1
View File
@@ -138,7 +138,7 @@ func TestCliSessionCancelUser(t *testing.T) {
)
}()
t.Cleanup(cancel)
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusActive.String())
assert.Equal(t, targetId, s.TargetId)
assert.Equal(t, hostId, s.HostId)
testing/internal/e2e/tests/base/session_end_delete_host_set_test.go
+1 -1
View File
@@ -101,7 +101,7 @@ func TestCliSessionEndWhenHostSetIsDeleted(t *testing.T) {
)
}()
t.Cleanup(cancel)
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusActive.String())
assert.Equal(t, targetId, s.TargetId)
assert.Equal(t, hostId, s.HostId)
testing/internal/e2e/tests/base/session_end_delete_host_test.go
+1 -1
View File
@@ -101,7 +101,7 @@ func TestCliSessionEndWhenHostIsDeleted(t *testing.T) {
)
}()
t.Cleanup(cancel)
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusActive.String())
assert.Equal(t, targetId, s.TargetId)
assert.Equal(t, hostId, s.HostId)
testing/internal/e2e/tests/base/session_end_delete_project_test.go
+1 -1
View File
@@ -92,7 +92,7 @@ func TestCliSessionEndWhenProjectIsDeleted(t *testing.T) {
)
}()
t.Cleanup(cancel)
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusActive.String())
assert.Equal(t, targetId, s.TargetId)
testing/internal/e2e/tests/base/session_end_delete_target_test.go
+1 -1
View File
@@ -101,7 +101,7 @@ func TestCliSessionEndWhenTargetIsDeleted(t *testing.T) {
)
}()
t.Cleanup(cancel)
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusActive.String())
assert.Equal(t, targetId, s.TargetId)
assert.Equal(t, hostId, s.HostId)
testing/internal/e2e/tests/base/session_end_delete_user_test.go
+1 -1
View File
@@ -106,7 +106,7 @@ func TestCliSessionEndWhenUserIsDeleted(t *testing.T) {
)
}()
t.Cleanup(cancel)
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusActive.String())
assert.Equal(t, targetId, s.TargetId)
assert.Equal(t, hostId, s.HostId)
testing/internal/e2e/tests/base/target_tcp_connect_connection_limits_test.go
+1 -1
View File
@@ -67,7 +67,7 @@ func TestCliTcpTargetConnectTargetWithConnectionLimits(t *testing.T) {
}()
t.Cleanup(cancel)
boundary.WaitForSessionCli(t, ctx, projectId)
boundary.WaitForSessionCli(t, ctx, projectId, nil)
// Start connections. Expect an error once the limit is reached
for i := 0; i <= sessionConnectionLimit; i++ {
testing/internal/e2e/tests/base/target_tcp_connect_exec_long_lasting_script_test.go
+1 -1
View File
@@ -75,7 +75,7 @@ func TestCliTcpTargetConnectExecLongLastingScript(t *testing.T) {
)
}()
t.Cleanup(cancel)
boundary.WaitForSessionCli(t, ctx, projectId)
boundary.WaitForSessionCli(t, ctx, projectId, nil)
t.Log("Copying script to host...")
output := e2e.RunCommand(ctx, "scp",
testing/internal/e2e/tests/base/target_tcp_connect_go_ssh_test.go
+1 -1
View File
@@ -55,7 +55,7 @@ func TestCliTcpTargetConnectGoSsh(t *testing.T) {
}()
t.Cleanup(cancel)
boundary.WaitForSessionCli(t, ctx, projectId)
boundary.WaitForSessionCli(t, ctx, projectId, nil)
// Connect to the target using the go experimental ssh library
privateKeyRaw, err := os.ReadFile(c.TargetSshKeyPath)
testing/internal/e2e/tests/base/target_tcp_connect_http_test.go
+1 -1
View File
@@ -79,7 +79,7 @@ Server: netcat-can-you-believe-it
_, _ = io.Copy(io.Discard, f) // Not checking error here since it will return an error on session close
}()
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusActive.String())
// Create http target and connect to it
testing/internal/e2e/tests/base/target_tcp_connect_listen_port_test.go
+2 -2
View File
@@ -57,7 +57,7 @@ func TestCliTcpTargetConnectListenPort(t *testing.T) {
}()
t.Cleanup(cancel)
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusPending.String())
t.Logf("Successfully connected to target with listen port %s", ListenPort)
@@ -118,7 +118,7 @@ func TestCliTcpTargetConnectDefaultClientPort(t *testing.T) {
}()
t.Cleanup(cancel)
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusPending.String())
t.Logf("Successfully connected to target with client port %d", DefaultClientPort)
testing/internal/e2e/tests/base/target_tcp_connect_localhost_test.go
+1 -1
View File
@@ -65,7 +65,7 @@ func TestCliTcpTargetConnectTargetWithLocalhost(t *testing.T) {
}()
t.Cleanup(cancel)
boundary.WaitForSessionCli(t, ctx, projectId)
boundary.WaitForSessionCli(t, ctx, projectId, nil)
// Connect to target and print host's IP address
output := e2e.RunCommand(ctx, "ssh",
testing/internal/e2e/tests/base/target_tcp_connect_scp_test.go
+1 -1
View File
@@ -64,7 +64,7 @@ func TestCliTcpTargetConnectTargetAndScp(t *testing.T) {
}()
t.Cleanup(cancel)
boundary.WaitForSessionCli(t, ctx, projectId)
boundary.WaitForSessionCli(t, ctx, projectId, nil)
// Create file to scp
testDir := t.TempDir()
testing/internal/e2e/tests/base/target_tcp_connect_session_max_seconds_test.go
+2 -2
View File
@@ -71,7 +71,7 @@ func TestCliTcpTargetConnectTargetWithSessionMaxSecondsTearDown(t *testing.T) {
)
}()
t.Cleanup(cancel)
s := boundary.WaitForSessionCli(t, ctx, projectId)
s := boundary.WaitForSessionCli(t, ctx, projectId, nil)
boundary.WaitForSessionStatusCli(t, ctx, s.Id, session.StatusActive.String())
// Check that session was closed once time limit is reached
@@ -140,7 +140,7 @@ func TestCliTcpTargetConnectTargetWithSessionMaxSecondsRejectNew(t *testing.T) {
)
}()
t.Cleanup(cancel)
boundary.WaitForSessionCli(t, ctx, projectId)
boundary.WaitForSessionCli(t, ctx, projectId, nil)
// Start connections. Expect an error once the time limit is reached
t.Log("Creating connections...")