Merge remote-tracking branch 'origin/main' into openldap-module

.github/dependabot.yml

@@ -107,6 +107,13 @@ updates:
         day: sunday
       open-pull-requests-limit: 3
       rebase-strategy: disabled
+    - package-ecosystem: gomod
+      directory: /modules/inbucket
+      schedule:
+        interval: monthly
+        day: sunday
+      open-pull-requests-limit: 3
+      rebase-strategy: disabled
     - package-ecosystem: gomod
       directory: /modules/k3s
       schedule:

.github/workflows/ci.yml

@@ -104,7 +104,7 @@ jobs:
       matrix:
         go-version: [1.20.x, 1.x]
         platform: [ubuntu-latest, macos-latest]
-        module: [artemis, cassandra, clickhouse, compose, couchbase, elasticsearch, gcloud, k3s, k6, kafka, localstack, mariadb, minio, mockserver, mongodb, mssql, mysql, nats, neo4j, openldap, postgres, pulsar, rabbitmq, redis, redpanda, vault]
+        module: [artemis, cassandra, clickhouse, compose, couchbase, elasticsearch, gcloud, inbucket, k3s, k6, kafka, localstack, mariadb, minio, mockserver, mongodb, mssql, mysql, nats, neo4j, openldap, postgres, pulsar, rabbitmq, redis, redpanda, vault]
         exclude:
           - go-version: 1.20.x
             module: compose

.golangci.yml

@@ -26,11 +26,11 @@ linters-settings:
       - prefix(github.com/testcontainers)
   testifylint:
     disable:
-      - compares
       - float-compare
       - go-require
     enable:
       - bool-compare
+      - compares
       - empty
       - error-is-as
       - error-nil

.vscode/.testcontainers-go.code-workspace

@@ -49,6 +49,10 @@
             "name": "module / gcloud",
             "path": "../modules/gcloud"
         },
+        {
+            "name": "module / inbucket",
+            "path": "../modules/inbucket"
+        },
         {
             "name": "module / k3s",
             "path": "../modules/k3s"

docker_test.go

@@ -1537,7 +1537,7 @@ func TestDockerCreateContainerWithDirs(t *testing.T) {
 			})
 			terminateContainerOnEnd(t, ctx, nginxC)
 
-			require.True(t, (err != nil) == tc.hasError)
+			require.Equal(t, (err != nil), tc.hasError)
 			if err == nil {
 				dir := tc.dir
 

docs/modules/inbucket.md

@@ -0,0 +1,63 @@
+# Inbucket
+
+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>
+
+## Introduction
+
+The Testcontainers module for Inbucket.
+
+## Adding this module to your project dependencies
+
+Please run the following command to add the Inbucket module to your Go dependencies:
+
+```
+go get github.com/testcontainers/testcontainers-go/modules/inbucket
+```
+
+## Usage example
+
+<!--codeinclude-->
+[Creating a Inbucket container](../../modules/inbucket/examples_test.go) inside_block:runInbucketContainer
+<!--/codeinclude-->
+
+## Module reference
+
+The Inbucket module exposes one entrypoint function to create the Inbucket container, and this function receives two parameters:
+
+```golang
+func RunContainer(ctx context.Context, opts ...testcontainers.ContainerCustomizer) (*InbucketContainer, error)
+```
+
+- `context.Context`, the Go context.
+- `testcontainers.ContainerCustomizer`, a variadic argument for passing options.
+
+### Container Options
+
+When starting the Inbucket container, you can pass options in a variadic way to configure it.
+
+#### Image
+
+If you need to set a different Inbucket Docker image, you can use `testcontainers.WithImage` with a valid Docker image
+for Inbucket. E.g. `testcontainers.WithImage("inbucket/inbucket:sha-2d409bb")`.
+
+{% include "../features/common_functional_options.md" %}
+
+### Container Methods
+
+The Inbucket container exposes the following methods:
+
+#### SmtpConnection
+
+This method returns the connection string to connect to the Inbucket container SMTP service, using the `2500` port.
+
+<!--codeinclude-->
+[Get smtp connection string](../../modules/inbucket/inbucket_test.go) inside_block:smtpConnection
+<!--/codeinclude-->
+
+#### WebInterface
+
+This method returns the connection string to connect to the Inbucket container web interface, using the `9000` port.
+
+<!--codeinclude-->
+[Get web interface connection string](../../modules/inbucket/inbucket_test.go) inside_block:webInterface
+<!--/codeinclude-->

mkdocs.yml

@@ -69,6 +69,7 @@ nav:
         - modules/couchbase.md
         - modules/elasticsearch.md
         - modules/gcloud.md
+        - modules/inbucket.md
         - modules/k3s.md
         - modules/k6.md
         - modules/kafka.md

modules/inbucket/Makefile

@@ -0,0 +1,5 @@
+include ../../commons-test.mk
+
+.PHONY: test
+test:
+	$(MAKE) test-inbucket

modules/inbucket/examples_test.go

@@ -0,0 +1,37 @@
+package inbucket_test
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/testcontainers/testcontainers-go"
+	"github.com/testcontainers/testcontainers-go/modules/inbucket"
+)
+
+func ExampleRunContainer() {
+	// runInbucketContainer {
+	ctx := context.Background()
+
+	inbucketContainer, err := inbucket.RunContainer(ctx, testcontainers.WithImage("inbucket/inbucket:sha-2d409bb"))
+	if err != nil {
+		panic(err)
+	}
+
+	// Clean up the container
+	defer func() {
+		if err := inbucketContainer.Terminate(ctx); err != nil {
+			panic(err)
+		}
+	}()
+	// }
+
+	state, err := inbucketContainer.State(ctx)
+	if err != nil {
+		panic(err)
+	}
+
+	fmt.Println(state.Running)
+
+	// Output:
+	// true
+}

modules/inbucket/go.mod

@@ -0,0 +1,62 @@
+module github.com/testcontainers/testcontainers-go/modules/inbucket
+
+go 1.20
+
+require (
+	github.com/inbucket/inbucket v2.0.0+incompatible
+	github.com/testcontainers/testcontainers-go v0.27.0
+)
+
+require (
+	dario.cat/mergo v1.0.0 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/Microsoft/hcsshim v0.11.4 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/containerd/containerd v1.7.12 // indirect
+	github.com/containerd/log v0.1.0 // indirect
+	github.com/cpuguy83/dockercfg v0.3.1 // indirect
+	github.com/distribution/reference v0.5.0 // indirect
+	github.com/docker/docker v25.0.1+incompatible // indirect
+	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
+	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/uuid v1.5.0 // indirect
+	github.com/jhillyerd/inbucket v2.0.0+incompatible // indirect
+	github.com/klauspost/compress v1.16.0 // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/moby/patternmatcher v0.6.0 // indirect
+	github.com/moby/sys/sequential v0.5.0 // indirect
+	github.com/moby/sys/user v0.1.0 // indirect
+	github.com/moby/term v0.5.0 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/shirou/gopsutil/v3 v3.23.12 // indirect
+	github.com/shoenig/go-m1cpu v0.1.6 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
+	github.com/yusufpapurcu/wmi v1.2.3 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
+	go.opentelemetry.io/otel v1.19.0 // indirect
+	go.opentelemetry.io/otel/metric v1.19.0 // indirect
+	go.opentelemetry.io/otel/trace v1.19.0 // indirect
+	golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
+	golang.org/x/mod v0.11.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/tools v0.10.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
+	google.golang.org/grpc v1.58.3 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+)
+
+replace github.com/testcontainers/testcontainers-go => ../..