Skip to content

refactor(agent): add agenttest.New helper function #9812

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
merged 11 commits into from
Sep 26, 2023
Merged

refactor(agent): add agenttest.New helper function #9812

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
af64f27
fix(cli): call agent directly in gitssh tests
johnstcn Sep 21, 2023
d99e29c
add agenttest.New test helper
johnstcn Sep 21, 2023
3d2788e
return wrapper instead of func
johnstcn Sep 21, 2023
5b4cad9
refactor existing unit tests
johnstcn Sep 21, 2023
81a3a78
ignore duplicated code in unit tests
johnstcn Sep 21, 2023
3316b99
address code review comments
johnstcn Sep 21, 2023
c2cba9d
fixup! address code review comments
johnstcn Sep 21, 2023
6aa4bbe
Merge remote-tracking branch 'origin/main' into cj/agenttest
johnstcn Sep 25, 2023
d55c797
address PR comments
johnstcn Sep 25, 2023
903fe3e
skip flaky test
johnstcn Sep 25, 2023
9f3f6ff
Merge remote-tracking branch 'origin/main' into cj/agenttest
johnstcn Sep 26, 2023
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
Prev Previous commit
Next Next commit
refactor existing unit tests
  • Loading branch information
@johnstcn
johnstcn committed Sep 21, 2023
commit 5b4cad97e3904f2080293f8cc2dd1c3603538e3a
20 changes: 6 additions & 14 deletions cli/configssh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"cdr.dev/slog/sloggers/slogtest"

"github.com/coder/coder/v2/agent"
"github.com/coder/coder/v2/agent/agenttest"
"github.com/coder/coder/v2/cli/clitest"
"github.com/coder/coder/v2/coderd/coderdtest"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/codersdk/agentsdk"
"github.com/coder/coder/v2/provisioner/echo"
"github.com/coder/coder/v2/provisionersdk/proto"
"github.com/coder/coder/v2/pty/ptytest"
Expand Down Expand Up @@ -102,16 +99,11 @@ func TestConfigSSH(t *testing.T) {
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(authToken)
agentCloser := agent.New(agent.Options{
Client: agentClient,
Logger: slogtest.Make(t, nil).Named("agent"),
})
defer func() {
_ = agentCloser.Close()
}()
resources := coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
resources := agenttest.New(t,
agenttest.WithURL(client.URL),
agenttest.WithAgentToken(authToken),
agenttest.WithWorkspaceID(workspace.ID),
).Wait(client)
agentConn, err := client.DialWorkspaceAgent(context.Background(), resources[0].Agents[0].ID, nil)
require.NoError(t, err)
defer agentConn.Close()
Expand Down
33 changes: 10 additions & 23 deletions cli/gitssh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,14 @@ import (
"sync/atomic"
"testing"

"cdr.dev/slog"
"cdr.dev/slog/sloggers/slogtest"

"github.com/coder/coder/v2/agent"
"github.com/coder/coder/v2/codersdk/agentsdk"
"github.com/stretchr/testify/assert"

"github.com/gliderlabs/ssh"
"github.com/google/uuid"
"github.com/stretchr/testify/require"
gossh "golang.org/x/crypto/ssh"

"github.com/coder/coder/v2/agent/agenttest"
"github.com/coder/coder/v2/codersdk/agentsdk"

"github.com/coder/coder/v2/cli/clitest"
"github.com/coder/coder/v2/coderd/coderdtest"
"github.com/coder/coder/v2/codersdk"
Expand Down Expand Up @@ -64,22 +60,13 @@ func prepareTestGitSSH(ctx context.Context, t *testing.T) (*agentsdk.Client, str
coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)

// start workspace agent
agentLog := slogtest.Make(t, nil).Leveled(slog.LevelDebug).Named("agent")
agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(agentToken)
agt := agent.New(agent.Options{
Client: agentClient,
Logger: agentLog,
LogDir: t.TempDir(),
ExchangeToken: func(_ context.Context) (string, error) {
return agentToken, nil
},
})
t.Cleanup(func() {
assert.NoError(t, agt.Close(), "failed to close agent in cleanup")
})
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
return agentClient, agentToken, pubkey
agt := agenttest.New(t,
agenttest.WithURL(client.URL),
agenttest.WithAgentToken(agentToken),
agenttest.WithWorkspaceID(workspace.ID),
)
agt.Wait(client)
return agt.Client(), agentToken, pubkey
}

func serveSSHForGitSSH(t *testing.T, handler func(ssh.Session), pubkeys ...gossh.PublicKey) *net.TCPAddr {
Expand Down
19 changes: 6 additions & 13 deletions cli/ping_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ import (

"github.com/stretchr/testify/assert"

"cdr.dev/slog/sloggers/slogtest"

"github.com/coder/coder/v2/agent"
"github.com/coder/coder/v2/agent/agenttest"
"github.com/coder/coder/v2/cli/clitest"
"github.com/coder/coder/v2/codersdk/agentsdk"
"github.com/coder/coder/v2/pty/ptytest"
"github.com/coder/coder/v2/testutil"
)
Expand All @@ -29,15 +26,11 @@ func TestPing(t *testing.T) {
inv.Stderr = pty.Output()
inv.Stdout = pty.Output()

agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(agentToken)
agentCloser := agent.New(agent.Options{
Client: agentClient,
Logger: slogtest.Make(t, nil).Named("agent"),
})
defer func() {
_ = agentCloser.Close()
}()
_ = agenttest.New(t,
agenttest.WithURL(client.URL),
agenttest.WithAgentToken(agentToken),
agenttest.WithWorkspaceID(workspace.ID),
).Wait(client)

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
Expand Down
30 changes: 9 additions & 21 deletions cli/portforward_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,11 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"cdr.dev/slog"
"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/v2/agent"
"github.com/coder/coder/v2/agent/agenttest"

"github.com/coder/coder/v2/cli/clitest"
"github.com/coder/coder/v2/coderd/coderdtest"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/codersdk/agentsdk"
"github.com/coder/coder/v2/provisioner/echo"
"github.com/coder/coder/v2/pty/ptytest"
"github.com/coder/coder/v2/testutil"
Expand Down Expand Up @@ -317,24 +315,14 @@ func runAgent(t *testing.T, client *codersdk.Client, userID uuid.UUID) codersdk.
workspace := coderdtest.CreateWorkspace(t, client, orgID, template.ID)
coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)

logger := slogtest.Make(t, nil).Leveled(slog.LevelDebug).Named("agent")
agentClient := agentsdk.New(client.URL)
agentClient.SDK.SetLogger(logger)
agentClient.SDK.SetSessionToken(agentToken)
agnt := agent.New(agent.Options{
Client: agentClient,
Logger: logger,
LogDir: t.TempDir(),
ExchangeToken: func(ctx context.Context) (string, error) {
return agentToken, nil
agenttest.New(t,
agenttest.WithURL(client.URL),
agenttest.WithAgentToken(agentToken),
agenttest.WithWorkspaceID(workspace.ID),
func(o *agenttest.Options) {
o.AgentOptions.SSHMaxTimeout = 60 * time.Second
},
SSHMaxTimeout: time.Second * 60,
})
t.Cleanup(func() {
err := agnt.Close()
assert.NoError(t, err)
})
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
).Wait(client)

return workspace
}
Expand Down
17 changes: 6 additions & 11 deletions cli/speedtest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@ import (

"cdr.dev/slog"
"cdr.dev/slog/sloggers/slogtest"
"github.com/coder/coder/v2/agent"
"github.com/coder/coder/v2/agent/agenttest"
"github.com/coder/coder/v2/cli"
"github.com/coder/coder/v2/cli/clitest"
"github.com/coder/coder/v2/coderd/coderdtest"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/codersdk/agentsdk"
"github.com/coder/coder/v2/pty/ptytest"
"github.com/coder/coder/v2/testutil"
)
Expand All @@ -26,14 +24,11 @@ func TestSpeedtest(t *testing.T) {
t.Skip("This test takes a minimum of 5ms per a hardcoded value in Tailscale!")
}
client, workspace, agentToken := setupWorkspaceForAgent(t, nil)
agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(agentToken)
agentCloser := agent.New(agent.Options{
Client: agentClient,
Logger: slogtest.Make(t, nil).Named("agent").Leveled(slog.LevelDebug),
})
defer agentCloser.Close()
coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)
_ = agenttest.New(t,
agenttest.WithURL(client.URL),
agenttest.WithAgentToken(agentToken),
agenttest.WithWorkspaceID(workspace.ID),
).Wait(client)

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
Expand Down
111 changes: 45 additions & 66 deletions cli/ssh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,12 @@ import (
"cdr.dev/slog"
"cdr.dev/slog/sloggers/slogtest"

"github.com/coder/coder/v2/agent"
"github.com/coder/coder/v2/agent/agenttest"
"github.com/coder/coder/v2/cli/clitest"
"github.com/coder/coder/v2/cli/cliui"
"github.com/coder/coder/v2/coderd/coderdtest"
"github.com/coder/coder/v2/coderd/database"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/codersdk/agentsdk"
"github.com/coder/coder/v2/provisioner/echo"
"github.com/coder/coder/v2/provisionersdk/proto"
"github.com/coder/coder/v2/pty"
Expand Down Expand Up @@ -103,15 +102,11 @@ func TestSSH(t *testing.T) {
})
pty.ExpectMatch("Waiting")

agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(agentToken)
agentCloser := agent.New(agent.Options{
Client: agentClient,
Logger: slogtest.Make(t, nil).Named("agent"),
})
defer func() {
_ = agentCloser.Close()
}()
_ = agenttest.New(t,
agenttest.WithURL(client.URL),
agenttest.WithAgentToken(agentToken),
agenttest.WithWorkspaceID(workspace.ID),
).Wait(client)

// Shells on Mac, Windows, and Linux all exit shells with the "exit" command.
pty.WriteLine("exit")
Expand Down Expand Up @@ -167,15 +162,11 @@ func TestSSH(t *testing.T) {
})
pty.ExpectMatch("Waiting")

agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(agentToken)
agentCloser := agent.New(agent.Options{
Client: agentClient,
Logger: slogtest.Make(t, nil).Named("agent"),
})
defer func() {
_ = agentCloser.Close()
}()
_ = agenttest.New(t,
agenttest.WithURL(client.URL),
agenttest.WithAgentToken(agentToken),
agenttest.WithWorkspaceID(workspace.ID),
).Wait(client)

// Ensure the agent is connected.
pty.WriteLine("echo hell'o'")
Expand All @@ -196,14 +187,12 @@ func TestSSH(t *testing.T) {
_, _ = tGoContext(t, func(ctx context.Context) {
// Run this async so the SSH command has to wait for
// the build and agent to connect!
agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(agentToken)
agentCloser := agent.New(agent.Options{
Client: agentClient,
Logger: slogtest.Make(t, nil).Named("agent"),
})
_ = agenttest.New(t,
agenttest.WithURL(client.URL),
agenttest.WithAgentToken(agentToken),
agenttest.WithWorkspaceID(workspace.ID),
).Wait(client)
<-ctx.Done()
_ = agentCloser.Close()
})

clientOutput, clientInput := io.Pipe()
Expand Down Expand Up @@ -264,14 +253,12 @@ func TestSSH(t *testing.T) {
_, _ = tGoContext(t, func(ctx context.Context) {
// Run this async so the SSH command has to wait for
// the build and agent to connect.
agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(agentToken)
agentCloser := agent.New(agent.Options{
Client: agentClient,
Logger: slogtest.Make(t, nil).Named("agent"),
})
_ = agenttest.New(t,
agenttest.WithURL(client.URL),
agenttest.WithAgentToken(agentToken),
agenttest.WithWorkspaceID(workspace.ID),
).Wait(client)
<-ctx.Done()
_ = agentCloser.Close()
})

clientOutput, clientInput := io.Pipe()
Expand Down Expand Up @@ -333,13 +320,11 @@ func TestSSH(t *testing.T) {

client, workspace, agentToken := setupWorkspaceForAgent(t, nil)

agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(agentToken)
agentCloser := agent.New(agent.Options{
Client: agentClient,
Logger: slogtest.Make(t, nil).Named("agent"),
})
defer agentCloser.Close()
_ = agenttest.New(t,
agenttest.WithURL(client.URL),
agenttest.WithAgentToken(agentToken),
agenttest.WithWorkspaceID(workspace.ID),
).Wait(client)

// Generate private key.
privateKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
Expand Down Expand Up @@ -424,13 +409,11 @@ func TestSSH(t *testing.T) {

client, workspace, agentToken := setupWorkspaceForAgent(t, nil)

agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(agentToken)
agentCloser := agent.New(agent.Options{
Client: agentClient,
Logger: slogtest.Make(t, nil).Named("agent"),
})
defer agentCloser.Close()
_ = agenttest.New(t,
agenttest.WithURL(client.URL),
agenttest.WithAgentToken(agentToken),
agenttest.WithWorkspaceID(workspace.ID),
).Wait(client)

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
defer cancel()
Expand Down Expand Up @@ -475,15 +458,11 @@ func TestSSH(t *testing.T) {

pty.ExpectMatch("Waiting")

agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(agentToken)
agentCloser := agent.New(agent.Options{
Client: agentClient,
Logger: slogtest.Make(t, nil).Named("agent"),
})
defer func() {
_ = agentCloser.Close()
}()
agenttest.New(t,
agenttest.WithURL(client.URL),
agenttest.WithAgentToken(agentToken),
agenttest.WithWorkspaceID(workspace.ID),
).Wait(client)

// Shells on Mac, Windows, and Linux all exit shells with the "exit" command.
pty.WriteLine("exit")
Expand Down Expand Up @@ -651,16 +630,16 @@ Expire-Date: 0

client, workspace, agentToken := setupWorkspaceForAgent(t, nil)

agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(agentToken)
agentCloser := agent.New(agent.Options{
Client: agentClient,
EnvironmentVariables: map[string]string{
"GNUPGHOME": gnupgHomeWorkspace,
_ = agenttest.New(t,
agenttest.WithURL(client.URL),
agenttest.WithAgentToken(agentToken),
agenttest.WithWorkspaceID(workspace.ID),
func(o *agenttest.Options) {
o.AgentOptions.EnvironmentVariables = map[string]string{
"GNUPGHOME": gnupgHomeWorkspace,
}
},
Logger: slogtest.Make(t, nil).Named("agent"),
})
defer agentCloser.Close()
).Wait(client)

inv, root := clitest.New(t,
"ssh",
Expand Down
Loading