diff --git a/e2e/tests/up-docker-compose/config.go b/e2e/tests/up-docker-compose/config.go index 0fbab36b8e..b4033589c2 100644 --- a/e2e/tests/up-docker-compose/config.go +++ b/e2e/tests/up-docker-compose/config.go @@ -642,19 +642,19 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") - devContainerID, err := tc.execSSH(ctx, tempDir, "cat $HOME/dev-container-id.out") + devContainerID, err := tc.f.DevsySSH(ctx, tempDir, "cat $HOME/dev-container-id.out") framework.ExpectNoError(err) gomega.Expect(devContainerID).NotTo(gomega.BeEmpty()) - containerEnvPath, err := tc.execSSH(ctx, tempDir, "cat $HOME/container-env-path.out") + containerEnvPath, err := tc.f.DevsySSH(ctx, tempDir, "cat $HOME/container-env-path.out") framework.ExpectNoError(err) gomega.Expect(containerEnvPath).To(gomega.ContainSubstring("/usr/local/bin")) - localEnvHome, err := tc.execSSH(ctx, tempDir, "cat $HOME/local-env-home.out") + localEnvHome, err := tc.f.DevsySSH(ctx, tempDir, "cat $HOME/local-env-home.out") framework.ExpectNoError(err) gomega.Expect(localEnvHome).To(gomega.Equal(os.Getenv("HOME"))) - localWorkspaceFolder, err := tc.execSSH( + localWorkspaceFolder, err := tc.f.DevsySSH( ctx, tempDir, "cat $HOME/local-workspace-folder.out", @@ -663,7 +663,7 @@ var _ = ginkgo.Describe( gomega.Expect(framework.CleanString(localWorkspaceFolder)). To(gomega.Equal(framework.CleanString(tempDir))) - localWorkspaceFolderBasename, err := tc.execSSH( + localWorkspaceFolderBasename, err := tc.f.DevsySSH( ctx, tempDir, "cat $HOME/local-workspace-folder-basename.out", @@ -671,7 +671,7 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) gomega.Expect(localWorkspaceFolderBasename).To(gomega.Equal(filepath.Base(tempDir))) - containerWorkspaceFolder, err := tc.execSSH( + containerWorkspaceFolder, err := tc.f.DevsySSH( ctx, tempDir, "cat $HOME/container-workspace-folder.out", @@ -679,7 +679,7 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) gomega.Expect(containerWorkspaceFolder).To(gomega.Equal("/workspaces")) - containerWorkspaceFolderBasename, err := tc.execSSH( + containerWorkspaceFolderBasename, err := tc.f.DevsySSH( ctx, tempDir, "cat $HOME/container-workspace-folder-basename.out", diff --git a/e2e/tests/up-docker-compose/helper.go b/e2e/tests/up-docker-compose/helper.go index 9da8787c14..df899b4afa 100644 --- a/e2e/tests/up-docker-compose/helper.go +++ b/e2e/tests/up-docker-compose/helper.go @@ -38,10 +38,6 @@ type baseTestContext struct { initialDir string } -func (btc *baseTestContext) execSSH(ctx context.Context, tempDir, command string) (string, error) { - return btc.f.DevsySSH(ctx, tempDir, command) -} - func (btc *baseTestContext) inspectContainer( ctx context.Context, ids []string, diff --git a/e2e/tests/up-docker-compose/up_docker_compose.go b/e2e/tests/up-docker-compose/up_docker_compose.go index aa97657235..b2a12657e2 100644 --- a/e2e/tests/up-docker-compose/up_docker_compose.go +++ b/e2e/tests/up-docker-compose/up_docker_compose.go @@ -138,10 +138,10 @@ var _ = ginkgo.Describe( checkFile := `if [ -f /run/devsy/secrets-env/COMPOSE_SESSION_SECRET ]; then ` + `if [ "$(cat /run/devsy/secrets-env/COMPOSE_SESSION_SECRET)" = sentinel-compose-late-secret ]; ` + `then printf file-attached; else printf file-other; fi; else printf file-absent; fi` - out, err := tc.execSSH(ctx, tempDir, checkFile) + out, err := tc.f.DevsySSH(ctx, tempDir, checkFile) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("file-attached")) - out, err = tc.execSSH( + out, err = tc.f.DevsySSH( ctx, tempDir, `case "$COMPOSE_SESSION_SECRET" in `+ @@ -150,7 +150,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("attached")) - mode, err := tc.execSSH( + mode, err := tc.f.DevsySSH( ctx, tempDir, "stat -c %a /run/devsy/secrets-env/COMPOSE_SESSION_SECRET", @@ -217,7 +217,7 @@ var _ = ginkgo.Describe( return mount.Destination == composeFileSecretsDir && mount.Type == "tmpfs" }, ))) - out, err := tc.execSSH( + out, err := tc.f.DevsySSH( ctx, tempDir, "if [ -s /run/secrets/missing_app_secret ]; then printf present; else printf absent; fi", @@ -273,13 +273,13 @@ var _ = ginkgo.Describe( checkStored := `if [ -f /run/devsy/secrets-env/COMPOSE_SESSION_SECRET ] && ` + `[ "$(cat /run/devsy/secrets-env/COMPOSE_SESSION_SECRET)" = sentinel-compose-secret ]; ` + `then printf present; else printf absent; fi` - out, err := tc.execSSH(ctx, tempDir, checkStored) + out, err := tc.f.DevsySSH(ctx, tempDir, checkStored) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("present")) checkPresent := `if [ "$COMPOSE_SESSION_SECRET" = sentinel-compose-secret ]; ` + `then printf present; else printf absent; fi` - out, err = tc.execSSH(ctx, tempDir, checkPresent) + out, err = tc.f.DevsySSH(ctx, tempDir, checkPresent) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("present")) @@ -294,7 +294,7 @@ var _ = ginkgo.Describe( } gomega.Expect(sessionMount).NotTo(gomega.BeNil()) gomega.Expect(sessionMount.Type).To(gomega.Equal(mount.TypeTmpfs)) - mode, err := tc.execSSH(ctx, tempDir, "stat -c %a /run/devsy/secrets-env") + mode, err := tc.f.DevsySSH(ctx, tempDir, "stat -c %a /run/devsy/secrets-env") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(mode)).To(gomega.Equal("700")) @@ -306,7 +306,7 @@ var _ = ginkgo.Describe( checkDetached := `case "$COMPOSE_SESSION_SECRET" in ` + `sentinel-compose-secret) printf attached;; base-value) printf base;; ` + `'') printf absent;; *) printf other;; esac` - out, err = tc.execSSH(ctx, tempDir, checkDetached) + out, err = tc.f.DevsySSH(ctx, tempDir, checkDetached) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("base")) @@ -342,7 +342,7 @@ var _ = ginkgo.Describe( return mount.Destination == composeFileSecretsDir && mount.Type == "tmpfs" }, ))) - out, err = tc.execSSH( + out, err = tc.f.DevsySSH( ctx, tempDir, `if [ "$(cat /run/secrets/compose_file_secret)" = sentinel-compose-file-secret ]; `+ @@ -400,11 +400,11 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - foo, err := tc.execSSH(ctx, tempDir, "cat $HOME/mnt1/foo.txt") + foo, err := tc.f.DevsySSH(ctx, tempDir, "cat $HOME/mnt1/foo.txt") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(foo)).To(gomega.Equal("BAR")) - bar, err := tc.execSSH(ctx, tempDir, "cat $HOME/mnt2/bar.txt") + bar, err := tc.f.DevsySSH(ctx, tempDir, "cat $HOME/mnt2/bar.txt") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(bar)).To(gomega.Equal("FOO")) }, ginkgo.SpecTimeout(framework.TimeoutLong())) @@ -427,11 +427,11 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") - seed, err := tc.execSSH(ctx, tempDir, "cat /home/vscode/mnt-ro/seed.txt") + seed, err := tc.f.DevsySSH(ctx, tempDir, "cat /home/vscode/mnt-ro/seed.txt") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(seed)).To(gomega.Equal("SEED")) - opts, err := tc.execSSH( + opts, err := tc.f.DevsySSH( ctx, tempDir, "findmnt -n -T /home/vscode/mnt-ro -o OPTIONS", @@ -460,7 +460,7 @@ var _ = ginkgo.Describe( "writing to a readonly bind mount must fail", ) - fsType, err := tc.execSSH( + fsType, err := tc.f.DevsySSH( ctx, tempDir, "findmnt -n -T /home/vscode/scratch -o FSTYPE", @@ -471,7 +471,7 @@ var _ = ginkgo.Describe( "tmpfs mount should report fstype tmpfs", ) - tmpfsSize, err := tc.execSSH( + tmpfsSize, err := tc.f.DevsySSH( ctx, tempDir, "findmnt -n -T /home/vscode/scratch -o SIZE", @@ -639,7 +639,7 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") - vclusterVersionOutput, err := tc.execSSH(ctx, tempDir, "vcluster --version") + vclusterVersionOutput, err := tc.f.DevsySSH(ctx, tempDir, "vcluster --version") framework.ExpectNoError(err) gomega.Expect(vclusterVersionOutput). To(gomega.ContainSubstring("vcluster version 0.24.1")) @@ -660,7 +660,7 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) for _, marker := range []string{"base-feature-installed", "overlay-feature-installed"} { - _, err = tc.execSSH(ctx, tempDir, "test -f /tmp/"+marker) + _, err = tc.f.DevsySSH(ctx, tempDir, "test -f /tmp/"+marker) framework.ExpectNoError(err) } @@ -705,10 +705,14 @@ var _ = ginkgo.Describe( } gomega.Expect(workspaceMountSource).To(gomega.Equal(expectedWorkspaceMountSource)) - initMarker, err := tc.execSSH(ctx, tempDir, "cat /workspaces/overlay-init-marker") + initMarker, err := tc.f.DevsySSH( + ctx, + tempDir, + "cat /workspaces/overlay-init-marker", + ) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(initMarker)).To(gomega.Equal("overlay-init-ran")) - sidecarMarker, err := tc.execSSH(ctx, tempDir, "cat /workspaces/sidecar-marker") + sidecarMarker, err := tc.f.DevsySSH(ctx, tempDir, "cat /workspaces/sidecar-marker") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(sidecarMarker)).To(gomega.Equal("sidecar-started")) @@ -736,7 +740,7 @@ var _ = ginkgo.Describe( gomega.Expect(stdout + "\n" + stderr).To(gomega.ContainSubstring("--recreate")) // A rejected config change must leave the selected app and sidecar running. - initMarker, err = tc.execSSH(ctx, tempDir, "cat /workspaces/overlay-init-marker") + initMarker, err = tc.f.DevsySSH(ctx, tempDir, "cat /workspaces/overlay-init-marker") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(initMarker)).To(gomega.Equal("overlay-init-ran")) appIDs, err = findComposeContainer( @@ -771,7 +775,11 @@ var _ = ginkgo.Describe( alternate, err := tc.inspectContainer(ctx, alternateIDs) framework.ExpectNoError(err) gomega.Expect(alternate.State.Running).To(gomega.BeTrue()) - alternateMarker, err := tc.execSSH(ctx, tempDir, "cat /workspaces/alternate-marker") + alternateMarker, err := tc.f.DevsySSH( + ctx, + tempDir, + "cat /workspaces/alternate-marker", + ) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(alternateMarker)). To(gomega.Equal("alternate-started")) @@ -780,7 +788,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) gomega.Expect(sidecarIDs).To(gomega.HaveLen(1)) - sidecarMarker, err = tc.execSSH(ctx, tempDir, "cat /workspaces/sidecar-marker") + sidecarMarker, err = tc.f.DevsySSH(ctx, tempDir, "cat /workspaces/sidecar-marker") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(sidecarMarker)).To(gomega.Equal("sidecar-started")) @@ -852,7 +860,11 @@ var _ = ginkgo.Describe( // Leave the malformed overlay in place so deferred workspace cleanup // exercises the invocation recorded at successful creation. - alternateMarker, err = tc.execSSH(ctx, tempDir, "cat /workspaces/alternate-marker") + alternateMarker, err = tc.f.DevsySSH( + ctx, + tempDir, + "cat /workspaces/alternate-marker", + ) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(alternateMarker)). To(gomega.Equal("alternate-started")) @@ -885,13 +897,13 @@ var _ = ginkgo.Describe( // The "dev" stage overwrites the marker, so seeing "dev-stage" // proves the real multi-stage Dockerfile (and its target) was built. - stageMarker, err := tc.execSSH(ctx, tempDir, "cat /stage-marker.txt") + stageMarker, err := tc.f.DevsySSH(ctx, tempDir, "cat /stage-marker.txt") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(stageMarker)). To(gomega.Equal("dev-stage"), "the requested build target stage should be used") // The feature must still be installed on top of the targeted stage. - vclusterVersionOutput, err := tc.execSSH(ctx, tempDir, "vcluster --version") + vclusterVersionOutput, err := tc.f.DevsySSH(ctx, tempDir, "vcluster --version") framework.ExpectNoError(err) gomega.Expect(vclusterVersionOutput). To(gomega.ContainSubstring("vcluster version 0.24.1")) @@ -938,7 +950,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - ghVersionOutput, err := tc.execSSH(ctx, tempDirA, "gh --version") + ghVersionOutput, err := tc.f.DevsySSH(ctx, tempDirA, "gh --version") framework.ExpectNoError(err) gomega.Expect(ghVersionOutput).To(gomega.ContainSubstring("gh version")) @@ -972,12 +984,12 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - nodeVersionOutput, err := tc.execSSH(ctx, tempDirB, "node --version") + nodeVersionOutput, err := tc.f.DevsySSH(ctx, tempDirB, "node --version") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(nodeVersionOutput)). To(gomega.MatchRegexp(`^v\d+\.`)) - ghLookupOutput, err := tc.execSSH( + ghLookupOutput, err := tc.f.DevsySSH( ctx, tempDirB, fmt.Sprintf("sh -lc %q", commandPresenceCheck("gh")), @@ -991,7 +1003,7 @@ var _ = ginkgo.Describe( gomega.Expect(imageIDAfterB). To(gomega.Equal(initialImageID), "shared image tag should stay unchanged after project B") - nodeLookupOutput, err := tc.execSSH( + nodeLookupOutput, err := tc.f.DevsySSH( ctx, tempDirA, fmt.Sprintf("sh -lc %q", commandPresenceCheck("node")), @@ -1032,11 +1044,11 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) gomega.Expect(initializeCommand).To(gomega.ContainSubstring("initializeCommand")) - onCreateCommand, err := tc.execSSH(ctx, tempDir, "cat $HOME/on-create-command.out") + onCreateCommand, err := tc.f.DevsySSH(ctx, tempDir, "cat $HOME/on-create-command.out") framework.ExpectNoError(err) gomega.Expect(onCreateCommand).To(gomega.ContainSubstring("onCreateCommand")) - updateContentCommand, err := tc.execSSH( + updateContentCommand, err := tc.f.DevsySSH( ctx, tempDir, "cat $HOME/update-content-command.out", @@ -1044,15 +1056,23 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) gomega.Expect(updateContentCommand).To(gomega.Equal("updateContentCommand")) - postCreateCommand, err := tc.execSSH(ctx, tempDir, "cat $HOME/post-create-command.out") + postCreateCommand, err := tc.f.DevsySSH( + ctx, + tempDir, + "cat $HOME/post-create-command.out", + ) framework.ExpectNoError(err) gomega.Expect(postCreateCommand).To(gomega.Equal("postCreateCommand")) - postStartCommand, err := tc.execSSH(ctx, tempDir, "cat $HOME/post-start-command.out") + postStartCommand, err := tc.f.DevsySSH(ctx, tempDir, "cat $HOME/post-start-command.out") framework.ExpectNoError(err) gomega.Expect(postStartCommand).To(gomega.Equal("postStartCommand")) - postAttachCommand, err := tc.execSSH(ctx, tempDir, "cat $HOME/post-attach-command.out") + postAttachCommand, err := tc.f.DevsySSH( + ctx, + tempDir, + "cat $HOME/post-attach-command.out", + ) framework.ExpectNoError(err) gomega.Expect(postAttachCommand).To(gomega.Equal("postAttachCommand")) }, ginkgo.SpecTimeout(framework.TimeoutLong())) @@ -1082,11 +1102,11 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") - parallelA, err := tc.execSSH(ctx, tempDir, "cat $HOME/parallel-a.out") + parallelA, err := tc.f.DevsySSH(ctx, tempDir, "cat $HOME/parallel-a.out") framework.ExpectNoError(err) gomega.Expect(parallelA).To(gomega.Equal("parallelA")) - parallelB, err := tc.execSSH(ctx, tempDir, "cat $HOME/parallel-b.out") + parallelB, err := tc.f.DevsySSH(ctx, tempDir, "cat $HOME/parallel-b.out") framework.ExpectNoError(err) gomega.Expect(parallelB).To(gomega.Equal("parallelB")) }, ginkgo.SpecTimeout(framework.TimeoutLong())) @@ -1116,7 +1136,7 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") - quotedTest, err := tc.execSSH(ctx, tempDir, "cat $HOME/quoted-test.out") + quotedTest, err := tc.f.DevsySSH(ctx, tempDir, "cat $HOME/quoted-test.out") framework.ExpectNoError(err) gomega.Expect(quotedTest).To(gomega.Equal("quoted value")) }, ginkgo.SpecTimeout(framework.TimeoutLong())) @@ -1233,7 +1253,7 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") - buildArgs, err := tc.execSSH(ctx, tempDir, "cat /build-args.txt") + buildArgs, err := tc.f.DevsySSH(ctx, tempDir, "cat /build-args.txt") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(buildArgs)). To(gomega.Equal("ghcr.io/devsy-org/test-images/go:1")) @@ -1257,7 +1277,7 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created") - buildArgs, err := tc.execSSH(ctx, tempDir, "cat /build-args.txt") + buildArgs, err := tc.f.DevsySSH(ctx, tempDir, "cat /build-args.txt") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(buildArgs)). To(gomega.Equal("ghcr.io/devsy-org/test-images/go:1")) diff --git a/e2e/tests/up/helper.go b/e2e/tests/up/helper.go index d610338d22..9d57a52422 100644 --- a/e2e/tests/up/helper.go +++ b/e2e/tests/up/helper.go @@ -68,10 +68,6 @@ func (btc *baseTestContext) execSSHCapture( return strings.TrimSpace(output), err } -func (btc *baseTestContext) execSSH(ctx context.Context, tempDir, command string) (string, error) { - return btc.f.DevsySSH(ctx, tempDir, command) -} - type dockerTestContext struct { baseTestContext } @@ -282,7 +278,7 @@ func (dtc *dockerTestContext) verifyContextAttachment( // Intentionally no --env/--secret argument: the context binding is the source. framework.ExpectNoError(dtc.f.DevsyUp(ctx, tempDir)) - out, err := dtc.execSSH( + out, err := dtc.f.DevsySSH( ctx, tempDir, `if [ "$(cat `+tc.checkFile+`)" = expected-value ]; then printf present; else printf absent; fi`, @@ -293,10 +289,10 @@ func (dtc *dockerTestContext) verifyContextAttachment( fileCheck := `if [ -e /run/devsy/secrets-env/` + tc.sessionFile + ` ]; then ` + `stat -c '%U:%a' /run/devsy/secrets-env/` + tc.sessionFile + `; else printf missing; fi` - out, err = dtc.execSSH(ctx, tempDir, fileCheck) + out, err = dtc.f.DevsySSH(ctx, tempDir, fileCheck) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("vscode:600")) - out, err = dtc.execSSH(ctx, tempDir, tc.sessionCheck) + out, err = dtc.f.DevsySSH(ctx, tempDir, tc.sessionCheck) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("present")) } @@ -304,7 +300,7 @@ func (dtc *dockerTestContext) verifyContextAttachment( _, err = dtc.f.ExecCommandOutput(ctx, []string{tc.command, "detach", tc.name}) framework.ExpectNoError(err) framework.ExpectNoError(dtc.f.DevsyUpRecreate(ctx, tempDir)) - out, err = dtc.execSSH( + out, err = dtc.f.DevsySSH( ctx, tempDir, `if [ -s `+tc.checkFile+` ]; then printf present; else printf absent; fi`, @@ -312,7 +308,7 @@ func (dtc *dockerTestContext) verifyContextAttachment( framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("absent")) if tc.sessionCheck != "" { - out, err = dtc.execSSH(ctx, tempDir, tc.sessionCheck) + out, err = dtc.f.DevsySSH(ctx, tempDir, tc.sessionCheck) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("absent")) } diff --git a/e2e/tests/up/provider_docker.go b/e2e/tests/up/provider_docker.go index 15803bc39f..c64e90a1dc 100644 --- a/e2e/tests/up/provider_docker.go +++ b/e2e/tests/up/provider_docker.go @@ -281,7 +281,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "grep ^ID= /etc/os-release") + out, err := dtc.f.DevsySSH(ctx, tempDir, "grep ^ID= /etc/os-release") framework.ExpectNoError(err) framework.ExpectEqual(out, "ID=alpine\n") }, ginkgo.SpecTimeout(framework.TimeoutShort())) @@ -295,7 +295,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "grep ^ID= /etc/os-release") + out, err := dtc.f.DevsySSH(ctx, tempDir, "grep ^ID= /etc/os-release") framework.ExpectNoError(err) framework.ExpectEqual(out, "ID=alpine\n") }, ginkgo.SpecTimeout(framework.TimeoutShort())) @@ -317,16 +317,16 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "bash -l -c 'echo -n $BASE_VAR'") + out, err := dtc.f.DevsySSH(ctx, tempDir, "bash -l -c 'echo -n $BASE_VAR'") framework.ExpectNoError(err) framework.ExpectEqual(out, "base_value") - out, err = dtc.execSSH(ctx, tempDir, "bash -l -c 'echo -n $EXTRA_VAR'") + out, err = dtc.f.DevsySSH(ctx, tempDir, "bash -l -c 'echo -n $EXTRA_VAR'") framework.ExpectNoError(err) framework.ExpectEqual(out, "extra_value") for _, marker := range []string{"base-feature-installed", "overlay-feature-installed"} { - _, err = dtc.execSSH(ctx, tempDir, "test -f /tmp/"+marker) + _, err = dtc.f.DevsySSH(ctx, tempDir, "test -f /tmp/"+marker) framework.ExpectNoError(err) } @@ -350,7 +350,7 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) for _, marker := range []string{"base-feature-installed", "overlay-feature-installed"} { - _, err = dtc.execSSH(ctx, tempDir, "test -f /tmp/"+marker) + _, err = dtc.f.DevsySSH(ctx, tempDir, "test -f /tmp/"+marker) framework.ExpectNoError(err) } }, @@ -372,10 +372,10 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - osRelease, err := dtc.execSSH(ctx, tempDir, "grep '^ID=' /etc/os-release") + osRelease, err := dtc.f.DevsySSH(ctx, tempDir, "grep '^ID=' /etc/os-release") framework.ExpectNoError(err) framework.ExpectEqual(strings.TrimSpace(osRelease), "ID=ubuntu") - generated, err := dtc.execSSH(ctx, tempDir, "cat /tmp/overlay-build-input.txt") + generated, err := dtc.f.DevsySSH(ctx, tempDir, "cat /tmp/overlay-build-input.txt") framework.ExpectNoError(err) framework.ExpectEqual(strings.TrimSpace(generated), "generated-by-overlay-init") }, @@ -393,7 +393,7 @@ var _ = ginkgo.Describe( err = dtc.f.DevsyUp(ctx, tempDir, names.Flag(names.DevContainerOverlay), overlayPath) framework.ExpectNoError(err) - osRelease, err := dtc.execSSH(ctx, tempDir, "grep '^ID=' /etc/os-release") + osRelease, err := dtc.f.DevsySSH(ctx, tempDir, "grep '^ID=' /etc/os-release") framework.ExpectNoError(err) framework.ExpectEqual(strings.TrimSpace(osRelease), "ID=alpine") @@ -408,7 +408,7 @@ var _ = ginkgo.Describe( ) gomega.Expect(err).To(gomega.HaveOccurred()) gomega.Expect(stdout + "\n" + stderr).To(gomega.ContainSubstring("--recreate")) - osRelease, err = dtc.execSSH(ctx, tempDir, "grep '^ID=' /etc/os-release") + osRelease, err = dtc.f.DevsySSH(ctx, tempDir, "grep '^ID=' /etc/os-release") framework.ExpectNoError(err) framework.ExpectEqual(strings.TrimSpace(osRelease), "ID=alpine") @@ -420,7 +420,7 @@ var _ = ginkgo.Describe( overlayPath, ) framework.ExpectNoError(err) - osRelease, err = dtc.execSSH(ctx, tempDir, "grep '^ID=' /etc/os-release") + osRelease, err = dtc.f.DevsySSH(ctx, tempDir, "grep '^ID=' /etc/os-release") framework.ExpectNoError(err) framework.ExpectEqual(strings.TrimSpace(osRelease), "ID=ubuntu") @@ -434,7 +434,7 @@ var _ = ginkgo.Describe( overlayPath, ) gomega.Expect(err).To(gomega.HaveOccurred()) - osRelease, err = dtc.execSSH(ctx, tempDir, "grep '^ID=' /etc/os-release") + osRelease, err = dtc.f.DevsySSH(ctx, tempDir, "grep '^ID=' /etc/os-release") framework.ExpectNoError(err) framework.ExpectEqual(strings.TrimSpace(osRelease), "ID=ubuntu") }, ginkgo.SpecTimeout(framework.TimeoutLong())) @@ -456,7 +456,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "cat /tmp/test-var.out") + out, err := dtc.f.DevsySSH(ctx, tempDir, "cat /tmp/test-var.out") framework.ExpectNoError(err) framework.ExpectEqual(strings.TrimSpace(out), "overridden_value") @@ -476,7 +476,7 @@ var _ = ginkgo.Describe( err = dtc.f.DevsyUp(ctx, tempDir) framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "cat $HOME/post-start-count.log") + out, err := dtc.f.DevsySSH(ctx, tempDir, "cat $HOME/post-start-count.log") framework.ExpectNoError(err) lines := strings.Count(strings.TrimSpace(out), "\n") + 1 gomega.Expect(lines).To(gomega.Equal(1), @@ -490,7 +490,7 @@ var _ = ginkgo.Describe( err = dtc.f.DevsyUp(ctx, tempDir) framework.ExpectNoError(err) - out, err = dtc.execSSH(ctx, tempDir, "cat $HOME/post-start-count.log") + out, err = dtc.f.DevsySSH(ctx, tempDir, "cat $HOME/post-start-count.log") framework.ExpectNoError(err) lines = strings.Count(strings.TrimSpace(out), "\n") + 1 gomega.Expect(lines).To(gomega.Equal(2), @@ -553,20 +553,20 @@ var _ = ginkgo.Describe( framework.ExpectNoError(err) // postStartCommand should have completed (runs before result is sent) - out, err := dtc.execSSH(ctx, tempDir, "cat $HOME/post-start.out") + out, err := dtc.f.DevsySSH(ctx, tempDir, "cat $HOME/post-start.out") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("postStartDone"), "postStartCommand should have completed before devsy up returned") - _, err = dtc.execSSH(ctx, tempDir, "cat $HOME/post-attach.out") + _, err = dtc.f.DevsySSH(ctx, tempDir, "cat $HOME/post-attach.out") gomega.Expect(err).To(gomega.HaveOccurred(), "postAttachCommand must still be blocked on the release marker") - _, err = dtc.execSSH(ctx, tempDir, "touch $HOME/release-post-attach") + _, err = dtc.f.DevsySSH(ctx, tempDir, "touch $HOME/release-post-attach") framework.ExpectNoError(err) gomega.Eventually(func() string { - out, err := dtc.execSSH(ctx, tempDir, "cat $HOME/post-attach.out 2>/dev/null") + out, err := dtc.f.DevsySSH(ctx, tempDir, "cat $HOME/post-attach.out 2>/dev/null") if err != nil { return "" } @@ -654,11 +654,11 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - one, err := dtc.execSSH(ctx, tempDir, "cat /tmp/post-create-one.out") + one, err := dtc.f.DevsySSH(ctx, tempDir, "cat /tmp/post-create-one.out") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(one)).To(gomega.Equal("postCreateOne")) - two, err := dtc.execSSH(ctx, tempDir, "cat /tmp/post-create-two.out") + two, err := dtc.f.DevsySSH(ctx, tempDir, "cat /tmp/post-create-two.out") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(two)).To(gomega.Equal("postCreateTwo")) }, @@ -795,11 +795,11 @@ var _ = ginkgo.Describe( err = dtc.f.DevsyUp(ctx, tempDir, "--secrets-file", secretsFile) framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "cat /tmp/secret-check.out") + out, err := dtc.f.DevsySSH(ctx, tempDir, "cat /tmp/secret-check.out") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("test-value-12345")) - out, err = dtc.execSSH(ctx, tempDir, "cat /tmp/another-secret-check.out") + out, err = dtc.f.DevsySSH(ctx, tempDir, "cat /tmp/another-secret-check.out") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("second-secret-42")) }, ginkgo.SpecTimeout(framework.TimeoutShort())) @@ -821,7 +821,7 @@ var _ = ginkgo.Describe( err = dtc.f.DevsyUp(ctx, tempDir, "--secret", "MANAGED_SECRET") framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "cat /tmp/managed-secret-check.out") + out, err := dtc.f.DevsySSH(ctx, tempDir, "cat /tmp/managed-secret-check.out") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("managed-value-99")) }, @@ -848,7 +848,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "cat /tmp/mounted-secret-check.out") + out, err := dtc.f.DevsySSH(ctx, tempDir, "cat /tmp/mounted-secret-check.out") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("mounted-value-77")) }, @@ -880,7 +880,7 @@ var _ = ginkgo.Describe( ginkgo.DeferCleanup(dtc.f.DevsyWorkspaceDelete, tempDir) framework.ExpectNoError(dtc.f.DevsyUp(ctx, tempDir)) - uid, err := dtc.execSSH(ctx, tempDir, `printf %s "$DEVSY_WORKSPACE_UID"`) + uid, err := dtc.f.DevsySSH(ctx, tempDir, `printf %s "$DEVSY_WORKSPACE_UID"`) framework.ExpectNoError(err) workspace := &provider2.Workspace{UID: strings.TrimSpace(uid)} ids, err := dtc.findWorkspaceContainer(ctx, workspace) @@ -913,7 +913,7 @@ var _ = ginkgo.Describe( }, ))) - out, err := dtc.execSSH(ctx, tempDir, + out, err := dtc.f.DevsySSH(ctx, tempDir, `if [ "$(cat /run/secrets/late_file_secret)" = sentinel-late-file-secret ]; `+ `then printf present; else printf absent; fi`) framework.ExpectNoError(err) @@ -939,7 +939,7 @@ var _ = ginkgo.Describe( err = dtc.f.DevsyUp(ctx, tempDir, "--env", "MANAGED_ENV") framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "bash -l -c 'echo -n $MANAGED_ENV'") + out, err := dtc.f.DevsySSH(ctx, tempDir, "bash -l -c 'echo -n $MANAGED_ENV'") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("env-value-55")) }, @@ -990,7 +990,7 @@ var _ = ginkgo.Describe( framework.ExpectNoError(dtc.f.DevsyUp( ctx, tempDir, "--workspace-env", "ATTACHED_ENV=custom-value", )) - out, err := dtc.execSSH(ctx, tempDir, `bash -l -c 'printf %s "$ATTACHED_ENV"'`) + out, err := dtc.f.DevsySSH(ctx, tempDir, `bash -l -c 'printf %s "$ATTACHED_ENV"'`) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("custom-value")) @@ -1000,7 +1000,7 @@ var _ = ginkgo.Describe( "--workspace-env", "ATTACHED_ENV=custom-value", )) - out, err = dtc.execSSH(ctx, tempDir, `bash -l -c 'printf %s "$ATTACHED_ENV"'`) + out, err = dtc.f.DevsySSH(ctx, tempDir, `bash -l -c 'printf %s "$ATTACHED_ENV"'`) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("custom-value")) }, @@ -1047,7 +1047,7 @@ var _ = ginkgo.Describe( ginkgo.DeferCleanup(dtc.f.DevsyWorkspaceDelete, tempDir) framework.ExpectNoError(dtc.f.DevsyUp(ctx, tempDir)) - uid, err := dtc.execSSH(ctx, tempDir, `printf %s "$DEVSY_WORKSPACE_UID"`) + uid, err := dtc.f.DevsySSH(ctx, tempDir, `printf %s "$DEVSY_WORKSPACE_UID"`) framework.ExpectNoError(err) workspace := &provider2.Workspace{UID: strings.TrimSpace(uid)} ids, err := dtc.findWorkspaceContainer(ctx, workspace) @@ -1086,14 +1086,14 @@ var _ = ginkgo.Describe( }, ))) - out, err := dtc.execSSH(ctx, tempDir, + out, err := dtc.f.DevsySSH(ctx, tempDir, `if [ -f /run/devsy/secrets-env/ATTACHED_SECRET ]; then `+ `if [ "$(cat /run/devsy/secrets-env/ATTACHED_SECRET)" = `+ `sentinel-late-secret ]; then printf file-attached; else printf file-other; fi; `+ `else printf file-absent; fi`) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("file-attached")) - out, err = dtc.execSSH( + out, err = dtc.f.DevsySSH( ctx, tempDir, `case "$ATTACHED_SECRET" in `+ @@ -1102,7 +1102,7 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("attached")) - mode, err := dtc.execSSH( + mode, err := dtc.f.DevsySSH( ctx, tempDir, "stat -c %a /run/devsy/secrets-env/ATTACHED_SECRET", @@ -1133,7 +1133,7 @@ var _ = ginkgo.Describe( ctx, tempDir, "--secret", "SESSION_SCOPE_SECRET", )) checkExplicitAbsent := `if [ -z "$SESSION_SCOPE_SECRET" ]; then printf absent; else printf present; fi` - out, err := dtc.execSSH(ctx, tempDir, checkExplicitAbsent) + out, err := dtc.f.DevsySSH(ctx, tempDir, checkExplicitAbsent) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("absent")) @@ -1141,7 +1141,7 @@ var _ = ginkgo.Describe( ctx, tempDir, "--secrets-file", secretsFile, )) checkFileAbsent := `if [ -z "$SESSION_FILE_SECRET" ]; then printf absent; else printf present; fi` - out, err = dtc.execSSH(ctx, tempDir, checkFileAbsent) + out, err = dtc.f.DevsySSH(ctx, tempDir, checkFileAbsent) framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(out)).To(gomega.Equal("absent")) }, @@ -1159,7 +1159,7 @@ var _ = ginkgo.Describe( err = dtc.f.DevsyUp(ctx, tempDir, names.Flag(names.DevContainer), "id:python") framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "bash -l -c 'echo -n $DEVCONTAINER_TYPE'") + out, err := dtc.f.DevsySSH(ctx, tempDir, "bash -l -c 'echo -n $DEVCONTAINER_TYPE'") framework.ExpectNoError(err) framework.ExpectEqual(out, "python") @@ -1169,7 +1169,7 @@ var _ = ginkgo.Describe( err = dtc.f.DevsyUp(ctx, tempDir, names.Flag(names.DevContainer), "id:go") framework.ExpectNoError(err) - out, err = dtc.execSSH(ctx, tempDir, "bash -l -c 'echo -n $DEVCONTAINER_TYPE'") + out, err = dtc.f.DevsySSH(ctx, tempDir, "bash -l -c 'echo -n $DEVCONTAINER_TYPE'") framework.ExpectNoError(err) framework.ExpectEqual(out, "go") diff --git a/e2e/tests/up/sops.go b/e2e/tests/up/sops.go index f80f3e492e..6b2244c55d 100644 --- a/e2e/tests/up/sops.go +++ b/e2e/tests/up/sops.go @@ -63,11 +63,11 @@ var _ = ginkgo.Describe( ) framework.ExpectNoError(err) - envValue, err := dtc.execSSH(ctx, tempDir, "cat /tmp/sops-env-check.out") + envValue, err := dtc.f.DevsySSH(ctx, tempDir, "cat /tmp/sops-env-check.out") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(envValue)).To(gomega.Equal(sopsE2EPlaintext)) - mountValue, err := dtc.execSSH(ctx, tempDir, "cat /tmp/sops-mount-check.out") + mountValue, err := dtc.f.DevsySSH(ctx, tempDir, "cat /tmp/sops-mount-check.out") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(mountValue)).To(gomega.Equal(sopsE2EMounted)) }, @@ -88,7 +88,7 @@ var _ = ginkgo.Describe( err = dtc.f.DevsyUp(ctx, tempDir) framework.ExpectNoError(err) - value, err := dtc.execSSH(ctx, tempDir, "cat /tmp/sops-project-check.out") + value, err := dtc.f.DevsySSH(ctx, tempDir, "cat /tmp/sops-project-check.out") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(value)).To(gomega.Equal(sopsE2EPlaintext)) }, @@ -123,7 +123,7 @@ var _ = ginkgo.Describe( err = dtc.f.DevsyUp(ctx, gitURI) framework.ExpectNoError(err) - value, err := dtc.execSSH(ctx, tempDir, "cat /tmp/sops-project-check.out") + value, err := dtc.f.DevsySSH(ctx, tempDir, "cat /tmp/sops-project-check.out") framework.ExpectNoError(err) gomega.Expect(strings.TrimSpace(value)).To(gomega.Equal(sopsE2EPlaintext)) }, diff --git a/e2e/tests/up/up_behaviors.go b/e2e/tests/up/up_behaviors.go index 33ef8dd9be..39e08fa840 100644 --- a/e2e/tests/up/up_behaviors.go +++ b/e2e/tests/up/up_behaviors.go @@ -135,7 +135,7 @@ var _ = ginkgo.Describe("up command behaviors", ginkgo.Label("up-behaviors"), fu names.Flag(names.UpdateRemoteUserUID), "off") framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "id -u") + out, err := dtc.f.DevsySSH(ctx, tempDir, "id -u") framework.ExpectNoError(err) gomega.Expect(out).NotTo(gomega.BeEmpty()) }, ginkgo.SpecTimeout(framework.TimeoutShort())) @@ -349,7 +349,7 @@ var _ = ginkgo.Describe("up command behaviors", ginkgo.Label("up-behaviors"), fu ) framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "ls ~/.file*") + out, err := dtc.f.DevsySSH(ctx, tempDir, "ls ~/.file*") framework.ExpectNoError(err) framework.ExpectEqual( out, @@ -368,7 +368,7 @@ var _ = ginkgo.Describe("up command behaviors", ginkgo.Label("up-behaviors"), fu ) framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "ls /tmp/worked") + out, err := dtc.f.DevsySSH(ctx, tempDir, "ls /tmp/worked") framework.ExpectNoError(err) framework.ExpectEqual(out, "/tmp/worked\n") }, ginkgo.SpecTimeout(framework.TimeoutShort())) @@ -382,7 +382,7 @@ var _ = ginkgo.Describe("up command behaviors", ginkgo.Label("up-behaviors"), fu ) framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "ls ~/.file*") + out, err := dtc.f.DevsySSH(ctx, tempDir, "ls ~/.file*") framework.ExpectNoError(err) framework.ExpectEqual( out, @@ -399,7 +399,7 @@ var _ = ginkgo.Describe("up command behaviors", ginkgo.Label("up-behaviors"), fu ) framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "cat ~/.branch_test") + out, err := dtc.f.DevsySSH(ctx, tempDir, "cat ~/.branch_test") framework.ExpectNoError(err) framework.ExpectEqual(out, "test\n") }, ginkgo.SpecTimeout(framework.TimeoutShort())) @@ -415,10 +415,10 @@ var _ = ginkgo.Describe("up command behaviors", ginkgo.Label("up-behaviors"), fu ) framework.ExpectNoError(err) - _, err = dtc.execSSH(ctx, tempDir, "test -f /tmp/worked") + _, err = dtc.f.DevsySSH(ctx, tempDir, "test -f /tmp/worked") framework.ExpectNoError(err) - out, err := dtc.execSSH(ctx, tempDir, "cat /tmp/lifecycle-order.log") + out, err := dtc.f.DevsySSH(ctx, tempDir, "cat /tmp/lifecycle-order.log") framework.ExpectNoError(err) lines := strings.Split(strings.TrimSpace(out), "\n")