chore: add missing error handling and remove unused variables

README.md

@@ -68,7 +68,11 @@ func TestIntegrationNginxLatestReturn(t *testing.T) {
 	}
 
 	// Clean up the container after the test is complete
-	defer nginxC.Terminate(ctx)
+	defer func() {
+		if err := nginxC.terminate(ctx); err != nil {
+			t.Fatalf("failed to terminate container: %w", err)
+		}
+	}()
 
 	resp, err := http.Get(nginxC.URI)
 	if resp.StatusCode != http.StatusOK {

compose_api.go

@@ -25,8 +25,10 @@ func (f stackUpOptionFunc) applyToStackUp(o *stackUpOptions) {
 	f(o)
 }
 
+//nolint:unused
 type stackDownOptionFunc func(do *api.DownOptions)
 
+//nolint:unused
 func (f stackDownOptionFunc) applyToStackDown(do *api.DownOptions) {
 	f(do)
 }
@@ -42,6 +44,7 @@ func RunServices(serviceNames ...string) StackUpOption {
 // IgnoreOrphans - Ignore legacy containers for services that are not defined in the project
 type IgnoreOrphans bool
 
+//nolint:unused
 func (io IgnoreOrphans) applyToStackUp(co *api.CreateOptions, _ *api.StartOptions) {
 	co.IgnoreOrphans = bool(io)
 }

container_test.go

@@ -324,7 +324,7 @@ func Test_BuildImageWithContexts(t *testing.T) {
 			} else if err != nil {
 				t.Fatal(err)
 			} else {
-				c.Terminate(ctx)
+				terminateContainerOnEnd(t, ctx, c)
 			}
 		})
 	}
@@ -346,7 +346,7 @@ func Test_GetLogsFromFailedContainer(t *testing.T) {
 	if err != nil && !errors.Is(err, context.DeadlineExceeded) {
 		t.Fatal(err)
 	} else if err == nil {
-		c.Terminate(ctx)
+		terminateContainerOnEnd(t, ctx, c)
 		t.Fatal("was expecting error starting container")
 	}
 
@@ -396,9 +396,7 @@ func createTestContainer(t *testing.T, ctx context.Context) int {
 		t.Fatalf("could not get mapped port: %v", err)
 	}
 
-	t.Cleanup(func() {
-		container.Terminate(context.Background())
-	})
+	terminateContainerOnEnd(t, ctx, container)
 
 	return port.Int()
 }

docker.go

@@ -295,13 +295,9 @@ func (c *DockerContainer) Logs(ctx context.Context) (io.ReadCloser, error) {
 	r := bufio.NewReader(rc)
 
 	go func() {
-		var (
-			isPrefix    = true
-			lineStarted = true
-			line        []byte
-		)
+		var lineStarted = true
 		for err == nil {
-			line, isPrefix, err = r.ReadLine()
+			line, isPrefix, err := r.ReadLine()
 
 			if lineStarted && len(line) >= streamHeaderSize {
 				line = line[streamHeaderSize:] // trim stream header

docker_test.go

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"log"
 
 	// Import mysql into the scope of this package (required)
 	"io"
@@ -194,7 +195,7 @@ func TestContainerWithHostNetworkOptions_UseExposePortsFromImageConfigs(t *testi
 		t.Fatal(err)
 	}
 
-	defer nginxC.Terminate(ctx)
+	terminateContainerOnEnd(t, ctx, nginxC)
 
 	endpoint, err := nginxC.Endpoint(ctx, "http")
 	if err != nil {
@@ -225,7 +226,7 @@ func TestContainerWithNetworkModeAndNetworkTogether(t *testing.T) {
 		// Error when NetworkMode = host and Network = []string{"bridge"}
 		t.Logf("Can't use Network and NetworkMode together, %s", err)
 	}
-	defer nginx.Terminate(ctx)
+	terminateContainerOnEnd(t, ctx, nginx)
 }
 
 func TestContainerWithHostNetworkOptionsAndWaitStrategy(t *testing.T) {
@@ -636,9 +637,10 @@ func TestContainerTerminationRemovesDockerImage(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
+
 		_, _, err = client.ImageInspectWithRaw(ctx, imageID)
 		if err == nil {
-			t.Fatal("custom built image should have been removed")
+			t.Fatal("custom built image should have been removed", err)
 		}
 	})
 }
@@ -686,6 +688,9 @@ func TestTwoContainersExposingTheSamePort(t *testing.T) {
 	}
 
 	endpointB, err := nginxB.PortEndpoint(ctx, nginxDefaultPort, "http")
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	resp, err = http.Get(endpointB)
 	if err != nil {
@@ -1016,6 +1021,9 @@ func TestContainerCreationWaitsForLog(t *testing.T) {
 		"root", "password", host, port, "database")
 
 	db, err := sql.Open("mysql", connectionString)
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer db.Close()
 
 	if err = db.Ping(); err != nil {
@@ -1719,7 +1727,11 @@ func ExampleDockerProvider_CreateContainer() {
 		ContainerRequest: req,
 		Started:          true,
 	})
-	defer nginxC.Terminate(ctx)
+	defer func() {
+		if err := nginxC.Terminate(ctx); err != nil {
+			log.Fatalf("failed to terminate container: %s", err)
+		}
+	}()
 }
 
 func ExampleContainer_Host() {
@@ -1733,7 +1745,11 @@ func ExampleContainer_Host() {
 		ContainerRequest: req,
 		Started:          true,
 	})
-	defer nginxC.Terminate(ctx)
+	defer func() {
+		if err := nginxC.Terminate(ctx); err != nil {
+			log.Fatalf("failed to terminate container: %s", err)
+		}
+	}()
 	ip, _ := nginxC.Host(ctx)
 	println(ip)
 }
@@ -1748,7 +1764,11 @@ func ExampleContainer_Start() {
 	nginxC, _ := GenericContainer(ctx, GenericContainerRequest{
 		ContainerRequest: req,
 	})
-	defer nginxC.Terminate(ctx)
+	defer func() {
+		if err := nginxC.Terminate(ctx); err != nil {
+			log.Fatalf("failed to terminate container: %s", err)
+		}
+	}()
 	_ = nginxC.Start(ctx)
 }
 
@@ -1762,7 +1782,11 @@ func ExampleContainer_Stop() {
 	nginxC, _ := GenericContainer(ctx, GenericContainerRequest{
 		ContainerRequest: req,
 	})
-	defer nginxC.Terminate(ctx)
+	defer func() {
+		if err := nginxC.Terminate(ctx); err != nil {
+			log.Fatalf("failed to terminate container: %s", err)
+		}
+	}()
 	timeout := 10 * time.Second
 	_ = nginxC.Stop(ctx, &timeout)
 }
@@ -1778,7 +1802,11 @@ func ExampleContainer_MappedPort() {
 		ContainerRequest: req,
 		Started:          true,
 	})
-	defer nginxC.Terminate(ctx)
+	defer func() {
+		if err := nginxC.Terminate(ctx); err != nil {
+			log.Fatalf("failed to terminate container: %s", err)
+		}
+	}()
 	ip, _ := nginxC.Host(ctx)
 	port, _ := nginxC.MappedPort(ctx, "80")
 	_, _ = http.Get(fmt.Sprintf("http://%s:%s", ip, port.Port()))
@@ -1926,11 +1954,7 @@ func TestContainerCustomPlatformImage(t *testing.T) {
 			Started: false,
 		})
 
-		t.Cleanup(func() {
-			if c != nil {
-				c.Terminate(ctx)
-			}
-		})
+		terminateContainerOnEnd(t, ctx, c)
 
 		assert.Error(t, err)
 	})
@@ -2450,7 +2474,7 @@ func TestContainerRunningCheckingStatusCode(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	defer influx.Terminate(ctx)
+	terminateContainerOnEnd(t, ctx, influx)
 }
 
 func TestContainerWithUserID(t *testing.T) {

docs/examples/cockroachdb.md

@@ -94,7 +94,11 @@ func TestIntegrationDBInsertSelect(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer cdbContainer.Terminate(ctx)
+	t.Cleanup(func() {
+		if err := cdbContainer.Terminate(ctx); err != nil {
+			t.Fatalf("failed to terminate container: %s", err)
+		}
+	})
 
 	db, err := sql.Open("pgx", cdbContainer.URI+"/projectmanagement")
 	if err != nil {

docs/examples/nginx.md

@@ -60,7 +60,12 @@ func TestIntegrationNginxLatestReturn(t *testing.T) {
 	}
 
 	// Clean up the container after the test is complete
-	defer nginxC.Terminate(ctx)
+	t.Cleanup(func() {
+		t.Log("terminating container")
+		if err := ctr.Terminate(ctx)); err != nil {
+			t.Errorf("failed to terminate container: :%w", err)
+		}
+	})
 
 	resp, err := http.Get(nginxC.URI)
 	if resp.StatusCode != http.StatusOK {

docs/examples/pulsar.md

@@ -71,7 +71,13 @@ func TestPulsar(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Cleanup(func() { c.Container.Terminate(ctx) })
+	// Cleanup the container after the test is complete
+	t.Cleanup(func() {
+		t.Log("terminating container")
+		if err := ctr.Terminate(ctx)); err != nil {
+			t.Errorf("failed to terminate container: :%w", err)
+		}
+	})
 
 	pc, err := pulsar.NewClient(pulsar.ClientOptions{
 		URL:               c.URI,
@@ -131,4 +137,4 @@ type logConsumer struct{}
 func (lc *logConsumer) Accept(l testcontainers.Log) {
 	fmt.Print(string(l.Content))
 }
-```
+```

docs/examples/redis.md

@@ -64,7 +64,13 @@ func TestIntegrationSetGet(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer redisContainer.Terminate(ctx)
+	// Clean up the container after the test is complete
+	t.Cleanup(func() {
+		t.Log("terminating container")
+		if err := redisContainer.Terminate(ctx)); err != nil {
+			t.Errorf("failed to terminate container: :%w", err)
+		}
+	})
 
 	// You will likely want to wrap your Redis package of choice in an
 	// interface to aid in unit testing and limit lock-in throughtout your

docs/features/creating_container.md

@@ -74,7 +74,11 @@ func TestIntegrationNginxLatestReturn(t *testing.T) {
 	}
 
 	// Clean up the container after the test is complete
-	defer nginxC.Terminate(ctx)
+	t.Cleanup(func() {
+		if err := nginxC.Terminate(ctx); err != nil {
+			t.Fatalf("failed to terminate container: %s", err)
+		}
+	})
 
 	resp, err := http.Get(nginxC.URI)
 	if resp.StatusCode != http.StatusOK {
@@ -193,7 +197,6 @@ func main() {
 	}
 
 	res, err := testcontainers.ParallelContainers(ctx, requests, testcontainers.ParallelContainersOptions{})
-
 	if err != nil {
 		e, ok := err.(testcontainers.ParallelContainersError)
 		if !ok {
@@ -207,7 +210,12 @@ func main() {
 	}
 
 	for _, c := range res {
-		defer c.Terminate(ctx)
+		c := c
+		defer func() {
+			if err := c.Terminate(ctx); err != nil {
+				log.Fatalf("failed to terminate container: %s", c)
+			}
+		}()
 	}
 }
 ```

docs/quickstart/gotest.md

@@ -35,7 +35,11 @@ func TestWithRedis(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	defer redisC.Terminate(ctx)
+	defer func() {
+		if err := redisC.terminate(ctx); err != nil {
+			t.Fatalf("failed to terminate container: %w", err)
+		}
+	}()
 }
 ```
 

e2e/container_test.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/docker/go-connections/nat"
+	"github.com/stretchr/testify/require"
 	. "github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
 
@@ -45,7 +46,7 @@ func TestContainerWithWaitForSQL(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		defer container.Terminate(ctx)
+		terminateContainerOnEnd(t, ctx, container)
 	})
 	t.Run("custom query", func(t *testing.T) {
 		req := ContainerRequest{
@@ -65,7 +66,7 @@ func TestContainerWithWaitForSQL(t *testing.T) {
 			t.Fatal(err)
 		}
 
-		defer container.Terminate(ctx)
+		terminateContainerOnEnd(t, ctx, container)
 	})
 	t.Run("custom bad query", func(t *testing.T) {
 		req := ContainerRequest{
@@ -85,6 +86,17 @@ func TestContainerWithWaitForSQL(t *testing.T) {
 			t.Fatal("expected error, but got a nil")
 		}
 
-		defer container.Terminate(ctx)
+		terminateContainerOnEnd(t, ctx, container)
+	})
+}
+
+func terminateContainerOnEnd(tb testing.TB, ctx context.Context, ctr Container) {
+	tb.Helper()
+	if ctr == nil {
+		return
+	}
+	tb.Cleanup(func() {
+		tb.Log("terminating container")
+		require.NoError(tb, ctr.Terminate(ctx))
 	})
 }

file.go

@@ -40,7 +40,7 @@ func tarDir(src string, fileMode int64) (*bytes.Buffer, error) {
 	tw := tar.NewWriter(zr)
 
 	// walk through every file in the folder
-	filepath.Walk(src, func(file string, fi os.FileInfo, errFn error) error {
+	err := filepath.Walk(src, func(file string, fi os.FileInfo, errFn error) error {
 		if errFn != nil {
 			return fmt.Errorf("error traversing the file system: %w", errFn)
 		}
@@ -80,6 +80,9 @@ func tarDir(src string, fileMode int64) (*bytes.Buffer, error) {
 		}
 		return nil
 	})
+	if err != nil {
+		return buffer, err
+	}
 
 	// produce tar
 	if err := tw.Close(); err != nil {