feat: exec multiplexed to return stderr (#1933)

Co-authored-by: Augusto Junior <augusto.junior@vm.co.mz>
testcontainers · Dec 1, 2023 · 927b11b · 927b11b
1 parent 5046458
commit 927b11b
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/docker_exec_test.go b/docker_exec_test.go
@@ -106,6 +106,34 @@ func TestExecWithOptions(t *testing.T) {
 	}
 }
 
+func TestExecWithMultiplexedStderrResponse(t *testing.T) {
+	ctx := context.Background()
+	req := ContainerRequest{
+		Image: nginxAlpineImage,
+	}
+
+	container, err := GenericContainer(ctx, GenericContainerRequest{
+		ProviderType:     providerType,
+		ContainerRequest: req,
+		Started:          true,
+	})
+
+	require.NoError(t, err)
+	terminateContainerOnEnd(t, ctx, container)
+
+	code, reader, err := container.Exec(ctx, []string{"ls", "/non-existing-directory"}, tcexec.Multiplexed())
+	require.NoError(t, err)
+	require.NotZero(t, code)
+	require.NotNil(t, reader)
+
+	b, err := io.ReadAll(reader)
+	require.NoError(t, err)
+	require.NotNil(t, b)
+
+	str := string(b)
+	require.Contains(t, str, "No such file or directory")
+}
+
 func TestExecWithNonMultiplexedResponse(t *testing.T) {
 	ctx := context.Background()
 	req := ContainerRequest{

diff --git a/exec/processor.go b/exec/processor.go
@@ -82,6 +82,10 @@ func Multiplexed() ProcessOption {
 
 		<-done
 
-		opts.Reader = &outBuff
+		if errBuff.Bytes() != nil {
+			opts.Reader = &errBuff
+		} else {
+			opts.Reader = &outBuff
+		}
 	})
 }
diff --git a/modules/compose/go.mod b/modules/compose/go.mod
@@ -129,7 +129,7 @@ require (
 	github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
 	github.com/serialx/hashring v0.0.0-20190422032157-8b2912629002 // indirect
 	github.com/shibumi/go-pathspec v1.3.0 // indirect
-	github.com/shirou/gopsutil/v3 v3.23.9 // indirect
+	github.com/shirou/gopsutil/v3 v3.23.10 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/cobra v1.7.0 // indirect

diff --git a/modules/compose/go.sum b/modules/compose/go.sum
@@ -546,6 +546,7 @@ github.com/shibumi/go-pathspec v1.3.0 h1:QUyMZhFo0Md5B8zV8x2tesohbb5kfbpTi9rBnKh
 github.com/shibumi/go-pathspec v1.3.0/go.mod h1:Xutfslp817l2I1cZvgcfeMQJG5QnU2lh5tVaaMCl3jE=
 github.com/shirou/gopsutil/v3 v3.23.9 h1:ZI5bWVeu2ep4/DIxB4U9okeYJ7zp/QLTO4auRb/ty/E=
 github.com/shirou/gopsutil/v3 v3.23.9/go.mod h1:x/NWSb71eMcjFIO0vhyGW5nZ7oSIgVjrCnADckb85GA=
+github.com/shirou/gopsutil/v3 v3.23.10/go.mod h1:JIE26kpucQi+innVlAUnIEOSBhBUkirr5b44yr55+WE=
 github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=