Mar 14, 2024 · Mar 6, 2024 · Mar 6, 2024 · Mar 8, 2024 · Mar 8, 2024 · Mar 8, 2024
diff --git a/cli/vscodessh_test.go b/cli/vscodessh_test.go
 package cli_test

 import (
 "context"
 "fmt"
 "testing"

 "github.com/spf13/afero"
 "github.com/stretchr/testify/assert"
 "github.com/stretchr/testify/require"

 "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/pty/ptytest"
 "github.com/coder/coder/v2/testutil"
 )

 t.Parallel()
 ctx := testutil.Context(t, testutil.WaitLong)
 client, workspace, agentToken := setupWorkspaceForAgent(t)
 _, err := client.User(ctx, codersdk.Me)
 user, err := client.User(ctx, codersdk.Me)
 require.NoError(t, err)

 _ = agenttest.New(t, client.URL, agentToken)
 _ = coderdtest.NewWorkspaceAgentWaiter(t, client, workspace.ID).Wait()

 //fs := afero.NewMemMapFs()
 //err = afero.WriteFile(fs, "/url", []byte(client.URL.String()), 0o600)
 //require.NoError(t, err)
 //err = afero.WriteFile(fs, "/token", []byte(client.SessionToken()), 0o600)
 //require.NoError(t, err)

 // //nolint:revive,staticcheck
 //ctx = context.WithValue(ctx, "fs", fs)

 //inv, _ := clitest.New(t,
 //"vscodessh",
 //"--url-file", "/url",
 //"--session-token-file", "/token",
 //"--network-info-dir", "/net",
 //"--log-dir", "/log",
 //"--network-info-interval", "25ms",
 //fmt.Sprintf("coder-vscode--%s--%s", user.Username, workspace.Name),
 //)
 //ptytest.New(t).Attach(inv)

 //waiter := clitest.StartWithWaiter(t, inv.WithContext(ctx))

 //for _, dir := range []string{"/net", "/log"} {
 //assert.Eventually(t, func() bool {
 //entries, err := afero.ReadDir(fs, dir)
 //if err != nil {
 //return false
 //}
 //return len(entries) > 0
 //}, testutil.WaitLong, testutil.IntervalFast)
 //}
 //waiter.Cancel()

 //if err := waiter.Wait(); err != nil {
 //waiter.RequireIs(context.Canceled)
 //}
 _ = coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)

 fs := afero.NewMemMapFs()
 err = afero.WriteFile(fs, "/url", []byte(client.URL.String()), 0o600)
 require.NoError(t, err)
 err = afero.WriteFile(fs, "/token", []byte(client.SessionToken()), 0o600)
 require.NoError(t, err)

 //nolint:revive,staticcheck
 ctx = context.WithValue(ctx, "fs", fs)

 inv, _ := clitest.New(t,
 "vscodessh",
 "--url-file", "/url",
 "--session-token-file", "/token",
 "--network-info-dir", "/net",
 "--log-dir", "/log",
 "--network-info-interval", "25ms",
 fmt.Sprintf("coder-vscode--%s--%s", user.Username, workspace.Name),
 )
 ptytest.New(t).Attach(inv)

 waiter := clitest.StartWithWaiter(t, inv.WithContext(ctx))

 for _, dir := range []string{"/net", "/log"} {
 assert.Eventually(t, func() bool {
 entries, err := afero.ReadDir(fs, dir)
 if err != nil {
 return false
 }
 return len(entries) > 0
 }, testutil.WaitLong, testutil.IntervalFast)
 }
 waiter.Cancel()

 if err := waiter.Wait(); err != nil {
 waiter.RequireIs(context.Canceled)
 }
 }
Original file line number	Diff line number	Diff line change
		@@ -1,13 +1,19 @@
		package cli_test

		import (
		"context"
		"fmt"
		"testing"

		"github.com/spf13/afero"
		"github.com/stretchr/testify/assert"
		"github.com/stretchr/testify/require"

		"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/pty/ptytest"
		"github.com/coder/coder/v2/testutil"
		)

Expand All		@@ -17,46 +23,46 @@ func TestVSCodeSSH(t *testing.T) {
		t.Parallel()
		ctx := testutil.Context(t, testutil.WaitLong)
		client, workspace, agentToken := setupWorkspaceForAgent(t)
		_, err := client.User(ctx, codersdk.Me)
		user, err := client.User(ctx, codersdk.Me)
		require.NoError(t, err)

		_ = agenttest.New(t, client.URL, agentToken)
		_ = coderdtest.NewWorkspaceAgentWaiter(t, client, workspace.ID).Wait()

		//fs := afero.NewMemMapFs()
		//err = afero.WriteFile(fs, "/url", []byte(client.URL.String()), 0o600)
		//require.NoError(t, err)
		//err = afero.WriteFile(fs, "/token", []byte(client.SessionToken()), 0o600)
		//require.NoError(t, err)

		// //nolint:revive,staticcheck
		//ctx = context.WithValue(ctx, "fs", fs)

		//inv, _ := clitest.New(t,
		//"vscodessh",
		//"--url-file", "/url",
		//"--session-token-file", "/token",
		//"--network-info-dir", "/net",
		//"--log-dir", "/log",
		//"--network-info-interval", "25ms",
		//fmt.Sprintf("coder-vscode--%s--%s", user.Username, workspace.Name),
		//)
		//ptytest.New(t).Attach(inv)

		//waiter := clitest.StartWithWaiter(t, inv.WithContext(ctx))

		//for _, dir := range []string{"/net", "/log"} {
		//assert.Eventually(t, func() bool {
		//entries, err := afero.ReadDir(fs, dir)
		//if err != nil {
		//return false
		//}
		//return len(entries) > 0
		//}, testutil.WaitLong, testutil.IntervalFast)
		//}
		//waiter.Cancel()

		//if err := waiter.Wait(); err != nil {
		//waiter.RequireIs(context.Canceled)
		//}
		_ = coderdtest.AwaitWorkspaceAgents(t, client, workspace.ID)

		fs := afero.NewMemMapFs()
		err = afero.WriteFile(fs, "/url", []byte(client.URL.String()), 0o600)
		require.NoError(t, err)
		err = afero.WriteFile(fs, "/token", []byte(client.SessionToken()), 0o600)
		require.NoError(t, err)

		//nolint:revive,staticcheck
		ctx = context.WithValue(ctx, "fs", fs)

		inv, _ := clitest.New(t,
		"vscodessh",
		"--url-file", "/url",
		"--session-token-file", "/token",
		"--network-info-dir", "/net",
		"--log-dir", "/log",
		"--network-info-interval", "25ms",
		fmt.Sprintf("coder-vscode--%s--%s", user.Username, workspace.Name),
		)
		ptytest.New(t).Attach(inv)

		waiter := clitest.StartWithWaiter(t, inv.WithContext(ctx))

		for _, dir := range []string{"/net", "/log"} {
		assert.Eventually(t, func() bool {
		entries, err := afero.ReadDir(fs, dir)
		if err != nil {
		return false
		}
		return len(entries) > 0
		}, testutil.WaitLong, testutil.IntervalFast)
		}
		waiter.Cancel()

		if err := waiter.Wait(); err != nil {
		waiter.RequireIs(context.Canceled)
		}
		}