From 21f44596da363c75750da4f2664a2f7464135a83 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Tue, 13 Oct 2026 23:02:05 -0600 Subject: [PATCH] refactor(e2e): call framework.SetupDockerProvider directly The per-package setupDockerProvider wrappers in e2e/tests/up, up-features and up-docker-compose only forwarded to framework.SetupDockerProvider. Remove them and call the framework function at each site. up-docker-compose passes "docker" explicitly where the wrapper implied it. Behaviour is unchanged. --- e2e/tests/up-docker-compose/build.go | 2 +- e2e/tests/up-docker-compose/config.go | 5 +- e2e/tests/up-docker-compose/helper.go | 4 -- .../up-docker-compose/recreate_lifecycle.go | 2 +- .../up-docker-compose/up_docker_compose.go | 2 +- e2e/tests/up-features/helper.go | 7 --- e2e/tests/up-features/up_features.go | 50 +++++++++---------- e2e/tests/up-features/wsl.go | 4 +- e2e/tests/up/docker_wsl.go | 2 +- e2e/tests/up/dockerfile_build.go | 2 +- e2e/tests/up/git_repositories.go | 4 +- e2e/tests/up/handles_errors.go | 8 +-- e2e/tests/up/helper.go | 4 -- e2e/tests/up/podman_rootful.go | 2 +- e2e/tests/up/provider_docker.go | 5 +- .../up/provider_podman_rootless_basic.go | 2 +- .../up/provider_podman_rootless_config.go | 2 +- e2e/tests/up/provider_podman_rootless_exec.go | 2 +- .../up/provider_podman_rootless_features.go | 2 +- .../up/provider_podman_rootless_lifecycle.go | 2 +- e2e/tests/up/sops.go | 2 +- e2e/tests/up/up.go | 2 +- e2e/tests/up/up_behaviors.go | 2 +- e2e/tests/up/up_private_token.go | 2 +- 24 files changed, 55 insertions(+), 66 deletions(-) diff --git a/e2e/tests/up-docker-compose/build.go b/e2e/tests/up-docker-compose/build.go index 5b798fe317..4da90dcebc 100644 --- a/e2e/tests/up-docker-compose/build.go +++ b/e2e/tests/up-docker-compose/build.go @@ -37,7 +37,7 @@ var _ = ginkgo.Describe( composeHelper, err = compose.NewComposeHelper(dockerHelper) framework.ExpectNoError(err) - f, err = setupDockerProvider(initialDir + "/bin") + f, err = framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) }) diff --git a/e2e/tests/up-docker-compose/config.go b/e2e/tests/up-docker-compose/config.go index 6fb6027168..0fbab36b8e 100644 --- a/e2e/tests/up-docker-compose/config.go +++ b/e2e/tests/up-docker-compose/config.go @@ -41,7 +41,7 @@ var _ = ginkgo.Describe( tc.composeHelper, err = compose.NewComposeHelper(tc.dockerHelper) framework.ExpectNoError(err) - tc.f, err = setupDockerProvider(tc.initialDir + "/bin") + tc.f, err = framework.SetupDockerProvider(tc.initialDir+"/bin", "docker") framework.ExpectNoError(err) }) @@ -859,8 +859,9 @@ var _ = ginkgo.Describe( btc.initialDir, err = os.Getwd() framework.ExpectNoError(err) - btc.f, err = setupDockerProvider( + btc.f, err = framework.SetupDockerProvider( filepath.Join(btc.initialDir, "bin"), + "docker", ) framework.ExpectNoError(err) }) diff --git a/e2e/tests/up-docker-compose/helper.go b/e2e/tests/up-docker-compose/helper.go index 428d7ad665..9da8787c14 100644 --- a/e2e/tests/up-docker-compose/helper.go +++ b/e2e/tests/up-docker-compose/helper.go @@ -183,10 +183,6 @@ func setupWorkspace(testdataPath, initialDir string, f *framework.Framework) (st return tempDir, nil } -func setupDockerProvider(binDir string) (*framework.Framework, error) { - return framework.SetupDockerProvider(binDir, "docker") -} - // findComposeContainer returns the compose container IDs for a workspace's // service, resolving devsy's actual project name first since it may not be // the sanitized workspace UID. diff --git a/e2e/tests/up-docker-compose/recreate_lifecycle.go b/e2e/tests/up-docker-compose/recreate_lifecycle.go index ded846c620..1272ac5e36 100644 --- a/e2e/tests/up-docker-compose/recreate_lifecycle.go +++ b/e2e/tests/up-docker-compose/recreate_lifecycle.go @@ -40,7 +40,7 @@ var _ = ginkgo.Describe( tc.dockerHelper = &docker.DockerHelper{DockerCommand: recreateLifecycleDockerCommand} tc.composeHelper, err = compose.NewComposeHelper(tc.dockerHelper) framework.ExpectNoError(err) - tc.f, err = setupDockerProvider(filepath.Join(tc.initialDir, "bin")) + tc.f, err = framework.SetupDockerProvider(filepath.Join(tc.initialDir, "bin"), "docker") framework.ExpectNoError(err) }) diff --git a/e2e/tests/up-docker-compose/up_docker_compose.go b/e2e/tests/up-docker-compose/up_docker_compose.go index 5beb949d0d..aa97657235 100644 --- a/e2e/tests/up-docker-compose/up_docker_compose.go +++ b/e2e/tests/up-docker-compose/up_docker_compose.go @@ -66,7 +66,7 @@ var _ = ginkgo.Describe( tc.composeHelper, err = compose.NewComposeHelper(tc.dockerHelper) framework.ExpectNoError(err) - tc.f, err = setupDockerProvider(tc.initialDir + "/bin") + tc.f, err = framework.SetupDockerProvider(tc.initialDir+"/bin", "docker") framework.ExpectNoError(err) }) diff --git a/e2e/tests/up-features/helper.go b/e2e/tests/up-features/helper.go index 8c27b0293f..1265a83ba2 100644 --- a/e2e/tests/up-features/helper.go +++ b/e2e/tests/up-features/helper.go @@ -7,8 +7,6 @@ import ( "io" "os" "strings" - - "github.com/devsy-org/devsy/e2e/framework" ) func createTarGzArchive(outputFilePath string, filePaths []string) error { @@ -73,8 +71,3 @@ func addFileToTar(tarWriter *tar.Writer, filePath string) error { _, err = io.Copy(tarWriter, file) return err } - -//nolint:unparam // dockerPath is "podman" for the windows-only caller in wsl.go -func setupDockerProvider(binDir, dockerPath string) (*framework.Framework, error) { - return framework.SetupDockerProvider(binDir, dockerPath) -} diff --git a/e2e/tests/up-features/up_features.go b/e2e/tests/up-features/up_features.go index 85e808e46f..50fa609764 100644 --- a/e2e/tests/up-features/up_features.go +++ b/e2e/tests/up-features/up_features.go @@ -31,7 +31,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( }) ginkgo.It("lifecycle hooks execution", func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir("tests/up-features/testdata/docker-features-hooks") @@ -58,7 +58,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( }, ginkgo.SpecTimeout(framework.TimeoutLong())) ginkgo.It("lifecycle hooks order feature before image", func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -232,7 +232,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( ) ginkgo.It("should install with lifecycle hooks", func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -252,7 +252,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should automatically install dependsOn features", ginkgo.Label("up-features", "depends-on"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -279,7 +279,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should not fail if same feature exists in dependsOn and installsAfter", ginkgo.Label("up-features", "depends-on"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -306,7 +306,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should handle nested dependencies", ginkgo.Label("up-features", "depends-on"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -333,7 +333,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should detect circular dependencies", ginkgo.Label("up-features", "depends-on"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -357,7 +357,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should handle dependsOn with options", ginkgo.Label("up-features", "depends-on"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -384,7 +384,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should handle mixed dependsOn and installsAfter", ginkgo.Label("up-features", "mixed"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -411,7 +411,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should detect self-dependency", ginkgo.Label("up-features", "depends-on"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -434,7 +434,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should handle non-existent dependency gracefully", ginkgo.Label("up-features", "depends-on"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -457,7 +457,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should handle shared dependencies correctly", ginkgo.Label("up-features", "depends-on"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -485,7 +485,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should handle forward reference dependencies", ginkgo.Label("up-features", "depends-on"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -511,7 +511,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should handle same feature in dependsOn and installsAfter", ginkgo.Label("up-features", "depends-on"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -541,7 +541,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "writes a devcontainer lockfile and reuses it under --frozen-lockfile", ginkgo.Label("up-features", "lockfile"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -583,7 +583,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "fails --frozen-lockfile when no lockfile exists", ginkgo.Label("up-features", "lockfile"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -605,7 +605,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "does not write a lockfile with --no-lockfile", ginkgo.Label("up-features", "lockfile"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -630,7 +630,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "honors a committed lockfile and rejects a bogus pinned digest", ginkgo.Label("up-features", "lockfile"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -716,7 +716,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( ) ginkgo.It("resolves user variable in dockerfile", func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -737,7 +737,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( }, ginkgo.SpecTimeout(framework.TimeoutLong())) ginkgo.It("preserves user when feature is present with variable", func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -761,7 +761,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should resolve legacy feature IDs in dependsOn", ginkgo.Label("up-features", "depends-on", "legacy-id"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -788,7 +788,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should reject overrideFeatureInstallOrder that violates dependsOn", ginkgo.Label("up-features", "override"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -810,7 +810,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should respect overrideFeatureInstallOrder when it satisfies dependsOn", ginkgo.Label("up-features", "override"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -836,7 +836,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should install both versions when same feature has different versions", ginkgo.Label("up-features", "version-aware"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( @@ -866,7 +866,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( "should resolve secret options from environment variables", ginkgo.Label("up-features", "secret-option"), func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( diff --git a/e2e/tests/up-features/wsl.go b/e2e/tests/up-features/wsl.go index 4269963a19..1812a2017e 100644 --- a/e2e/tests/up-features/wsl.go +++ b/e2e/tests/up-features/wsl.go @@ -70,7 +70,7 @@ var _ = ginkgo.Describe( ), ) - f, err := setupDockerProvider(filepath.Join(initialDir, "bin"), "podman") + f, err := framework.SetupDockerProvider(filepath.Join(initialDir, "bin"), "podman") framework.ExpectNoError(err) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir) @@ -83,7 +83,7 @@ var _ = ginkgo.Describe( ginkgo.It( "ensure dependencies installed via features are accessible in lifecycle hooks", func(ctx context.Context) { - f, err := setupDockerProvider(filepath.Join(initialDir, "bin"), "podman") + f, err := framework.SetupDockerProvider(filepath.Join(initialDir, "bin"), "podman") framework.ExpectNoError(err) tempDir, err := framework.CopyToTempDir( diff --git a/e2e/tests/up/docker_wsl.go b/e2e/tests/up/docker_wsl.go index 18109612d9..af7cf1dcd9 100644 --- a/e2e/tests/up/docker_wsl.go +++ b/e2e/tests/up/docker_wsl.go @@ -24,7 +24,7 @@ var _ = ginkgo.Describe("testing up command for windows", ginkgo.Label("up-docke initialDir, err = os.Getwd() framework.ExpectNoError(err) dockerHelper = &docker.DockerHelper{DockerCommand: "podman"} - f, err = setupDockerProvider(filepath.Join(initialDir, "bin"), "podman") + f, err = framework.SetupDockerProvider(filepath.Join(initialDir, "bin"), "podman") framework.ExpectNoError(err) }) diff --git a/e2e/tests/up/dockerfile_build.go b/e2e/tests/up/dockerfile_build.go index ef7d6614c1..fd04e5345f 100644 --- a/e2e/tests/up/dockerfile_build.go +++ b/e2e/tests/up/dockerfile_build.go @@ -29,7 +29,7 @@ var _ = ginkgo.Describe( dockerHelper = &docker.DockerHelper{DockerCommand: "docker"} - f, err = setupDockerProvider(initialDir+"/bin", "docker") + f, err = framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) }) diff --git a/e2e/tests/up/git_repositories.go b/e2e/tests/up/git_repositories.go index b48e8d519b..ab18596d7b 100644 --- a/e2e/tests/up/git_repositories.go +++ b/e2e/tests/up/git_repositories.go @@ -24,7 +24,7 @@ var _ = ginkgo.Describe( ginkgo.It( "should allow checkout of a GitRepo from a commit hash", func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) name := "sha256-0c1547c" @@ -43,7 +43,7 @@ var _ = ginkgo.Describe( ginkgo.It( "should allow checkout of a GitRepo from a pull request reference", func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) name := "devsy" diff --git a/e2e/tests/up/handles_errors.go b/e2e/tests/up/handles_errors.go index d00b5059fa..9ddafeb82c 100644 --- a/e2e/tests/up/handles_errors.go +++ b/e2e/tests/up/handles_errors.go @@ -72,7 +72,7 @@ var _ = ginkgo.Describe( ginkgo.It( "ensure workspace cleanup when failing to create a workspace", func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyProviderDelete(cleanupCtx, "docker") @@ -94,7 +94,7 @@ var _ = ginkgo.Describe( ginkgo.It( "should fail with error when bind mount source does not exist", func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyProviderDelete(cleanupCtx, "docker") @@ -116,7 +116,7 @@ var _ = ginkgo.Describe( ) ginkgo.It("ensure workspace cleanup when not a git or folder", func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) initialList, err := f.DevsyList(ctx) @@ -133,7 +133,7 @@ var _ = ginkgo.Describe( ginkgo.It( "launches a recovery container after a failed build", func(ctx context.Context) { - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyProviderDelete(cleanupCtx, "docker") diff --git a/e2e/tests/up/helper.go b/e2e/tests/up/helper.go index 2bffb6198d..d610338d22 100644 --- a/e2e/tests/up/helper.go +++ b/e2e/tests/up/helper.go @@ -231,10 +231,6 @@ func setupWorkspace(testdataPath, initialDir string, f *framework.Framework) (st return tempDir, nil } -func setupDockerProvider(binDir, dockerPath string) (*framework.Framework, error) { - return framework.SetupDockerProvider(binDir, dockerPath) -} - func setupWorkspaceAndUp( ctx context.Context, testdataPath, initialDir string, diff --git a/e2e/tests/up/podman_rootful.go b/e2e/tests/up/podman_rootful.go index bc7a4632e1..c0acd18c53 100644 --- a/e2e/tests/up/podman_rootful.go +++ b/e2e/tests/up/podman_rootful.go @@ -390,7 +390,7 @@ func setupRootfulPodman(ctx context.Context, initialDir string) *framework.Frame } } - f, err := setupDockerProvider(initialDir+"/bin", wrapperPath) + f, err := framework.SetupDockerProvider(initialDir+"/bin", wrapperPath) framework.ExpectNoError(err) return f } diff --git a/e2e/tests/up/provider_docker.go b/e2e/tests/up/provider_docker.go index b9611b7042..15803bc39f 100644 --- a/e2e/tests/up/provider_docker.go +++ b/e2e/tests/up/provider_docker.go @@ -34,7 +34,10 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) dtc.dockerHelper = &docker.DockerHelper{DockerCommand: "docker"} - dtc.f, err = setupDockerProvider(filepath.Join(dtc.initialDir, "bin"), "docker") + dtc.f, err = framework.SetupDockerProvider( + filepath.Join(dtc.initialDir, "bin"), + "docker", + ) framework.ExpectNoError(err) }) diff --git a/e2e/tests/up/provider_podman_rootless_basic.go b/e2e/tests/up/provider_podman_rootless_basic.go index 88e5ceefbc..0937d7aaa8 100644 --- a/e2e/tests/up/provider_podman_rootless_basic.go +++ b/e2e/tests/up/provider_podman_rootless_basic.go @@ -27,7 +27,7 @@ var _ = ginkgo.Describe( ginkgo.BeforeEach(func(ctx context.Context) { var err error - f, err = setupDockerProvider(initialDir+"/bin", "podman") + f, err = framework.SetupDockerProvider(initialDir+"/bin", "podman") framework.ExpectNoError(err) }) diff --git a/e2e/tests/up/provider_podman_rootless_config.go b/e2e/tests/up/provider_podman_rootless_config.go index 8d5cc2eca2..fca84fa485 100644 --- a/e2e/tests/up/provider_podman_rootless_config.go +++ b/e2e/tests/up/provider_podman_rootless_config.go @@ -35,7 +35,7 @@ var _ = ginkgo.Describe( ginkgo.BeforeEach(func(ctx context.Context) { var err error - f, err = setupDockerProvider(initialDir+"/bin", "podman") + f, err = framework.SetupDockerProvider(initialDir+"/bin", "podman") framework.ExpectNoError(err) }) diff --git a/e2e/tests/up/provider_podman_rootless_exec.go b/e2e/tests/up/provider_podman_rootless_exec.go index ab6c1f5a77..071416bbb1 100644 --- a/e2e/tests/up/provider_podman_rootless_exec.go +++ b/e2e/tests/up/provider_podman_rootless_exec.go @@ -27,7 +27,7 @@ var _ = ginkgo.Describe( ginkgo.BeforeEach(func(ctx context.Context) { var err error - f, err = setupDockerProvider(initialDir+"/bin", "podman") + f, err = framework.SetupDockerProvider(initialDir+"/bin", "podman") framework.ExpectNoError(err) }) diff --git a/e2e/tests/up/provider_podman_rootless_features.go b/e2e/tests/up/provider_podman_rootless_features.go index cc252231da..272e2c96e4 100644 --- a/e2e/tests/up/provider_podman_rootless_features.go +++ b/e2e/tests/up/provider_podman_rootless_features.go @@ -27,7 +27,7 @@ var _ = ginkgo.Describe( ginkgo.BeforeEach(func(ctx context.Context) { var err error - f, err = setupDockerProvider(initialDir+"/bin", "podman") + f, err = framework.SetupDockerProvider(initialDir+"/bin", "podman") framework.ExpectNoError(err) }) diff --git a/e2e/tests/up/provider_podman_rootless_lifecycle.go b/e2e/tests/up/provider_podman_rootless_lifecycle.go index e0caa0e02b..98158a015f 100644 --- a/e2e/tests/up/provider_podman_rootless_lifecycle.go +++ b/e2e/tests/up/provider_podman_rootless_lifecycle.go @@ -29,7 +29,7 @@ var _ = ginkgo.Describe( ginkgo.BeforeEach(func(ctx context.Context) { var err error - f, err = setupDockerProvider(initialDir+"/bin", "podman") + f, err = framework.SetupDockerProvider(initialDir+"/bin", "podman") framework.ExpectNoError(err) }) diff --git a/e2e/tests/up/sops.go b/e2e/tests/up/sops.go index 2d802d162b..f80f3e492e 100644 --- a/e2e/tests/up/sops.go +++ b/e2e/tests/up/sops.go @@ -34,7 +34,7 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) dtc.dockerHelper = &docker.DockerHelper{DockerCommand: testDockerCommand} - dtc.f, err = setupDockerProvider( + dtc.f, err = framework.SetupDockerProvider( filepath.Join(dtc.initialDir, "bin"), testDockerCommand, ) diff --git a/e2e/tests/up/up.go b/e2e/tests/up/up.go index dc54fdf8aa..157e944db2 100644 --- a/e2e/tests/up/up.go +++ b/e2e/tests/up/up.go @@ -31,7 +31,7 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-workspaces"), fun }) ginkgo.It("with env vars", func(ctx context.Context) { - f, err := setupDockerProvider(filepath.Join(initialDir, "bin"), "docker") + f, err := framework.SetupDockerProvider(filepath.Join(initialDir, "bin"), "docker") framework.ExpectNoError(err) name := "vscode-remote-try-python" diff --git a/e2e/tests/up/up_behaviors.go b/e2e/tests/up/up_behaviors.go index 16cd4ae4f1..33ef8dd9be 100644 --- a/e2e/tests/up/up_behaviors.go +++ b/e2e/tests/up/up_behaviors.go @@ -30,7 +30,7 @@ var _ = ginkgo.Describe("up command behaviors", ginkgo.Label("up-behaviors"), fu framework.ExpectNoError(err) dtc.dockerHelper = &docker.DockerHelper{DockerCommand: testDockerCommand} - dtc.f, err = setupDockerProvider( + dtc.f, err = framework.SetupDockerProvider( filepath.Join(dtc.initialDir, "bin"), testDockerCommand, ) framework.ExpectNoError(err) diff --git a/e2e/tests/up/up_private_token.go b/e2e/tests/up/up_private_token.go index d71a8ab919..3a889c8666 100644 --- a/e2e/tests/up/up_private_token.go +++ b/e2e/tests/up/up_private_token.go @@ -35,7 +35,7 @@ var _ = ginkgo.Describe( credUser = username } - f, err := setupDockerProvider(initialDir+"/bin", "docker") + f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) // Register credential cleanup before writing to ensure cleanup on any failure