diff --git a/e2e/tests/ci/ci.go b/e2e/tests/ci/ci.go index 447e7116d6..2bd8d3ae08 100644 --- a/e2e/tests/ci/ci.go +++ b/e2e/tests/ci/ci.go @@ -181,9 +181,7 @@ func setupCI(initialDir string) (string, *framework.Framework) { } func setupCIFrom(initialDir, testdataPath string) (string, *framework.Framework) { - tempDir, err := framework.CopyToTempDir(testdataPath) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata(testdataPath, initialDir) f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) diff --git a/e2e/tests/dockercontext/dockercontext.go b/e2e/tests/dockercontext/dockercontext.go index aee14cfb54..dcf030c516 100644 --- a/e2e/tests/dockercontext/dockercontext.go +++ b/e2e/tests/dockercontext/dockercontext.go @@ -95,9 +95,7 @@ var _ = ginkgo.Describe( err = exec.CommandContext(ctx, "docker", "context", "use", testContextName).Run() framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/up/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/up/testdata/docker", initialDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir) stdout, stderr, err := f.DevsyUpStreams(ctx, tempDir) @@ -141,9 +139,7 @@ var _ = ginkgo.Describe( } }) - tempDir, err := framework.CopyToTempDir("tests/up/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/up/testdata/docker", initialDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir) stdout, stderr, err := f.DevsyUpStreams(ctx, tempDir) diff --git a/e2e/tests/dockerinstall/dockerinstall.go b/e2e/tests/dockerinstall/dockerinstall.go index 20acbf0fca..dff93efdf9 100644 --- a/e2e/tests/dockerinstall/dockerinstall.go +++ b/e2e/tests/dockerinstall/dockerinstall.go @@ -25,11 +25,9 @@ var _ = ginkgo.Describe( ginkgo.It("should install Docker when not present", func(ctx context.Context) { f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/up/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/up/testdata/docker", initialDir) - err = f.DevsyProviderAdd(ctx, "docker") + err := f.DevsyProviderAdd(ctx, "docker") framework.ExpectNoError(err) err = f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) diff --git a/e2e/tests/down/down.go b/e2e/tests/down/down.go index b9043f53d8..e011886d56 100644 --- a/e2e/tests/down/down.go +++ b/e2e/tests/down/down.go @@ -35,9 +35,7 @@ var _ = ginkgo.Describe( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/down/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/down/testdata/docker", initialDir) err = f.DevsyUp(ctx, tempDir) framework.ExpectNoError(err) @@ -107,9 +105,7 @@ var _ = ginkgo.Describe( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/down/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/down/testdata/docker", initialDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir) err = f.DevsyUp(ctx, tempDir) @@ -147,9 +143,10 @@ var _ = ginkgo.Describe( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/down/testdata/docker-anon-volume") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata( + "tests/down/testdata/docker-anon-volume", + initialDir, + ) err = f.DevsyUp(ctx, tempDir) framework.ExpectNoError(err) diff --git a/e2e/tests/extends-up/extends_up.go b/e2e/tests/extends-up/extends_up.go index 6e375a9959..fe4720ab90 100644 --- a/e2e/tests/extends-up/extends_up.go +++ b/e2e/tests/extends-up/extends_up.go @@ -24,9 +24,7 @@ var _ = ginkgo.Describe("extends up", ginkgo.Label("extends-up"), func() { f, err := framework.SetupDockerProvider(filepath.Join(initialDir, "bin"), "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/extends-up/testdata/up-extends") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/extends-up/testdata/up-extends", initialDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir) err = f.DevsyUp(ctx, tempDir) diff --git a/e2e/tests/ide/browser_returns.go b/e2e/tests/ide/browser_returns.go index eaec39f6a1..36c355b2f6 100644 --- a/e2e/tests/ide/browser_returns.go +++ b/e2e/tests/ide/browser_returns.go @@ -28,11 +28,9 @@ const gpgTestKeyFingerprint = "07F681B9FD6C3411F679BFD1F51769DB572DDD3F" // the standard cleanup deferred to DeferCleanup. func setupBrowserIDE(ctx context.Context, initialDir string) (*framework.Framework, string) { f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/ide/testdata") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/ide/testdata", initialDir) - err = f.DevsyProviderAdd(ctx, "docker") + err := f.DevsyProviderAdd(ctx, "docker") framework.ExpectNoError(err) err = f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) @@ -276,11 +274,12 @@ var _ = ginkgo.Describe( ginkgo.SpecTimeout(framework.TimeoutLong()), func(ctx context.Context) { f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/ide/testdata-codeserver-nonroot") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata( + "tests/ide/testdata-codeserver-nonroot", + initialDir, + ) - err = f.DevsyProviderAdd(ctx, "docker") + err := f.DevsyProviderAdd(ctx, "docker") framework.ExpectNoError(err) err = f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) @@ -316,11 +315,9 @@ var _ = ginkgo.Describe( ginkgo.SpecTimeout(framework.TimeoutLong()), func(ctx context.Context) { f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/ide/testdata-gpg-nonroot") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/ide/testdata-gpg-nonroot", initialDir) - err = f.DevsyProviderAdd(ctx, "docker") + err := f.DevsyProviderAdd(ctx, "docker") framework.ExpectNoError(err) err = f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) @@ -376,12 +373,10 @@ var _ = ginkgo.Describe( ginkgo.SpecTimeout(framework.TimeoutLong()), func(ctx context.Context) { f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/ide/testdata-gpg-nonroot") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/ide/testdata-gpg-nonroot", initialDir) contextName := fmt.Sprintf("gpg-ctx-%d", time.Now().UnixNano()) - err = f.DevsyContextCreate(ctx, contextName) + err := f.DevsyContextCreate(ctx, contextName) framework.ExpectNoError(err) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyContextUse(cleanupCtx, config.DefaultContext) diff --git a/e2e/tests/ide/ide.go b/e2e/tests/ide/ide.go index 81059b4de6..57a5461d47 100644 --- a/e2e/tests/ide/ide.go +++ b/e2e/tests/ide/ide.go @@ -20,11 +20,9 @@ var _ = ginkgo.Describe("devsy ide test suite", ginkgo.Label("ide"), ginkgo.Orde ginkgo.It( "start ides", ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/ide/testdata") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/ide/testdata", initialDir) - err = f.DevsyProviderAdd(ctx, "docker") + err := f.DevsyProviderAdd(ctx, "docker") framework.ExpectNoError(err) err = f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) diff --git a/e2e/tests/machine/machine.go b/e2e/tests/machine/machine.go index 6a9058f108..3bc8a15980 100644 --- a/e2e/tests/machine/machine.go +++ b/e2e/tests/machine/machine.go @@ -22,9 +22,7 @@ var _ = ginkgo.Describe("devsy testing machine", ginkgo.Label("machine"), ginkgo "should add simple machine and then delete it", ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir("tests/machine/testdata") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/machine/testdata", initialDir) f := framework.NewDefaultFramework(initialDir + "/bin") @@ -32,7 +30,7 @@ var _ = ginkgo.Describe("devsy testing machine", ginkgo.Label("machine"), ginkgo _ = f.DevsyProviderDelete(ctx, "mock-provider") ginkgo.By("Add mock provider") - err = f.DevsyProviderAdd(ctx, tempDir+"/mock-provider.yaml") + err := f.DevsyProviderAdd(ctx, tempDir+"/mock-provider.yaml") framework.ExpectNoError(err) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { err = f.DevsyProviderDelete(cleanupCtx, "mock-provider") @@ -60,9 +58,7 @@ var _ = ginkgo.Describe("devsy testing machine", ginkgo.Label("machine"), ginkgo "should delete a non-existing machine and get an error", ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir("tests/machine/testdata") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/machine/testdata", initialDir) f := framework.NewDefaultFramework(initialDir + "/bin") @@ -70,7 +66,7 @@ var _ = ginkgo.Describe("devsy testing machine", ginkgo.Label("machine"), ginkgo _ = f.DevsyProviderDelete(ctx, "mock-provider") ginkgo.By("Add mock provider") - err = f.DevsyProviderAdd(ctx, tempDir+"/mock-provider.yaml") + err := f.DevsyProviderAdd(ctx, tempDir+"/mock-provider.yaml") framework.ExpectNoError(err) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { err = f.DevsyProviderDelete(cleanupCtx, "mock-provider") diff --git a/e2e/tests/up/handles_errors.go b/e2e/tests/up/handles_errors.go index 9ddafeb82c..2a45b80274 100644 --- a/e2e/tests/up/handles_errors.go +++ b/e2e/tests/up/handles_errors.go @@ -32,11 +32,9 @@ var _ = ginkgo.Describe( "make sure devsy output is correct and log-output works correctly", func(ctx context.Context) { f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/up/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/up/testdata/docker", initialDir) - err = f.DevsyProviderAdd(ctx, "docker", "--name", "test-docker") + err := f.DevsyProviderAdd(ctx, "docker", "--name", "test-docker") framework.ExpectNoError(err) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { err := f.DevsyProviderDelete(cleanupCtx, "test-docker") @@ -100,11 +98,10 @@ var _ = ginkgo.Describe( _ = f.DevsyProviderDelete(cleanupCtx, "docker") }) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up/testdata/docker-invalid-bind-mount", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) err = f.DevsyUp(ctx, tempDir, "--debug") @@ -139,11 +136,7 @@ var _ = ginkgo.Describe( _ = f.DevsyProviderDelete(cleanupCtx, "docker") }) - tempDir, err := framework.CopyToTempDir( - "tests/up/testdata/docker-recovery", - ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/up/testdata/docker-recovery", initialDir) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir, "--force") }) diff --git a/e2e/tests/up/microsandbox_session.go b/e2e/tests/up/microsandbox_session.go index 56d4b0205b..8dc13ff7de 100644 --- a/e2e/tests/up/microsandbox_session.go +++ b/e2e/tests/up/microsandbox_session.go @@ -111,10 +111,7 @@ func (s *microsandboxTestSession) newWorkspace() string { } func (s *microsandboxTestSession) copyWorkspace(source string) string { - workspace, err := framework.CopyToTempDir(source) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, s.initialDir, workspace) - return workspace + return framework.CopyTestdata(source, s.initialDir) } func (s *microsandboxTestSession) addProvider(ctx context.Context, source, name string) { diff --git a/e2e/tests/up/provider_docker.go b/e2e/tests/up/provider_docker.go index 1f099747f8..8b8a546b66 100644 --- a/e2e/tests/up/provider_docker.go +++ b/e2e/tests/up/provider_docker.go @@ -46,12 +46,10 @@ var _ = ginkgo.Describe( }, ginkgo.SpecTimeout(framework.TimeoutShort())) ginkgo.It("existing running container", func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, dtc.initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", dtc.initialDir) ginkgo.DeferCleanup(dtc.f.DevsyWorkspaceDelete, tempDir) - err = dtc.dockerHelper.Run( + err := dtc.dockerHelper.Run( ctx, []string{ "run", diff --git a/e2e/tests/up/provider_kubernetes.go b/e2e/tests/up/provider_kubernetes.go index 42570a29f9..1a7893fab3 100644 --- a/e2e/tests/up/provider_kubernetes.go +++ b/e2e/tests/up/provider_kubernetes.go @@ -58,12 +58,10 @@ var _ = ginkgo.Describe( ginkgo.It("runs devsy in Kubernetes", func(ctx context.Context) { f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/up/testdata/kubernetes") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/up/testdata/kubernetes", initialDir) _ = f.DevsyProviderDelete(ctx, "kubernetes") - err = f.DevsyProviderAdd(ctx, "kubernetes", "-o", "KUBERNETES_NAMESPACE=devsy") + err := f.DevsyProviderAdd(ctx, "kubernetes", "-o", "KUBERNETES_NAMESPACE=devsy") framework.ExpectNoError(err) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { err := f.DevsyProviderDelete(cleanupCtx, "kubernetes")