From a982b63d0f463feecf3c603e9bfddd2f6d850520 Mon Sep 17 00:00:00 2001 From: Samuel K Date: Mon, 19 Oct 2026 05:26:58 -0600 Subject: [PATCH] refactor(e2e): dedupe compose config container lookups --- e2e/tests/up-docker-compose/config.go | 126 ++++++-------------------- e2e/tests/up-docker-compose/helper.go | 16 ++++ 2 files changed, 44 insertions(+), 98 deletions(-) diff --git a/e2e/tests/up-docker-compose/config.go b/e2e/tests/up-docker-compose/config.go index b4033589c2..d4e2ea7460 100644 --- a/e2e/tests/up-docker-compose/config.go +++ b/e2e/tests/up-docker-compose/config.go @@ -45,32 +45,29 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) }) - ginkgo.It("root folder", func(ctx context.Context) { - tempDir, workspace, err := tc.setupAndStartWorkspace( - ctx, + ginkgo.DescribeTable( + "starts workspace from testdata", + func(ctx context.Context, testDataPath string) { + tempDir, workspace, err := tc.setupAndStartWorkspace(ctx, testDataPath) + framework.ExpectNoError(err) + framework.ExpectNoError(tc.verifyWorkspaceMount(ctx, workspace, tempDir)) + }, + ginkgo.Entry( + "root folder", "tests/up-docker-compose/testdata/docker-compose", - ) - framework.ExpectNoError(err) - framework.ExpectNoError(tc.verifyWorkspaceMount(ctx, workspace, tempDir)) - }, ginkgo.SpecTimeout(framework.TimeoutLong())) - - ginkgo.It("sub-folder", func(ctx context.Context) { - tempDir, workspace, err := tc.setupAndStartWorkspace( - ctx, + ginkgo.SpecTimeout(framework.TimeoutLong()), + ), + ginkgo.Entry( + "sub-folder", "tests/up-docker-compose/testdata/docker-compose-subfolder", - ) - framework.ExpectNoError(err) - framework.ExpectNoError(tc.verifyWorkspaceMount(ctx, workspace, tempDir)) - }, ginkgo.SpecTimeout(framework.TimeoutLong())) - - ginkgo.It("overrides", func(ctx context.Context) { - tempDir, workspace, err := tc.setupAndStartWorkspace( - ctx, + ginkgo.SpecTimeout(framework.TimeoutLong()), + ), + ginkgo.Entry( + "overrides", "tests/up-docker-compose/testdata/docker-compose-overrides", - ) - framework.ExpectNoError(err) - framework.ExpectNoError(tc.verifyWorkspaceMount(ctx, workspace, tempDir)) - }, ginkgo.SpecTimeout(framework.TimeoutLong())) + ginkgo.SpecTimeout(framework.TimeoutLong()), + ), + ) ginkgo.It("env-file", func(ctx context.Context) { tempDir, err := setupWorkspace( @@ -89,15 +86,7 @@ var _ = ginkgo.Describe( workspace, err := tc.f.FindWorkspace(ctx, tempDir) framework.ExpectNoError(err) - ids, err := findComposeContainer( - ctx, - tc.dockerHelper, - tc.composeHelper, - workspace.UID, - "app", - ) - framework.ExpectNoError(err) - gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") + tc.expectSingleAppContainer(ctx, workspace) gomega.Expect(devsyUpOutput). NotTo(gomega.ContainSubstring("Defaulting to a blank string.")) }, ginkgo.SpecTimeout(framework.TimeoutLong())) @@ -116,15 +105,7 @@ var _ = ginkgo.Describe( workspace, err := tc.f.FindWorkspace(ctx, tempDir) framework.ExpectNoError(err) - initialIds, err := findComposeContainer( - ctx, - tc.dockerHelper, - tc.composeHelper, - workspace.UID, - "app", - ) - framework.ExpectNoError(err) - gomega.Expect(initialIds).To(gomega.HaveLen(1), "1 compose container to be created") + tc.expectSingleAppContainer(ctx, workspace) err = tc.f.DevsyWorkspaceStop(ctx, tempDir) framework.ExpectNoError(err) @@ -266,15 +247,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - ids, err := findComposeContainer( - ctx, - tc.dockerHelper, - tc.composeHelper, - workspace.UID, - "app", - ) - framework.ExpectNoError(err) - gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") + tc.expectSingleAppContainer(ctx, workspace) err = tc.f.ExecCommand( ctx, @@ -293,15 +266,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - ids, err := findComposeContainer( - ctx, - tc.dockerHelper, - tc.composeHelper, - workspace.UID, - "app", - ) - framework.ExpectNoError(err) - gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") + tc.expectSingleAppContainer(ctx, workspace) err = tc.f.ExecCommand( ctx, @@ -502,15 +467,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - ids, err := findComposeContainer( - ctx, - tc.dockerHelper, - tc.composeHelper, - workspace.UID, - "app", - ) - framework.ExpectNoError(err) - gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") + tc.expectSingleAppContainer(ctx, workspace) err = tc.f.ExecCommand( ctx, @@ -550,18 +507,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - ids, err := findComposeContainer( - ctx, - tc.dockerHelper, - tc.composeHelper, - workspace.UID, - "app", - ) - framework.ExpectNoError(err) - gomega.Expect(ids).To( - gomega.HaveLen(1), - "1 compose container to be created", - ) + tc.expectSingleAppContainer(ctx, workspace) // Verify SET_VAR is set err = tc.f.ExecCommand( @@ -599,15 +545,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - ids, err := findComposeContainer( - ctx, - tc.dockerHelper, - tc.composeHelper, - workspace.UID, - "app", - ) - framework.ExpectNoError(err) - gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") + tc.expectSingleAppContainer(ctx, workspace) err = tc.f.ExecCommand( ctx, @@ -632,15 +570,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - ids, err := findComposeContainer( - ctx, - tc.dockerHelper, - tc.composeHelper, - workspace.UID, - "app", - ) - framework.ExpectNoError(err) - gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") + tc.expectSingleAppContainer(ctx, workspace) devContainerID, err := tc.f.DevsySSH(ctx, tempDir, "cat $HOME/dev-container-id.out") framework.ExpectNoError(err) diff --git a/e2e/tests/up-docker-compose/helper.go b/e2e/tests/up-docker-compose/helper.go index df899b4afa..b1c8f11fea 100644 --- a/e2e/tests/up-docker-compose/helper.go +++ b/e2e/tests/up-docker-compose/helper.go @@ -115,6 +115,22 @@ func (tc *testContext) getAppContainer( return tc.inspectContainer(ctx, ids) } +func (tc *testContext) expectSingleAppContainer( + ctx context.Context, + workspace *provider2.Workspace, +) []string { + ids, err := findComposeContainer( + ctx, + tc.dockerHelper, + tc.composeHelper, + workspace.UID, + "app", + ) + framework.ExpectNoError(err) + gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") + return ids +} + func (tc *testContext) findAppAndSidecar( ctx context.Context, workspaceUID string,