Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 7 additions & 13 deletions e2e/tests/ssh/agent_forward.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,19 @@ var _ = ginkgo.Describe(
initialDir, err = os.Getwd()
framework.ExpectNoError(err)

tempDir, err = framework.CopyToTempDir("tests/ssh/testdata/agent-forward")
framework.ExpectNoError(err)
authSock, pubKey, agentClean = framework.StartMockSSHAgent(ginkgo.GinkgoT())
ginkgo.DeferCleanup(agentClean)

tempDir = framework.CopyTestdata("tests/ssh/testdata/agent-forward", initialDir)

f = framework.NewDefaultFramework(initialDir + "/bin")
_ = f.DevsyProviderAdd(ctx, "docker")
err = f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)

authSock, pubKey, agentClean = framework.StartMockSSHAgent(ginkgo.GinkgoT())
ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir)
})

devsyUpCtx, cancel := context.WithTimeout(ctx, 5*time.Minute)
defer cancel()
Expand All @@ -61,16 +65,6 @@ var _ = ginkgo.Describe(
host = filepath.Base(tempDir) + ".devsy"
})

ginkgo.AfterAll(func(ctx ginkgo.SpecContext) {
if f != nil && tempDir != "" {
_ = f.DevsyWorkspaceDelete(ctx, tempDir)
framework.CleanupTempDir(initialDir, tempDir)
}
if agentClean != nil {
agentClean()
}
})

ginkgo.It(
"socket is stable across sessions on the same connection",
ginkgo.SpecTimeout(framework.TimeoutModerate()),
Expand Down
6 changes: 2 additions & 4 deletions e2e/tests/ssh/credentials_server_race.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,15 @@ var _ = ginkgo.Describe(
"should not surface credentials-server port errors when two ssh sessions race for the same workspace",
ginkgo.SpecTimeout(framework.TimeoutModerate()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test")
framework.ExpectNoError(err)
tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir)

f := framework.NewDefaultFramework(initialDir + "/bin")
_ = f.DevsyProviderAdd(ctx, "docker")
err = f.DevsyProviderUse(ctx, "docker")
err := f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)

ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir)
framework.CleanupTempDir(initialDir, tempDir)
})

upDeadline := time.Now().Add(5 * time.Minute)
Expand Down
16 changes: 5 additions & 11 deletions e2e/tests/ssh/ports_attributes.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,15 @@ var _ = ginkgo.Describe("devsy portsAttributes e2e",
ginkgo.Skip("skipping on windows")
}

tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/ports-attributes")
framework.ExpectNoError(err)
tempDir := framework.CopyTestdata("tests/ssh/testdata/ports-attributes", initialDir)

f := framework.NewDefaultFramework(initialDir + "/bin")
_ = f.DevsyProviderAdd(ctx, "docker")
err = f.DevsyProviderUse(ctx, "docker")
err := f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)

ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir)
framework.CleanupTempDir(initialDir, tempDir)
})

err = f.DevsyUp(ctx, tempDir)
Expand Down Expand Up @@ -136,17 +134,15 @@ var _ = ginkgo.Describe("devsy portsAttributes e2e",
ginkgo.Skip("skipping on windows")
}

tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/ports-attributes")
framework.ExpectNoError(err)
tempDir := framework.CopyTestdata("tests/ssh/testdata/ports-attributes", initialDir)

f := framework.NewDefaultFramework(initialDir + "/bin")
_ = f.DevsyProviderAdd(ctx, "docker")
err = f.DevsyProviderUse(ctx, "docker")
err := f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)

ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir)
framework.CleanupTempDir(initialDir, tempDir)
})

err = f.DevsyUp(ctx, tempDir)
Expand Down Expand Up @@ -225,8 +221,7 @@ var _ = ginkgo.Describe("devsy portsAttributes e2e",
_ = hostListener.Close()
})

tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/ports-attributes")
framework.ExpectNoError(err)
tempDir := framework.CopyTestdata("tests/ssh/testdata/ports-attributes", initialDir)

f := framework.NewDefaultFramework(initialDir + "/bin")
_ = f.DevsyProviderAdd(ctx, "docker")
Expand All @@ -235,7 +230,6 @@ var _ = ginkgo.Describe("devsy portsAttributes e2e",

ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir)
framework.CleanupTempDir(initialDir, tempDir)
})

err = f.DevsyUp(ctx, tempDir)
Expand Down
4 changes: 1 addition & 3 deletions e2e/tests/ssh/proxy_command.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ var _ = ginkgo.Describe(
ginkgo.Skip("skipping on non-Windows")
}

tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test")
framework.ExpectNoError(err)
tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir)

baseFramework := framework.NewDefaultFramework(initialDir + "/bin")
sourcePath := filepath.Join(baseFramework.DevsyBinDir, baseFramework.DevsyBinName)
Expand All @@ -55,7 +54,6 @@ var _ = ginkgo.Describe(
sshConfigPath := filepath.Join(ginkgo.GinkgoT().TempDir(), "ssh config")
ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir)
framework.CleanupTempDir(initialDir, tempDir)
})

upCtx, cancelUp := context.WithTimeout(ctx, 5*time.Minute)
Expand Down
22 changes: 6 additions & 16 deletions e2e/tests/ssh/ssh_tunnel_mode.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,12 @@ var _ = ginkgo.Describe(
ginkgo.It("should start workspace with --ssh-tunnel and SSH into it",
ginkgo.SpecTimeout(framework.TimeoutModerate()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test")
framework.ExpectNoError(err)
tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir)

f := setupTunnelProvider(ctx, initialDir)

ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir)
framework.CleanupTempDir(initialDir, tempDir)
})

taskID, err := startDetachedTunnelUp(ctx, f, tempDir)
Expand All @@ -74,8 +72,7 @@ var _ = ginkgo.Describe(
ginkgo.It("should write SSH config with Hostname and Port instead of ProxyCommand",
ginkgo.SpecTimeout(framework.TimeoutModerate()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test")
framework.ExpectNoError(err)
tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir)

sshConfigDir := ginkgo.GinkgoT().TempDir()
sshConfigPath := filepath.Join(sshConfigDir, "config")
Expand All @@ -84,7 +81,6 @@ var _ = ginkgo.Describe(

ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir)
framework.CleanupTempDir(initialDir, tempDir)
})

taskID, err := startDetachedTunnelUp(ctx, f, tempDir, "--ssh-config", sshConfigPath)
Expand Down Expand Up @@ -115,8 +111,7 @@ var _ = ginkgo.Describe(
ginkgo.It("should establish a working local TCP tunnel listener",
ginkgo.SpecTimeout(framework.TimeoutModerate()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test")
framework.ExpectNoError(err)
tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir)

sshConfigDir := ginkgo.GinkgoT().TempDir()
sshConfigPath := filepath.Join(sshConfigDir, "config")
Expand All @@ -125,7 +120,6 @@ var _ = ginkgo.Describe(

ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir)
framework.CleanupTempDir(initialDir, tempDir)
})

taskID, err := startDetachedTunnelUp(ctx, f, tempDir, "--ssh-config", sshConfigPath)
Expand Down Expand Up @@ -163,14 +157,12 @@ var _ = ginkgo.Describe(
ginkgo.It("should handle multiple sequential SSH commands via tunnel",
ginkgo.SpecTimeout(framework.TimeoutModerate()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test")
framework.ExpectNoError(err)
tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir)

f := setupTunnelProvider(ctx, initialDir)

ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir)
framework.CleanupTempDir(initialDir, tempDir)
})

taskID, err := startDetachedTunnelUp(ctx, f, tempDir)
Expand Down Expand Up @@ -213,8 +205,7 @@ var _ = ginkgo.Describe(
ginkgo.It("should fall back to ProxyCommand when tunnel mode is not enabled",
ginkgo.SpecTimeout(framework.TimeoutModerate()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test")
framework.ExpectNoError(err)
tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir)

sshConfigDir := ginkgo.GinkgoT().TempDir()
sshConfigPath := filepath.Join(sshConfigDir, "config")
Expand All @@ -223,12 +214,11 @@ var _ = ginkgo.Describe(

ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir)
framework.CleanupTempDir(initialDir, tempDir)
})

devsyUpCtx, cancel := context.WithDeadline(ctx, time.Now().Add(5*time.Minute))
defer cancel()
err = f.DevsyUp(devsyUpCtx, tempDir, "--ssh-config", sshConfigPath)
err := f.DevsyUp(devsyUpCtx, tempDir, "--ssh-config", sshConfigPath)
framework.ExpectNoError(err)

configBytes, err := os.ReadFile(filepath.Clean(sshConfigPath))
Expand Down
8 changes: 2 additions & 6 deletions e2e/tests/ssh/task_cancel.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@ var _ = ginkgo.Describe(
ginkgo.It("should cancel a detached tunnel task and keep the workspace stopped",
ginkgo.SpecTimeout(framework.TimeoutLong()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test")
framework.ExpectNoError(err)
tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir)

f := setupTunnelProvider(ctx, initialDir)

ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir)
framework.CleanupTempDir(initialDir, tempDir)
})

taskID, err := startDetachedTunnelUp(ctx, f, tempDir)
Expand Down Expand Up @@ -73,14 +71,12 @@ var _ = ginkgo.Describe(
ginkgo.It("should quiesce a persisted detached task when stop runs without a task ID",
ginkgo.SpecTimeout(framework.TimeoutLong()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test")
framework.ExpectNoError(err)
tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir)

f := setupTunnelProvider(ctx, initialDir)

ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir)
framework.CleanupTempDir(initialDir, tempDir)
})

taskID, err := startDetachedTunnelUp(ctx, f, tempDir)
Expand Down
Loading