Merge branch 'main' into v1

* main: fix: log output after context timeout (#2643) chore(deps): use "github.com/containerd/platforms" instead (#2638) chore(deps): bump google.golang.org/grpc to 1.64.1 (#2635) chore(deps): bump certifi from 2024.2.2 to 2024.7.4 (#2631) chore: prepare for next minor development cycle (0.33.0) chore: use new version (v0.32.0) in modules and examples feat: honour go toolchain's verbose flag to print out logs (#2624) Fix issues in BuildImage() (#2626) docs: indicate version for the Run function (#2627) chore: remove duplicated tests for config (#2628) Log retried errors (#2613)
testcontainers · Jul 15, 2024 · d492f55 · d492f55
2 parents 628eb0c + eb22239
commit d492f55
Show file tree

Hide file tree

Showing 153 changed files with 1,816 additions and 1,729 deletions.
diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ tidy-all:
 	$(MAKE) -C examples tidy-examples
 	$(MAKE) -C modules tidy-modules
 
-## -------------------------------------
+## --------------------------------------
 
 TCENV=tcvenv
 PYTHONBIN=./$(TCENV)/bin

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/container.go b/container.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 
 	"github.com/cenkalti/backoff/v4"
-	"github.com/containerd/containerd/platforms"
+	"github.com/containerd/platforms"
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"

diff --git a/docker.go b/docker.go
@@ -786,3 +786,10 @@ func (c *DockerContainer) terminatedHook(ctx context.Context) error {
 		return lifecycleHooks.PostTerminates
 	})
 }
+
+func tryClose(r io.Reader) {
+	rc, ok := r.(io.Closer)
+	if ok {
+		_ = rc.Close()
+	}
+}
diff --git a/docs/modules/artemis.md b/docs/modules/artemis.md
@@ -24,7 +24,14 @@ go get github.com/testcontainers/testcontainers-go/modules/artemis
 [Connecting to an Artemis container](../../modules/artemis/examples_test.go) inside_block:connectToArtemisContainer
 <!--/codeinclude-->
 
-## Module reference
+## Module Reference
+
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
 
 The Artemis module exposes one entrypoint function to create the Artemis container, and this function receives three parameters:
 

diff --git a/docs/modules/azurite.md b/docs/modules/azurite.md
@@ -1,6 +1,6 @@
 # Azurite
 
-Not available until the next release of testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go"><span class="tc-version">:material-tag: main</span></a>
+Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
 
 ## Introduction
 
@@ -20,7 +20,14 @@ go get github.com/testcontainers/testcontainers-go/modules/azurite
 [Creating a Azurite container](../../modules/azurite/examples_test.go) inside_block:runAzuriteContainer
 <!--/codeinclude-->
 
-## Module reference
+## Module Reference
+
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
 
 The Azurite module exposes one entrypoint function to create the Azurite container, and this function receives three parameters:
 
@@ -53,7 +60,7 @@ E.g. `Run(context.Background(), "mcr.microsoft.com/azure-storage/azurite:3.28.0"
 
 #### WithInMemoryPersistence
 
-- Not available until the next release of testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go"><span class="tc-version">:material-tag: main</span></a>
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
 
 If you want to use in-memory persistence, you can use `WithInMemoryPersistence(megabytes float64)`. E.g. `azurite.WithInMemoryPersistence(64.0)`.
 
@@ -68,13 +75,13 @@ The Azurite container exposes the following methods:
 
 #### ServiceURL
 
-- Not available until the next release of testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go"><span class="tc-version">:material-tag: main</span></a>
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
 
 Returns the service URL to connect to the Azurite container and an error, passing the Go context and the service name as parameters.
 
 #### MustServiceURL
 
-- Not available until the next release of testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go"><span class="tc-version">:material-tag: main</span></a>
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
 
 Returns the service URL to connect to the Azurite container, passing the Go context and the service name as parameters. If an error occurs, it will panic.
 

diff --git a/docs/modules/cassandra.md b/docs/modules/cassandra.md
@@ -20,7 +20,14 @@ go get github.com/testcontainers/testcontainers-go/modules/cassandra
 [Creating a Cassandra container](../../modules/cassandra/examples_test.go) inside_block:runCassandraContainer
 <!--/codeinclude-->
 
-## Module reference
+## Module Reference
+
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
 
 The Cassandra module exposes one entrypoint function to create the Cassandra container, and this function receives three parameters:
 

diff --git a/docs/modules/chroma.md b/docs/modules/chroma.md
@@ -25,7 +25,14 @@ go get github.com/testcontainers/testcontainers-go/modules/chroma
 [Creating a Chroma container](../../modules/chroma/examples_test.go) inside_block:runChromaContainer
 <!--/codeinclude-->
 
-## Module reference
+## Module Reference
+
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
 
 The Chroma module exposes one entrypoint function to create the Chroma container, and this function receives three parameters:
 

diff --git a/docs/modules/clickhouse.md b/docs/modules/clickhouse.md
@@ -20,7 +20,14 @@ go get github.com/testcontainers/testcontainers-go/modules/clickhouse
 [Test for a ClickHouse container](../../modules/clickhouse/examples_test.go) inside_block:runClickHouseContainer
 <!--/codeinclude-->
 
-## Module reference
+## Module Reference
+
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
 
 The ClickHouse module exposes one entrypoint function to create the ClickHouse container, and this function receives three parameters:
 

diff --git a/docs/modules/cockroachdb.md b/docs/modules/cockroachdb.md
@@ -20,7 +20,14 @@ go get github.com/testcontainers/testcontainers-go/modules/cockroachdb
 [Creating a CockroachDB container](../../modules/cockroachdb/examples_test.go) inside_block:runCockroachDBContainer
 <!--/codeinclude-->
 
-## Module reference
+## Module Reference
+
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
 
 The CockroachDB module exposes one entrypoint function to create the CockroachDB container, and this function receives three parameters:
 
@@ -32,9 +39,6 @@ func Run(ctx context.Context, img string, opts ...testcontainers.RequestCustomiz
 - `string`, the Docker image to use.
 - `testcontainers.RequestCustomizer`, a variadic argument for passing options.
 
-!!!warning
-    When TLS is enabled there's a very small, unlikely chance that the underlying driver can panic when registering the driver as part of waiting for CockroachDB to be ready to accept connections. If this is repeatedly happening please open an issue.
-
 ### Container Options
 
 When starting the CockroachDB container, you can pass options in a variadic way to configure it.
@@ -65,6 +69,9 @@ Internally CockroachDB requires a client certificate for the user to connect wit
 
 A helper `cockroachdb.NewTLSConfig` exists to generate all of this for you.
 
+!!!warning
+    When TLS is enabled there's a very small, unlikely chance that the underlying driver can panic when registering the driver as part of waiting for CockroachDB to be ready to accept connections. If this is repeatedly happening please open an issue.
+
 ### Container Methods
 
 The CockroachDB container exposes the following methods:

diff --git a/docs/modules/consul.md b/docs/modules/consul.md
@@ -20,7 +20,14 @@ go get github.com/testcontainers/testcontainers-go/modules/consul
 [Creating a Consul container](../../modules/consul/examples_test.go) inside_block:runConsulContainer
 <!--/codeinclude-->
 
-## Module reference
+## Module Reference
+
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
 
 The Consul module exposes one entrypoint function to create the Consul container, and this function receives three parameters:
 

diff --git a/docs/modules/couchbase.md b/docs/modules/couchbase.md
@@ -22,6 +22,13 @@ go get github.com/testcontainers/testcontainers-go/modules/couchbase
 
 ## Module Reference
 
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
+
 The Couchbase module exposes one entrypoint function to create the Couchbase container, and this function receives three parameters:
 
 ```golang

diff --git a/docs/modules/dolt.md b/docs/modules/dolt.md
@@ -20,7 +20,14 @@ go get github.com/testcontainers/testcontainers-go/modules/dolt
 [Creating a Dolt container](../../modules/dolt/examples_test.go) inside_block:runDoltContainer
 <!--/codeinclude-->
 
-## Module reference
+## Module Reference
+
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
 
 The Dolt module exposes one entrypoint function to create the Dolt container, and this function receives three parameters:
 

diff --git a/docs/modules/elasticsearch.md b/docs/modules/elasticsearch.md
@@ -20,7 +20,14 @@ go get github.com/testcontainers/testcontainers-go/modules/elasticsearch
 [Creating a Elasticsearch container](../../modules/elasticsearch/examples_test.go) inside_block:runElasticsearchContainer
 <!--/codeinclude-->
 
-## Module reference
+## Module Reference
+
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
 
 The Elasticsearch module exposes one entrypoint function to create the Elasticsearch container, and this function receives three parameters:
 

diff --git a/docs/modules/gcloud.md b/docs/modules/gcloud.md
@@ -54,7 +54,7 @@ It's important to set the `option.WithEndpoint()` option using the container's U
 [Obtaining a Firestore client](../../modules/gcloud/firestore_test.go) inside_block:firestoreClient
 <!--/codeinclude-->
 
-It's important to set the target string of the `grpc.Dial` method using the container's URI, as shown in the client example above.
+It's important to set the target string of the `grpc.NewClient` method using the container's URI, as shown in the client example above.
 
 ### Pubsub
 
@@ -63,7 +63,7 @@ It's important to set the target string of the `grpc.Dial` method using the cont
 [Obtaining a Pubsub client](../../modules/gcloud/pubsub_test.go) inside_block:pubsubClient
 <!--/codeinclude-->
 
-It's important to set the target string of the `grpc.Dial` method using the container's URI, as shown in the client example above.
+It's important to set the target string of the `grpc.NewClient` method using the container's URI, as shown in the client example above.
 
 ### Spanner
 
@@ -75,20 +75,28 @@ It's important to set the target string of the `grpc.Dial` method using the cont
 
 It's important to set the `option.WithEndpoint()` option using the container's URI, as shown in the Admin client example above.
 
-## Module reference
+## Module Reference
 
-The GCloud module exposes one entrypoint function to create the different GCloud emulators, and each function receives two parameters:
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunXXXContainer(ctx, opts...)` functions are deprecated and will be removed in the next major release of _Testcontainers for Go_.
+
+The GCloud module exposes one entrypoint function to create the different GCloud emulators, and each function receives three parameters:
 
 ```golang
-func RunBigQueryContainer(ctx context.Context, opts ...testcontainers.RequestCustomizer) (*BigQueryContainer, error)
-func RunBigTableContainer(ctx context.Context, opts ...testcontainers.RequestCustomizer) (*BigTableContainer, error)
-func RunDatastoreContainer(ctx context.Context, opts ...testcontainers.RequestCustomizer) (*DatastoreContainer, error)
-func RunFirestoreContainer(ctx context.Context, opts ...testcontainers.RequestCustomizer) (*FirestoreContainer, error)
-func RunPubsubContainer(ctx context.Context, opts ...testcontainers.RequestCustomizer) (*PubsubContainer, error)
-func RunSpannerContainer(ctx context.Context, opts ...testcontainers.RequestCustomizer) (*SpannerContainer, error)
+func RunBigQuery(ctx context.Context, img string, opts ...testcontainers.RequestCustomizer) (*BigQueryContainer, error)
+func RunBigTable(ctx context.Context, img string, opts ...testcontainers.RequestCustomizer) (*BigTableContainer, error)
+func RunDatastore(ctx context.Context, img string, opts ...testcontainers.RequestCustomizer) (*DatastoreContainer, error)
+func RunFirestore(ctx context.Context, img string, opts ...testcontainers.RequestCustomizer) (*FirestoreContainer, error)
+func RunPubsub(ctx context.Context, img string, opts ...testcontainers.RequestCustomizer) (*PubsubContainer, error)
+func RunSpanner(ctx context.Context, img string, opts ...testcontainers.RequestCustomizer) (*SpannerContainer, error)
 ```
 
 - `context.Context`, the Go context.
+- `string`, the Docker image to use.
 - `testcontainers.RequestCustomizer`, a variadic argument for passing options.
 
 ### Container Options

diff --git a/docs/modules/inbucket.md b/docs/modules/inbucket.md
@@ -20,7 +20,14 @@ go get github.com/testcontainers/testcontainers-go/modules/inbucket
 [Creating a Inbucket container](../../modules/inbucket/examples_test.go) inside_block:runInbucketContainer
 <!--/codeinclude-->
 
-## Module reference
+## Module Reference
+
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
 
 The Inbucket module exposes one entrypoint function to create the Inbucket container, and this function receives three parameters:
 

diff --git a/docs/modules/influxdb.md b/docs/modules/influxdb.md
@@ -22,6 +22,13 @@ go get github.com/testcontainers/testcontainers-go/modules/influxdb
 
 ## Module Reference
 
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
+
 The InfluxDB module exposes one entrypoint function to create the container, and this function receives three parameters:
 
 ```golang

diff --git a/docs/modules/k3s.md b/docs/modules/k3s.md
@@ -20,7 +20,14 @@ go get github.com/testcontainers/testcontainers-go/modules/k3s
 [Test for a K3s container](../../modules/k3s/k3s_test.go) inside_block:runK3sContainer
 <!--/codeinclude-->
 
-## Module reference
+## Module Reference
+
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
 
 The K3s module exposes one entrypoint function to create the K3s container, and this function receives three parameters:
 
@@ -32,7 +39,6 @@ func Run(ctx context.Context, img string, opts ...testcontainers.RequestCustomiz
 - `string`, the Docker image to use.
 - `testcontainers.RequestCustomizer`, a variadic argument for passing options.
 
-
 ### Container Ports
 These are the ports used by the K3s container:
 <!--codeinclude-->

diff --git a/docs/modules/k6.md b/docs/modules/k6.md
@@ -27,7 +27,14 @@ go get github.com/testcontainers/testcontainers-go/modules/k6
 [Creating a K6 container](../../modules/k6/examples_test.go) inside_block:runK6Container
 <!--/codeinclude-->
 
-## Module reference
+## Module Reference
+
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
 
 The K6 module exposes one entrypoint function to run the K6 container, and this function receives three parameters:
 

diff --git a/docs/modules/kafka.md b/docs/modules/kafka.md
@@ -20,7 +20,14 @@ go get github.com/testcontainers/testcontainers-go/modules/kafka
 [Creating a Kafka container](../../modules/kafka/examples_test.go) inside_block:runKafkaContainer
 <!--/codeinclude-->
 
-## Module reference
+## Module Reference
+
+### Run function
+
+- Since testcontainers-go <a href="https://github.com/testcontainers/testcontainers-go/releases/tag/v0.32.0"><span class="tc-version">:material-tag: v0.32.0</span></a>
+
+!!!info
+    The `RunContainer(ctx, opts...)` function is deprecated and will be removed in the next major release of _Testcontainers for Go_.
 
 The Kafka module exposes one entrypoint function to create the Kafka container, and this function receives three parameters: