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
2 changes: 1 addition & 1 deletion e2e/tests/up-docker-compose/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})

Expand Down
5 changes: 3 additions & 2 deletions e2e/tests/up-docker-compose/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})

Expand Down Expand Up @@ -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)
})
Expand Down
4 changes: 0 additions & 4 deletions e2e/tests/up-docker-compose/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/up-docker-compose/recreate_lifecycle.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})

Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/up-docker-compose/up_docker_compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})

Expand Down
7 changes: 0 additions & 7 deletions e2e/tests/up-features/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import (
"io"
"os"
"strings"

"github.com/devsy-org/devsy/e2e/framework"
)

func createTarGzArchive(outputFilePath string, filePaths []string) error {
Expand Down Expand Up @@ -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)
}
50 changes: 25 additions & 25 deletions e2e/tests/up-features/up_features.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/up-features/wsl.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/up/docker_wsl.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})

Expand Down
2 changes: 1 addition & 1 deletion e2e/tests/up/dockerfile_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})

Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/up/git_repositories.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions e2e/tests/up/handles_errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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)
Expand All @@ -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")
Expand Down
Loading
Loading