From 2e467065f462e82e42e6af1e97cc02e25265c43b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Mon, 3 Mar 2025 18:25:49 +0100
Subject: [PATCH 01/43] feat: move Azurite container to the new Azure module,
deprecating the old one
---
.vscode/.testcontainers-go.code-workspace | 4 +
docs/modules/azure.md | 118 +++++++++++
docs/modules/azurite.md | 113 +---------
mkdocs.yml | 1 +
modules/azure/Makefile | 5 +
modules/azure/azurite/azurite.go | 128 ++++++++++++
modules/azure/azurite/azurite_test.go | 21 ++
modules/{ => azure}/azurite/examples_test.go | 2 +-
modules/azure/azurite/options.go | 34 +++
modules/azure/azurite/services.go | 9 +
modules/azure/go.mod | 67 ++++++
modules/azure/go.sum | 206 +++++++++++++++++++
modules/azurite/azurite.go | 134 +++---------
modules/azurite/go.mod | 22 +-
modules/azurite/go.sum | 59 ++----
modules/azurite/options.go | 28 +--
modules/azurite/services.go | 20 +-
sonar-project.properties | 2 +-
18 files changed, 673 insertions(+), 300 deletions(-)
create mode 100644 docs/modules/azure.md
create mode 100644 modules/azure/Makefile
create mode 100644 modules/azure/azurite/azurite.go
create mode 100644 modules/azure/azurite/azurite_test.go
rename modules/{ => azure}/azurite/examples_test.go (99%)
create mode 100644 modules/azure/azurite/options.go
create mode 100644 modules/azure/azurite/services.go
create mode 100644 modules/azure/go.mod
create mode 100644 modules/azure/go.sum
diff --git a/.vscode/.testcontainers-go.code-workspace b/.vscode/.testcontainers-go.code-workspace
index f21ac79be4..bba3ec10a7 100644
--- a/.vscode/.testcontainers-go.code-workspace
+++ b/.vscode/.testcontainers-go.code-workspace
@@ -17,6 +17,10 @@
"name": "module / artemis",
"path": "../modules/artemis"
},
+ {
+ "name": "module / azure",
+ "path": "../modules/azure"
+ },
{
"name": "module / azurite",
"path": "../modules/azurite"
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
new file mode 100644
index 0000000000..2a5069f14e
--- /dev/null
+++ b/docs/modules/azure.md
@@ -0,0 +1,118 @@
+# Azure
+
+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 Azure.
+
+## Adding this module to your project dependencies
+
+Please run the following command to add the Azure module to your Go dependencies:
+
+```
+go get github.com/testcontainers/testcontainers-go/modules/azure
+```
+
+## Usage example
+
+The Azure module exposes the following Go packages:
+
+- [Azurite](#azurite): `github.com/testcontainers/testcontainers-go/modules/azure/azurite`.
+
+<!--codeinclude-->
+[Creating a Azurite container](../../modules/azure/azurite/examples_test.go) inside_block:runAzuriteContainer
+<!--/codeinclude-->
+
+## Module Reference
+
+### Azurite
+
+#### Run function
+
+- 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>
+
+The Azurite module exposes one entrypoint function to create the Azurite container, and this function receives three parameters:
+
+```golang
+func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*AzuriteContainer, error)
+```
+
+- `context.Context`, the Go context.
+- `string`, the Docker image to use.
+- `testcontainers.ContainerCustomizer`, a variadic argument for passing options.
+
+#### Default Credentials
+
+The Azurite container uses the following default credentials:
+
+<!--codeinclude-->
+[Default Credentials](../../modules/azure/azurite/azurite.go) inside_block:defaultCredentials
+<!--/codeinclude-->
+
+#### Container Options
+
+When starting the Azurite container, you can pass options in a variadic way to configure it.
+
+##### Image
+
+If you need to set a different Azurite Docker image, you can set a valid Docker image as the second argument in the `Run` function.
+E.g. `Run(context.Background(), "mcr.microsoft.com/azure-storage/azurite:3.28.0")`.
+
+{% include "../features/common_functional_options.md" %}
+
+##### WithInMemoryPersistence
+
+- 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)`.
+
+Please read the [Azurite documentation](https://github.com/Azure/Azurite?tab=readme-ov-file#use-in-memory-storage) for more information.
+
+!!! warning
+ This option is only available in Azurite versions 3.28.0 and later.
+
+#### Container Methods
+
+The Azurite container exposes the following methods:
+
+##### ServiceURL
+
+- 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
+
+- 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.
+
+#### Examples
+
+##### Blob Operations
+
+In the following example, we will create a container with Azurite and perform some blob operations. For that, using the default
+credentials, we will create an Azurite container, upload a blob to it, list the blobs, and download the blob. Finally, we will remove the created blob and container.
+
+<!--codeinclude-->
+[Performing blob operations](../../modules/azure/azurite/examples_test.go) inside_block:blobOperations
+<!--/codeinclude-->
+
+##### Queue Operations
+
+In the following example, we will create an Azurite container and perform some queue operations. For that, using the default
+credentials, we will create a queue, list the queues, and finally we will remove the created queue.
+
+<!--codeinclude-->
+[Performing queue operations](../../modules/azure/azurite/examples_test.go) inside_block:queueOperations
+<!--/codeinclude-->
+
+##### Table Operations
+
+In the following example, we will create an Azurite container and perform some table operations. For that, using the default
+credentials, we will create a table, list the tables, and finally we will remove the created table.
+
+<!--codeinclude-->
+[Performing table operations](../../modules/azure/azurite/examples_test.go) inside_block:tableOperations
+<!--/codeinclude-->
\ No newline at end of file
diff --git a/docs/modules/azurite.md b/docs/modules/azurite.md
index d603149c20..3207c2b330 100644
--- a/docs/modules/azurite.md
+++ b/docs/modules/azurite.md
@@ -2,114 +2,5 @@
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
-
-The Testcontainers module for Azurite.
-
-## Adding this module to your project dependencies
-
-Please run the following command to add the Azurite module to your Go dependencies:
-
-```
-go get github.com/testcontainers/testcontainers-go/modules/azurite
-```
-
-## Usage example
-
-<!--codeinclude-->
-[Creating an Azurite container](../../modules/azurite/examples_test.go) inside_block:runAzuriteContainer
-<!--/codeinclude-->
-
-## 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:
-
-```golang
-func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*AzuriteContainer, error)
-```
-
-- `context.Context`, the Go context.
-- `string`, the Docker image to use.
-- `testcontainers.ContainerCustomizer`, a variadic argument for passing options.
-
-### Default Credentials
-
-The Azurite container uses the following default credentials:
-
-<!--codeinclude-->
-[Default Credentials](../../modules/azurite/azurite.go) inside_block:defaultCredentials
-<!--/codeinclude-->
-
-### Container Options
-
-When starting the Azurite container, you can pass options in a variadic way to configure it.
-
-#### Image
-
-If you need to set a different Azurite Docker image, you can set a valid Docker image as the second argument in the `Run` function.
-E.g. `Run(context.Background(), "mcr.microsoft.com/azure-storage/azurite:3.28.0")`.
-
-{% include "../features/common_functional_options.md" %}
-
-#### WithInMemoryPersistence
-
-- 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)`.
-
-Please read the [Azurite documentation](https://github.com/Azure/Azurite?tab=readme-ov-file#use-in-memory-storage) for more information.
-
-!!! warning
- This option is only available in Azurite versions 3.28.0 and later.
-
-### Container Methods
-
-The Azurite container exposes the following methods:
-
-#### ServiceURL
-
-- 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
-
-- 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.
-
-### Examples
-
-#### Blob Operations
-
-In the following example, we will create a container with Azurite and perform some blob operations. For that, using the default
-credentials, we will create an Azurite container, upload a blob to it, list the blobs, and download the blob. Finally, we will remove the created blob and container.
-
-<!--codeinclude-->
-[Performing blob operations](../../modules/azurite/examples_test.go) inside_block:blobOperations
-<!--/codeinclude-->
-
-#### Queue Operations
-
-In the following example, we will create an Azurite container and perform some queue operations. For that, using the default
-credentials, we will create a queue, list the queues, and finally we will remove the created queue.
-
-<!--codeinclude-->
-[Performing queue operations](../../modules/azurite/examples_test.go) inside_block:queueOperations
-<!--/codeinclude-->
-
-#### Table Operations
-
-In the following example, we will create an Azurite container and perform some table operations. For that, using the default
-credentials, we will create a table, list the tables, and finally we will remove the created table.
-
-<!--codeinclude-->
-[Performing table operations](../../modules/azurite/examples_test.go) inside_block:tableOperations
-<!--/codeinclude-->
\ No newline at end of file
+!!!warning
+ This module is deprecated and will be removed in the next major release of _Testcontainers for Go_. Please use [Azurite from the Azure module](../azure/#azurite) instead.
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 7531dd6365..200d717c95 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -69,6 +69,7 @@ nav:
- Modules:
- modules/index.md
- modules/artemis.md
+ - modules/azure.md
- modules/azurite.md
- modules/cassandra.md
- modules/chroma.md
diff --git a/modules/azure/Makefile b/modules/azure/Makefile
new file mode 100644
index 0000000000..1f24f63b18
--- /dev/null
+++ b/modules/azure/Makefile
@@ -0,0 +1,5 @@
+include ../../commons-test.mk
+
+.PHONY: test
+test:
+ $(MAKE) test-azure
diff --git a/modules/azure/azurite/azurite.go b/modules/azure/azurite/azurite.go
new file mode 100644
index 0000000000..0dc3037c95
--- /dev/null
+++ b/modules/azure/azurite/azurite.go
@@ -0,0 +1,128 @@
+package azurite
+
+import (
+ "context"
+ "fmt"
+
+ "github.com/docker/go-connections/nat"
+
+ "github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/wait"
+)
+
+const (
+ // BlobPort is the default port used by Azurite
+ BlobPort = "10000/tcp"
+ // QueuePort is the default port used by Azurite
+ QueuePort = "10001/tcp"
+ // TablePort is the default port used by Azurite
+ TablePort = "10002/tcp"
+
+ // defaultCredentials {
+ // AccountName is the default testing account name used by Azurite
+ AccountName string = "devstoreaccount1"
+
+ // AccountKey is the default testing account key used by Azurite
+ AccountKey string = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="
+ // }
+)
+
+// AzuriteContainer represents the Azurite container type used in the module
+type AzuriteContainer struct {
+ testcontainers.Container
+ Settings options
+}
+
+func (c *AzuriteContainer) ServiceURL(ctx context.Context, srv Service) (string, error) {
+ hostname, err := c.Host(ctx)
+ if err != nil {
+ return "", err
+ }
+
+ var port nat.Port
+ switch srv {
+ case BlobService:
+ port = BlobPort
+ case QueueService:
+ port = QueuePort
+ case TableService:
+ port = TablePort
+ default:
+ return "", fmt.Errorf("unknown service: %s", srv)
+ }
+
+ mappedPort, err := c.MappedPort(ctx, port)
+ if err != nil {
+ return "", err
+ }
+
+ return fmt.Sprintf("http://%s:%d", hostname, mappedPort.Int()), nil
+}
+
+func (c *AzuriteContainer) MustServiceURL(ctx context.Context, srv Service) string {
+ url, err := c.ServiceURL(ctx, srv)
+ if err != nil {
+ panic(err)
+ }
+
+ return url
+}
+
+// Run creates an instance of the Azurite container type
+func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*AzuriteContainer, error) {
+ req := testcontainers.ContainerRequest{
+ Image: img,
+ ExposedPorts: []string{BlobPort, QueuePort, TablePort},
+ Env: map[string]string{},
+ Entrypoint: []string{"azurite"},
+ Cmd: []string{},
+ }
+
+ genericContainerReq := testcontainers.GenericContainerRequest{
+ ContainerRequest: req,
+ Started: true,
+ }
+
+ // 1. Gather all config options (defaults and then apply provided options)
+ settings := defaultOptions()
+ for _, opt := range opts {
+ if err := opt.Customize(&genericContainerReq); err != nil {
+ return nil, err
+ }
+ }
+
+ // 2. evaluate the enabled services to apply the right wait strategy and Cmd options
+ enabledServices := settings.EnabledServices
+ if len(enabledServices) > 0 {
+ waitingFor := make([]wait.Strategy, 0)
+ for _, srv := range enabledServices {
+ switch srv {
+ case BlobService:
+ genericContainerReq.Cmd = append(genericContainerReq.Cmd, "--blobHost", "0.0.0.0")
+ waitingFor = append(waitingFor, wait.ForLog("Blob service is successfully listening"))
+ case QueueService:
+ genericContainerReq.Cmd = append(genericContainerReq.Cmd, "--queueHost", "0.0.0.0")
+ waitingFor = append(waitingFor, wait.ForLog("Queue service is successfully listening"))
+ case TableService:
+ genericContainerReq.Cmd = append(genericContainerReq.Cmd, "--tableHost", "0.0.0.0")
+ waitingFor = append(waitingFor, wait.ForLog("Table service is successfully listening"))
+ }
+ }
+
+ if len(waitingFor) > 0 {
+ genericContainerReq.WaitingFor = wait.ForAll(waitingFor...)
+ }
+ }
+
+ container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
+ var c *AzuriteContainer
+ if container != nil {
+ c = &AzuriteContainer{Container: container, Settings: settings}
+ }
+
+ if err != nil {
+ return c, fmt.Errorf("generic container: %w", err)
+ }
+
+ return c, nil
+}
diff --git a/modules/azure/azurite/azurite_test.go b/modules/azure/azurite/azurite_test.go
new file mode 100644
index 0000000000..618fc28b0b
--- /dev/null
+++ b/modules/azure/azurite/azurite_test.go
@@ -0,0 +1,21 @@
+package azurite_test
+
+import (
+ "context"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+
+ "github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/modules/azurite"
+)
+
+func TestAzurite(t *testing.T) {
+ ctx := context.Background()
+
+ ctr, err := azurite.Run(ctx, "mcr.microsoft.com/azure-storage/azurite:3.23.0")
+ testcontainers.CleanupContainer(t, ctr)
+ require.NoError(t, err)
+
+ // perform assertions
+}
diff --git a/modules/azurite/examples_test.go b/modules/azure/azurite/examples_test.go
similarity index 99%
rename from modules/azurite/examples_test.go
rename to modules/azure/azurite/examples_test.go
index 567685891f..3dca021777 100644
--- a/modules/azurite/examples_test.go
+++ b/modules/azure/azurite/examples_test.go
@@ -55,7 +55,7 @@ func ExampleRun_blobOperations() {
azuriteContainer, err := azurite.Run(
ctx,
- "mcr.microsoft.com/azure-storage/azurite:3.28.0",
+ "mcr.microsoft.com/azure-storage/azurite:3.33.0",
azurite.WithInMemoryPersistence(64),
)
defer func() {
diff --git a/modules/azure/azurite/options.go b/modules/azure/azurite/options.go
new file mode 100644
index 0000000000..8e93721360
--- /dev/null
+++ b/modules/azure/azurite/options.go
@@ -0,0 +1,34 @@
+package azurite
+
+import (
+ "fmt"
+
+ "github.com/testcontainers/testcontainers-go"
+)
+
+type options struct {
+ // EnabledServices is a list of services that should be enabled
+ EnabledServices []Service
+}
+
+func defaultOptions() options {
+ return options{
+ EnabledServices: []Service{BlobService, QueueService, TableService},
+ }
+}
+
+// WithInMemoryPersistence is a custom option to enable in-memory persistence for Azurite.
+// This option is only available for Azurite v3.28.0 and later.
+func WithInMemoryPersistence(megabytes float64) testcontainers.CustomizeRequestOption {
+ return func(req *testcontainers.GenericContainerRequest) error {
+ cmd := []string{"--inMemoryPersistence"}
+
+ if megabytes > 0 {
+ cmd = append(cmd, "--extentMemoryLimit", fmt.Sprintf("%f", megabytes))
+ }
+
+ req.Cmd = append(req.Cmd, cmd...)
+
+ return nil
+ }
+}
diff --git a/modules/azure/azurite/services.go b/modules/azure/azurite/services.go
new file mode 100644
index 0000000000..a832a031f5
--- /dev/null
+++ b/modules/azure/azurite/services.go
@@ -0,0 +1,9 @@
+package azurite
+
+const (
+ BlobService Service = "blob"
+ QueueService Service = "queue"
+ TableService Service = "table"
+)
+
+type Service string
diff --git a/modules/azure/go.mod b/modules/azure/go.mod
new file mode 100644
index 0000000000..1020a99d94
--- /dev/null
+++ b/modules/azure/go.mod
@@ -0,0 +1,67 @@
+module github.com/testcontainers/testcontainers-go/modules/azure
+
+go 1.23.0
+
+require (
+ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
+ github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0
+ github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0
+ github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue v1.0.0
+ github.com/docker/go-connections v0.5.0
+ github.com/stretchr/testify v1.10.0
+ github.com/testcontainers/testcontainers-go v0.35.0
+ github.com/testcontainers/testcontainers-go/modules/azurite v0.35.0
+)
+
+require (
+ dario.cat/mergo v1.0.0 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
+ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
+ github.com/Microsoft/go-winio v0.6.2 // indirect
+ github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+ github.com/containerd/containerd v1.7.18 // indirect
+ github.com/containerd/log v0.1.0 // indirect
+ github.com/containerd/platforms v0.2.1 // indirect
+ github.com/cpuguy83/dockercfg v0.3.2 // indirect
+ github.com/davecgh/go-spew v1.1.1 // indirect
+ github.com/distribution/reference v0.6.0 // indirect
+ github.com/docker/docker v27.1.1+incompatible // indirect
+ github.com/docker/go-units v0.5.0 // indirect
+ github.com/ebitengine/purego v0.8.2 // indirect
+ github.com/felixge/httpsnoop v1.0.4 // indirect
+ github.com/go-logr/logr v1.4.1 // 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/google/uuid v1.6.0 // indirect
+ github.com/klauspost/compress v1.17.4 // indirect
+ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+ github.com/magiconair/properties v1.8.7 // indirect
+ github.com/moby/docker-image-spec v1.3.1 // 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 // indirect
+ github.com/pkg/errors v0.9.1 // indirect
+ github.com/pmezard/go-difflib v1.0.0 // indirect
+ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+ github.com/shirou/gopsutil/v4 v4.25.1 // 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.4 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
+ go.opentelemetry.io/otel v1.24.0 // indirect
+ go.opentelemetry.io/otel/metric v1.24.0 // indirect
+ go.opentelemetry.io/otel/trace v1.24.0 // indirect
+ golang.org/x/crypto v0.32.0 // indirect
+ golang.org/x/net v0.34.0 // indirect
+ golang.org/x/sys v0.29.0 // indirect
+ golang.org/x/text v0.21.0 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
+)
+
+replace github.com/testcontainers/testcontainers-go => ../..
diff --git a/modules/azure/go.sum b/modules/azure/go.sum
new file mode 100644
index 0000000000..cf30e6217d
--- /dev/null
+++ b/modules/azure/go.sum
@@ -0,0 +1,206 @@
+dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
+dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 h1:B/dfvscEQtew9dVuoxqxrUKKv8Ih2f55PydknDamU+g=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0/go.mod h1:fiPSssYvltE08HJchL04dOy+RD4hgrjph0cwGGMntdI=
+github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0 h1:NnE8y/opvxowwNcSNHubQUiSSEhfk3dmooLGAOmPuKs=
+github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0/go.mod h1:GhHzPHiiHxZloo6WvKu9X7krmSAKTyGoIwoKMbrKTTA=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0 h1:PiSrjRPpkQNjrM8H0WwKMnZUdu1RGMtd/LdGKUrOo+c=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0/go.mod h1:oDrbWx4ewMylP7xHivfgixbfGBT6APAwsSoHRKotnIc=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0 h1:UXT0o77lXQrikd1kgwIPQOUect7EoR/+sbP4wQKdzxM=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0/go.mod h1:cTvi54pg19DoT07ekoeMgE/taAwNtCShVeZqA+Iv2xI=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue v1.0.0 h1:lJwNFV+xYjHREUTHJKx/ZF6CJSt9znxmLw9DqSTvyRU=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue v1.0.0/go.mod h1:GfT0aGew8Qj5yiQVqOO5v7N8fanbJGyUoHqXg56qcVY=
+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 h1:kYRSnvJju5gYVyhkij+RTJ/VR6QIUaCfWeaFm2ycsjQ=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
+github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/containerd/containerd v1.7.18 h1:jqjZTQNfXGoEaZdW1WwPU0RqSn1Bm2Ay/KJPUuO8nao=
+github.com/containerd/containerd v1.7.18/go.mod h1:IYEk9/IO6wAPUz2bCMVUbsfXjzw5UNP5fLz4PsUygQ4=
+github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
+github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
+github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
+github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
+github.com/cpuguy83/dockercfg v0.3.2 h1:DlJTyZGBDlXqUZ2Dk2Q3xHs/FtnooJJVaad2S9GKorA=
+github.com/cpuguy83/dockercfg v0.3.2/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
+github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
+github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
+github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
+github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY=
+github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
+github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
+github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
+github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
+github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
+github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
+github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
+github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
+github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
+github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
+github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
+github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
+github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
+github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=
+github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg=
+github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU=
+github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
+github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
+github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
+github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
+github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
+github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
+github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
+github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs=
+github.com/shirou/gopsutil/v4 v4.25.1/go.mod h1:RoUCUpndaJFtT+2zsZzzmhvbfGoDCJ7nFXKJf8GqJbI=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/testcontainers/testcontainers-go/modules/azurite v0.35.0 h1:gUZ25e1DVE/0+ZZ0nupsIo+C1j7UNloN7Pkg3w6tceI=
+github.com/testcontainers/testcontainers-go/modules/azurite v0.35.0/go.mod h1:2Fc67EpyOEexLAF99zhSuzu9H22zd83pkjxEHHTtHf4=
+github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
+github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
+github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
+github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
+github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
+go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
+go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=
+go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
+go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
+go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
+go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
+go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
+go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
+go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
+go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
+golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/genproto v0.0.0-20230920204549-e6e6cdab5c13 h1:vlzZttNJGVqTsRFU9AmdnrcO1Znh8Ew9kCD//yjigk0=
+google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 h1:RFiFrvy37/mpSpdySBDrUdipW/dHwsRwh3J3+A9VgT4=
+google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237/go.mod h1:Z5Iiy3jtmioajWHDGFk7CeugTyHtPvMHA4UTmUkyalE=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
+google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA=
+google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
+gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
diff --git a/modules/azurite/azurite.go b/modules/azurite/azurite.go
index c3172fd58a..6956acb0c1 100644
--- a/modules/azurite/azurite.go
+++ b/modules/azurite/azurite.go
@@ -1,134 +1,48 @@
+// Deprecated: This package is deprecated in favor of "modules/azure/azurite".
+// Please use that package instead for all new code.
package azurite
import (
"context"
- "fmt"
-
- "github.com/docker/go-connections/nat"
"github.com/testcontainers/testcontainers-go"
- "github.com/testcontainers/testcontainers-go/wait"
+ "github.com/testcontainers/testcontainers-go/modules/azure/azurite"
)
const (
- // BlobPort is the default port used by Azurite
- BlobPort = "10000/tcp"
- // QueuePort is the default port used by Azurite
- QueuePort = "10001/tcp"
- // TablePort is the default port used by Azurite
- TablePort = "10002/tcp"
-
- // defaultCredentials {
+ // Deprecated: This constant is deprecated in favor of the one in "modules/azure/azurite".
+ // Please use that package instead for all new code.
+ BlobPort = azurite.BlobPort
+ // Deprecated: This constant is deprecated in favor of the one in "modules/azure/azurite".
+ // Please use that package instead for all new code.
+ QueuePort = azurite.QueuePort
+ // Deprecated: This constant is deprecated in favor of the one in "modules/azure/azurite".
+ // Please use that package instead for all new code.
+ TablePort = azurite.TablePort
+
+ // Deprecated: This constant is deprecated in favor of the one in "modules/azure/azurite".
+ // Please use that package instead for all new code.
// AccountName is the default testing account name used by Azurite
- AccountName string = "devstoreaccount1"
+ AccountName string = azurite.AccountName
+ // Deprecated: This constant is deprecated in favor of the one in "modules/azure/azurite".
+ // Please use that package instead for all new code.
// AccountKey is the default testing account key used by Azurite
- AccountKey string = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="
- // }
+ AccountKey string = azurite.AccountKey
)
+// Deprecated: This type is deprecated in favor of the one in "modules/azure/azurite".
// AzuriteContainer represents the Azurite container type used in the module
-type AzuriteContainer struct {
- testcontainers.Container
- Settings options
-}
-
-func (c *AzuriteContainer) ServiceURL(ctx context.Context, srv Service) (string, error) {
- hostname, err := c.Host(ctx)
- if err != nil {
- return "", err
- }
-
- var port nat.Port
- switch srv {
- case BlobService:
- port = BlobPort
- case QueueService:
- port = QueuePort
- case TableService:
- port = TablePort
- default:
- return "", fmt.Errorf("unknown service: %s", srv)
- }
-
- mappedPort, err := c.MappedPort(ctx, port)
- if err != nil {
- return "", err
- }
-
- return fmt.Sprintf("http://%s:%d", hostname, mappedPort.Int()), nil
-}
-
-func (c *AzuriteContainer) MustServiceURL(ctx context.Context, srv Service) string {
- url, err := c.ServiceURL(ctx, srv)
- if err != nil {
- panic(err)
- }
+type AzuriteContainer = azurite.AzuriteContainer
- return url
-}
-
-// Deprecated: use Run instead
+// Deprecated: This function is deprecated in favor of the one in "modules/azure/azurite".
// RunContainer creates an instance of the Azurite container type
func RunContainer(ctx context.Context, opts ...testcontainers.ContainerCustomizer) (*AzuriteContainer, error) {
return Run(ctx, "mcr.microsoft.com/azure-storage/azurite:3.28.0", opts...)
}
+// Deprecated: This function is deprecated in favor of the one in "modules/azure/azurite".
// Run creates an instance of the Azurite container type
func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*AzuriteContainer, error) {
- req := testcontainers.ContainerRequest{
- Image: img,
- ExposedPorts: []string{BlobPort, QueuePort, TablePort},
- Env: map[string]string{},
- Entrypoint: []string{"azurite"},
- Cmd: []string{},
- }
-
- genericContainerReq := testcontainers.GenericContainerRequest{
- ContainerRequest: req,
- Started: true,
- }
-
- // 1. Gather all config options (defaults and then apply provided options)
- settings := defaultOptions()
- for _, opt := range opts {
- if err := opt.Customize(&genericContainerReq); err != nil {
- return nil, err
- }
- }
-
- // 2. evaluate the enabled services to apply the right wait strategy and Cmd options
- enabledServices := settings.EnabledServices
- if len(enabledServices) > 0 {
- waitingFor := make([]wait.Strategy, 0)
- for _, srv := range enabledServices {
- switch srv {
- case BlobService:
- genericContainerReq.Cmd = append(genericContainerReq.Cmd, "--blobHost", "0.0.0.0")
- waitingFor = append(waitingFor, wait.ForLog("Blob service is successfully listening"))
- case QueueService:
- genericContainerReq.Cmd = append(genericContainerReq.Cmd, "--queueHost", "0.0.0.0")
- waitingFor = append(waitingFor, wait.ForLog("Queue service is successfully listening"))
- case TableService:
- genericContainerReq.Cmd = append(genericContainerReq.Cmd, "--tableHost", "0.0.0.0")
- waitingFor = append(waitingFor, wait.ForLog("Table service is successfully listening"))
- }
- }
-
- if len(waitingFor) > 0 {
- genericContainerReq.WaitingFor = wait.ForAll(waitingFor...)
- }
- }
-
- container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
- var c *AzuriteContainer
- if container != nil {
- c = &AzuriteContainer{Container: container, Settings: settings}
- }
-
- if err != nil {
- return c, fmt.Errorf("generic container: %w", err)
- }
-
- return c, nil
+ return azurite.Run(ctx, img, opts...)
}
diff --git a/modules/azurite/go.mod b/modules/azurite/go.mod
index aa8755e77f..3fa2247661 100644
--- a/modules/azurite/go.mod
+++ b/modules/azurite/go.mod
@@ -5,18 +5,13 @@ go 1.23.0
toolchain go1.23.6
require (
- github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1
- github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.2.0
- github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2
- github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue v1.0.0
- github.com/docker/go-connections v0.5.0
github.com/stretchr/testify v1.10.0
github.com/testcontainers/testcontainers-go v0.35.0
+ github.com/testcontainers/testcontainers-go/modules/azure v0.35.0
)
require (
dario.cat/mergo v1.0.0 // indirect
- github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
@@ -27,6 +22,7 @@ require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
+ github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/ebitengine/purego v0.8.2 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -36,7 +32,7 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/klauspost/compress v1.17.4 // indirect
- github.com/kr/text v0.2.0 // indirect
+ github.com/kr/pretty v0.3.1 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
@@ -50,6 +46,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+ github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/shirou/gopsutil/v4 v4.25.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
@@ -59,13 +56,14 @@ require (
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
- golang.org/x/crypto v0.31.0 // indirect
- golang.org/x/net v0.33.0 // indirect
- golang.org/x/sys v0.28.0 // indirect
- golang.org/x/text v0.21.0 // indirect
+ golang.org/x/crypto v0.32.0 // indirect
+ golang.org/x/sys v0.29.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
-replace github.com/testcontainers/testcontainers-go => ../..
+replace (
+ github.com/testcontainers/testcontainers-go => ../..
+ github.com/testcontainers/testcontainers-go/modules/azure => ../azure
+)
diff --git a/modules/azurite/go.sum b/modules/azurite/go.sum
index 8e260f9312..c92dfe0ba6 100644
--- a/modules/azurite/go.sum
+++ b/modules/azurite/go.sum
@@ -2,24 +2,18 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 h1:E+OJmp2tPvt1W+amx48v1eqbjDYsgN+RzP4q16yV5eM=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 h1:sO0/P7g68FrryJzljemN+6GTssUXdANk6aJ7T1ZxnsQ=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1/go.mod h1:h8hyGFDsU5HMivxiS2iYFZsgDbU9OnnJ163x5UGVKYo=
-github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.2.0 h1:aJG+Jxd9/rrLwf8R1Ko0RlOBTJASs/lGQJ8b9AdlKTc=
-github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.2.0/go.mod h1:41ONblJrPxDcnVr+voS+3xXWy/KnZLh+7zY5s6woAlQ=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 h1:LqbJ/WzJUwBf8UiaSzgX7aMclParm9/5Vgp+TY51uBQ=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2/go.mod h1:yInRyqWXAuaPrgI7p70+lDDgh3mlBohis29jGMISnmc=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 h1:AifHbc4mg0x9zW52WOpKbsHaDKuRhlI7TVl47thgQ70=
-github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0/go.mod h1:T5RfihdXtBDxt1Ch2wobif3TvzTdumDy29kahv6AV9A=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2 h1:YUUxeiOWgdAQE3pXt2H7QXzZs0q8UBjgRbl56qo8GYM=
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2/go.mod h1:dmXQgZuiSubAecswZE+Sm8jkvEa7kQgTPVRvwL/nd0E=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ=
+github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0 h1:NnE8y/opvxowwNcSNHubQUiSSEhfk3dmooLGAOmPuKs=
+github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0/go.mod h1:GhHzPHiiHxZloo6WvKu9X7krmSAKTyGoIwoKMbrKTTA=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0 h1:UXT0o77lXQrikd1kgwIPQOUect7EoR/+sbP4wQKdzxM=
+github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0/go.mod h1:cTvi54pg19DoT07ekoeMgE/taAwNtCShVeZqA+Iv2xI=
github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue v1.0.0 h1:lJwNFV+xYjHREUTHJKx/ZF6CJSt9znxmLw9DqSTvyRU=
github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue v1.0.0/go.mod h1:GfT0aGew8Qj5yiQVqOO5v7N8fanbJGyUoHqXg56qcVY=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
@@ -40,8 +34,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
-github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY=
github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -61,9 +53,6 @@ github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
-github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
-github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -75,12 +64,10 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
@@ -101,16 +88,16 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
-github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
-github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
+github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs=
github.com/shirou/gopsutil/v4 v4.25.1/go.mod h1:RoUCUpndaJFtT+2zsZzzmhvbfGoDCJ7nFXKJf8GqJbI=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
@@ -148,16 +135,16 @@ go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v8
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -170,10 +157,10 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
@@ -199,8 +186,6 @@ google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHh
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/modules/azurite/options.go b/modules/azurite/options.go
index 8e93721360..f1506760a3 100644
--- a/modules/azurite/options.go
+++ b/modules/azurite/options.go
@@ -1,34 +1,14 @@
package azurite
import (
- "fmt"
-
"github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/modules/azure/azurite"
)
-type options struct {
- // EnabledServices is a list of services that should be enabled
- EnabledServices []Service
-}
-
-func defaultOptions() options {
- return options{
- EnabledServices: []Service{BlobService, QueueService, TableService},
- }
-}
-
+// Deprecated: This option is deprecated in favor of the one in "modules/azure/azurite".
+// Please use that package instead for all new code.
// WithInMemoryPersistence is a custom option to enable in-memory persistence for Azurite.
// This option is only available for Azurite v3.28.0 and later.
func WithInMemoryPersistence(megabytes float64) testcontainers.CustomizeRequestOption {
- return func(req *testcontainers.GenericContainerRequest) error {
- cmd := []string{"--inMemoryPersistence"}
-
- if megabytes > 0 {
- cmd = append(cmd, "--extentMemoryLimit", fmt.Sprintf("%f", megabytes))
- }
-
- req.Cmd = append(req.Cmd, cmd...)
-
- return nil
- }
+ return azurite.WithInMemoryPersistence(megabytes)
}
diff --git a/modules/azurite/services.go b/modules/azurite/services.go
index a832a031f5..d3b2c3d0dc 100644
--- a/modules/azurite/services.go
+++ b/modules/azurite/services.go
@@ -1,9 +1,21 @@
package azurite
+import (
+ "github.com/testcontainers/testcontainers-go/modules/azure/azurite"
+)
+
const (
- BlobService Service = "blob"
- QueueService Service = "queue"
- TableService Service = "table"
+ // Deprecated: This constant is deprecated in favor of the one in "modules/azure/azurite".
+ // Please use that package instead for all new code.
+ BlobService Service = azurite.BlobService
+ // Deprecated: This constant is deprecated in favor of the one in "modules/azure/azurite".
+ // Please use that package instead for all new code.
+ QueueService Service = azurite.QueueService
+ // Deprecated: This constant is deprecated in favor of the one in "modules/azure/azurite".
+ // Please use that package instead for all new code.
+ TableService Service = azurite.TableService
)
-type Service string
+// Deprecated: This type is deprecated in favor of the one in "modules/azure/azurite".
+// Please use that package instead for all new code.
+type Service = azurite.Service
diff --git a/sonar-project.properties b/sonar-project.properties
index b24c9bd0e9..8ff196adcd 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -18,4 +18,4 @@ sonar.test.inclusions=**/*_test.go
sonar.test.exclusions=**/vendor/**
sonar.go.coverage.reportPaths=**/coverage.out
-sonar.go.tests.reportPaths=TEST-unit.xml,examples/nginx/TEST-unit.xml,examples/toxiproxy/TEST-unit.xml,modulegen/TEST-unit.xml,modules/artemis/TEST-unit.xml,modules/azurite/TEST-unit.xml,modules/cassandra/TEST-unit.xml,modules/chroma/TEST-unit.xml,modules/clickhouse/TEST-unit.xml,modules/cockroachdb/TEST-unit.xml,modules/compose/TEST-unit.xml,modules/consul/TEST-unit.xml,modules/couchbase/TEST-unit.xml,modules/databend/TEST-unit.xml,modules/dolt/TEST-unit.xml,modules/dynamodb/TEST-unit.xml,modules/elasticsearch/TEST-unit.xml,modules/etcd/TEST-unit.xml,modules/gcloud/TEST-unit.xml,modules/grafana-lgtm/TEST-unit.xml,modules/inbucket/TEST-unit.xml,modules/influxdb/TEST-unit.xml,modules/k3s/TEST-unit.xml,modules/k6/TEST-unit.xml,modules/kafka/TEST-unit.xml,modules/localstack/TEST-unit.xml,modules/mariadb/TEST-unit.xml,modules/meilisearch/TEST-unit.xml,modules/milvus/TEST-unit.xml,modules/minio/TEST-unit.xml,modules/mockserver/TEST-unit.xml,modules/mongodb/TEST-unit.xml,modules/mssql/TEST-unit.xml,modules/mysql/TEST-unit.xml,modules/nats/TEST-unit.xml,modules/neo4j/TEST-unit.xml,modules/ollama/TEST-unit.xml,modules/openfga/TEST-unit.xml,modules/openldap/TEST-unit.xml,modules/opensearch/TEST-unit.xml,modules/pinecone/TEST-unit.xml,modules/postgres/TEST-unit.xml,modules/pulsar/TEST-unit.xml,modules/qdrant/TEST-unit.xml,modules/rabbitmq/TEST-unit.xml,modules/redis/TEST-unit.xml,modules/redpanda/TEST-unit.xml,modules/registry/TEST-unit.xml,,modules/scylladb/TEST-unit.xml,modules/surrealdb/TEST-unit.xml,modules/valkey/TEST-unit.xml,modules/vault/TEST-unit.xml,modules/vearch/TEST-unit.xml,modules/weaviate/TEST-unit.xml,modules/yugabytedb/TEST-unit.xml
+sonar.go.tests.reportPaths=TEST-unit.xml,examples/nginx/TEST-unit.xml,examples/toxiproxy/TEST-unit.xml,modulegen/TEST-unit.xml,modules/artemis/TEST-unit.xml,modules/azure/TEST-unit.xml,modules/azurite/TEST-unit.xml,modules/cassandra/TEST-unit.xml,modules/chroma/TEST-unit.xml,modules/clickhouse/TEST-unit.xml,modules/cockroachdb/TEST-unit.xml,modules/compose/TEST-unit.xml,modules/consul/TEST-unit.xml,modules/couchbase/TEST-unit.xml,modules/databend/TEST-unit.xml,modules/dolt/TEST-unit.xml,modules/dynamodb/TEST-unit.xml,modules/elasticsearch/TEST-unit.xml,modules/etcd/TEST-unit.xml,modules/gcloud/TEST-unit.xml,modules/grafana-lgtm/TEST-unit.xml,modules/inbucket/TEST-unit.xml,modules/influxdb/TEST-unit.xml,modules/k3s/TEST-unit.xml,modules/k6/TEST-unit.xml,modules/kafka/TEST-unit.xml,modules/localstack/TEST-unit.xml,modules/mariadb/TEST-unit.xml,modules/meilisearch/TEST-unit.xml,modules/milvus/TEST-unit.xml,modules/minio/TEST-unit.xml,modules/mockserver/TEST-unit.xml,modules/mongodb/TEST-unit.xml,modules/mssql/TEST-unit.xml,modules/mysql/TEST-unit.xml,modules/nats/TEST-unit.xml,modules/neo4j/TEST-unit.xml,modules/ollama/TEST-unit.xml,modules/openfga/TEST-unit.xml,modules/openldap/TEST-unit.xml,modules/opensearch/TEST-unit.xml,modules/pinecone/TEST-unit.xml,modules/postgres/TEST-unit.xml,modules/pulsar/TEST-unit.xml,modules/qdrant/TEST-unit.xml,modules/rabbitmq/TEST-unit.xml,modules/redis/TEST-unit.xml,modules/redpanda/TEST-unit.xml,modules/registry/TEST-unit.xml,modules/scylladb/TEST-unit.xml,modules/surrealdb/TEST-unit.xml,modules/valkey/TEST-unit.xml,modules/vault/TEST-unit.xml,modules/vearch/TEST-unit.xml,modules/weaviate/TEST-unit.xml,modules/yugabytedb/TEST-unit.xml
From f81fb5d64c08912bf4459ca8cf0cd0bddbc682f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Tue, 4 Mar 2025 17:47:02 +0100
Subject: [PATCH 02/43] feat: add eventhubs module
---
docs/modules/azure.md | 123 ++++++++++++---
modules/azure/eventhubs/eventhubs.go | 149 ++++++++++++++++++
modules/azure/eventhubs/eventhubs_test.go | 82 ++++++++++
modules/azure/eventhubs/examples_test.go | 143 +++++++++++++++++
modules/azure/eventhubs/options.go | 65 ++++++++
.../eventhubs/testdata/eventhubs_config.json | 24 +++
modules/azure/go.mod | 2 +
modules/azure/go.sum | 14 ++
8 files changed, 584 insertions(+), 18 deletions(-)
create mode 100644 modules/azure/eventhubs/eventhubs.go
create mode 100644 modules/azure/eventhubs/eventhubs_test.go
create mode 100644 modules/azure/eventhubs/examples_test.go
create mode 100644 modules/azure/eventhubs/options.go
create mode 100644 modules/azure/eventhubs/testdata/eventhubs_config.json
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index 2a5069f14e..aa278664d6 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -19,16 +19,18 @@ go get github.com/testcontainers/testcontainers-go/modules/azure
The Azure module exposes the following Go packages:
- [Azurite](#azurite): `github.com/testcontainers/testcontainers-go/modules/azure/azurite`.
+- [EventHubs](#eventhubs): `github.com/testcontainers/testcontainers-go/modules/azure/eventhubs`.
+
+!!! warning "EULA Acceptance"
+ Due to licensing restrictions you are required to explicitly accept an End User License Agreement (EULA) for the EventHubs container image. This is facilitated through the `WithAcceptEULA` function.
<!--codeinclude-->
[Creating a Azurite container](../../modules/azure/azurite/examples_test.go) inside_block:runAzuriteContainer
<!--/codeinclude-->
-## Module Reference
-
-### Azurite
+## Azurite
-#### Run function
+### Run function
- 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>
@@ -42,7 +44,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
- `string`, the Docker image to use.
- `testcontainers.ContainerCustomizer`, a variadic argument for passing options.
-#### Default Credentials
+### Default Credentials
The Azurite container uses the following default credentials:
@@ -50,20 +52,20 @@ The Azurite container uses the following default credentials:
[Default Credentials](../../modules/azure/azurite/azurite.go) inside_block:defaultCredentials
<!--/codeinclude-->
-#### Container Options
+### Container Options
When starting the Azurite container, you can pass options in a variadic way to configure it.
-##### Image
+#### Image
If you need to set a different Azurite Docker image, you can set a valid Docker image as the second argument in the `Run` function.
E.g. `Run(context.Background(), "mcr.microsoft.com/azure-storage/azurite:3.28.0")`.
{% include "../features/common_functional_options.md" %}
-##### WithInMemoryPersistence
+#### WithInMemoryPersistence
-- 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>
+- 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>
If you want to use in-memory persistence, you can use `WithInMemoryPersistence(megabytes float64)`. E.g. `azurite.WithInMemoryPersistence(64.0)`.
@@ -72,25 +74,25 @@ Please read the [Azurite documentation](https://github.com/Azure/Azurite?tab=rea
!!! warning
This option is only available in Azurite versions 3.28.0 and later.
-#### Container Methods
+### Container Methods
The Azurite container exposes the following methods:
-##### ServiceURL
+#### ServiceURL
-- 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>
+- 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>
Returns the service URL to connect to the Azurite container and an error, passing the Go context and the service name as parameters.
-##### MustServiceURL
+#### MustServiceURL
-- 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>
+- 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>
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.
-#### Examples
+### Examples
-##### Blob Operations
+#### Blob Operations
In the following example, we will create a container with Azurite and perform some blob operations. For that, using the default
credentials, we will create an Azurite container, upload a blob to it, list the blobs, and download the blob. Finally, we will remove the created blob and container.
@@ -99,7 +101,7 @@ credentials, we will create an Azurite container, upload a blob to it, list the
[Performing blob operations](../../modules/azure/azurite/examples_test.go) inside_block:blobOperations
<!--/codeinclude-->
-##### Queue Operations
+#### Queue Operations
In the following example, we will create an Azurite container and perform some queue operations. For that, using the default
credentials, we will create a queue, list the queues, and finally we will remove the created queue.
@@ -108,11 +110,96 @@ credentials, we will create a queue, list the queues, and finally we will remove
[Performing queue operations](../../modules/azure/azurite/examples_test.go) inside_block:queueOperations
<!--/codeinclude-->
-##### Table Operations
+#### Table Operations
In the following example, we will create an Azurite container and perform some table operations. For that, using the default
credentials, we will create a table, list the tables, and finally we will remove the created table.
<!--codeinclude-->
[Performing table operations](../../modules/azure/azurite/examples_test.go) inside_block:tableOperations
+<!--/codeinclude-->
+
+## EventHubs
+
+### Run function
+
+- 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>
+
+The EventHubs module exposes one entrypoint function to create the EventHubs container, and this function receives three parameters:
+
+```golang
+func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*Container, error)
+```
+
+- `context.Context`, the Go context.
+- `string`, the Docker image to use.
+- `testcontainers.ContainerCustomizer`, a variadic argument for passing options.
+
+The EventHubs container needs an Azurite container to be running, for that reason _Testcontainers for Go_ automatically creates a Docker network and an Azurite container for EventHubs to work.
+When terminating the EventHubs container, the Azurite container and the Docker network are also terminated.
+
+### Container Options
+
+When starting the Azurite container, you can pass options in a variadic way to configure it.
+
+#### Image
+
+If you need to set a different Azurite Docker image, you can set a valid Docker image as the second argument in the `Run` function.
+E.g. `Run(context.Background(), "mcr.microsoft.com/azure-storage/azurite:3.28.0")`.
+
+{% include "../features/common_functional_options.md" %}
+
+#### WithAzuriteImage
+
+- 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>
+
+This option allows you to set a different Azurite Docker image, instead of the default one.
+
+#### WithAcceptEULA
+
+- 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>
+
+This option allows you to accept the EULA for the EventHubs container.
+
+#### WithConfig
+
+- 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>
+
+This option allows you to set a custom EventHubs config file for the EventHubs container.
+
+The config file must be a valid EventHubs config file, and it must be a valid JSON object.
+
+<!--codeinclude-->
+[EventHubs JSON Config](../../modules/azure/eventhubs/testdata/eventhubs_config.json)
+<!--/codeinclude-->
+
+### Container Methods
+
+The EventHubs container exposes the following methods:
+
+#### ConnectionString
+
+- 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>
+
+Returns the connection string to connect to the EventHubs container and an error, passing the Go context as parameter.
+
+#### MustConnectionString
+
+- 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>
+
+Returns the connection string to connect to the EventHubs container, passing the Go context as parameter. If an error occurs, it panics.
+
+### Examples
+
+#### Send events to EventHubs
+
+In the following example, inspired by the [Azure Event Hubs Go SDK](https://learn.microsoft.com/en-us/azure/event-hubs/event-hubs-go-get-started-send), we are creating an EventHubs container and sending events to it.
+
+<!--codeinclude-->
+[EventHubs Config](../../modules/azure/eventhubs/examples_test.go) inside_block:cfg
+[Run EventHubs Container](../../modules/azure/eventhubs/examples_test.go) inside_block:runEventHubsContainer
+[Create Producer Client](../../modules/azure/eventhubs/examples_test.go) inside_block:createProducerClient
+[Create Sample Events](../../modules/azure/eventhubs/examples_test.go) inside_block:createSampleEvents
+[Create Batch](../../modules/azure/eventhubs/examples_test.go) inside_block:createBatch
+[Send Event Data Batch to the EventHub](../../modules/azure/eventhubs/examples_test.go) inside_block:sendEventDataBatch
<!--/codeinclude-->
\ No newline at end of file
diff --git a/modules/azure/eventhubs/eventhubs.go b/modules/azure/eventhubs/eventhubs.go
new file mode 100644
index 0000000000..c36c141b40
--- /dev/null
+++ b/modules/azure/eventhubs/eventhubs.go
@@ -0,0 +1,149 @@
+package eventhubs
+
+import (
+ "context"
+ "errors"
+ "fmt"
+
+ "github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/modules/azure/azurite"
+ "github.com/testcontainers/testcontainers-go/network"
+)
+
+const (
+ defaultAMPQPort = "5672/tcp"
+ connectionStringFormat = "Endpoint=sb://%s;SharedAccessKeyName=%s;SharedAccessKey=%s;UseDevelopmentEmulator=true;"
+
+ // aliasEventhubs is the alias for the eventhubs network
+ aliasEventhubs = "eventhubs"
+
+ // aliasAzurite is the alias for the azurite network
+ aliasAzurite = "azurite"
+
+ // containerConfigFile is the path to the eventhubs config file
+ containerConfigFile = "/Eventhubs_Emulator/ConfigFiles/Config.json"
+)
+
+// Container represents the Azure Event Hubs container type used in the module
+type Container struct {
+ testcontainers.Container
+ azuriteOptions *options
+}
+
+func (c *Container) AzuriteContainer() *azurite.AzuriteContainer {
+ return c.azuriteOptions.azuriteContainer
+}
+
+// Terminate terminates the etcd container, its child nodes, and the network in which the cluster is running
+// to communicate between the nodes.
+func (c *Container) Terminate(ctx context.Context, opts ...testcontainers.TerminateOption) error {
+ var errs []error
+
+ if c.Container != nil {
+ // terminate the eventhubs container
+ if err := c.Container.Terminate(ctx, opts...); err != nil {
+ errs = append(errs, fmt.Errorf("terminate eventhubs container: %w", err))
+ }
+ }
+
+ // terminate the azurite container if it was created
+ if c.azuriteOptions.azuriteContainer != nil {
+ if err := c.azuriteOptions.azuriteContainer.Terminate(ctx, opts...); err != nil {
+ errs = append(errs, fmt.Errorf("terminate azurite container: %w", err))
+ }
+ }
+
+ // remove the azurite network if it was created
+ if c.azuriteOptions.network != nil {
+ if err := c.azuriteOptions.network.Remove(ctx); err != nil {
+ errs = append(errs, fmt.Errorf("remove azurite network: %w", err))
+ }
+ }
+
+ return errors.Join(errs...)
+}
+
+// Run creates an instance of the Azure Event Hubs container type
+func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*Container, error) {
+ req := testcontainers.ContainerRequest{
+ Image: img,
+ Env: make(map[string]string),
+ }
+
+ genericContainerReq := testcontainers.GenericContainerRequest{
+ ContainerRequest: req,
+ Started: true,
+ }
+
+ defaultOptions := defaultOptions()
+ for _, opt := range opts {
+ if err := opt.Customize(&genericContainerReq); err != nil {
+ return nil, fmt.Errorf("customize: %w", err)
+ }
+ if o, ok := opt.(Option); ok {
+ o(&defaultOptions)
+ }
+ }
+
+ if genericContainerReq.Env["ACCEPT_EULA"] == "" {
+ return nil, errors.New("EULA not accepted. Please use the WithAcceptEULA option to accept the EULA")
+ }
+
+ c := &Container{azuriteOptions: &defaultOptions}
+
+ if defaultOptions.azuriteContainer == nil {
+ azuriteNetwork, err := network.New(ctx)
+ if err != nil {
+ return c, fmt.Errorf("new azurite network: %w", err)
+ }
+ defaultOptions.network = azuriteNetwork
+
+ // start the azurite container first
+ azuriteContainer, err := azurite.Run(ctx, defaultOptions.azuriteImage, network.WithNetwork([]string{aliasAzurite}, azuriteNetwork))
+ if err != nil {
+ return nil, fmt.Errorf("run azurite container: %w", err)
+ }
+ defaultOptions.azuriteContainer = azuriteContainer
+
+ genericContainerReq.Env["BLOB_SERVER"] = aliasAzurite
+ genericContainerReq.Env["METADATA_SERVER"] = aliasAzurite
+
+ // apply the network to the eventhubs container
+ err = network.WithNetwork([]string{aliasEventhubs}, azuriteNetwork)(&genericContainerReq)
+ if err != nil {
+ return c, fmt.Errorf("with network: %w", err)
+ }
+ }
+
+ var err error
+ c.Container, err = testcontainers.GenericContainer(ctx, genericContainerReq)
+ if err != nil {
+ return c, fmt.Errorf("generic container: %w", err)
+ }
+
+ return c, nil
+}
+
+// ConnectionString returns the connection string for the eventhubs container,
+// using the following format:
+// Endpoint=sb://<hostname>:<port>;SharedAccessKeyName=<key-name>;SharedAccessKey=<key>;UseDevelopmentEmulator=true;
+func (c *Container) ConnectionString(ctx context.Context) (string, error) {
+ // we are passing an empty proto to get the host:port string
+ hostPort, err := c.PortEndpoint(ctx, defaultAMPQPort, "")
+ if err != nil {
+ return "", fmt.Errorf("port endpoint: %w", err)
+ }
+
+ return fmt.Sprintf(connectionStringFormat, hostPort, azurite.AccountName, azurite.AccountKey), nil
+}
+
+// MustConnectionString returns the connection string for the eventhubs container,
+// calling [Container.ConnectionString] and panicking if it returns an error.
+func (c *Container) MustConnectionString(ctx context.Context) string {
+ url, err := c.ConnectionString(ctx)
+ if err != nil {
+ panic(err)
+ }
+
+ return url
+}
diff --git a/modules/azure/eventhubs/eventhubs_test.go b/modules/azure/eventhubs/eventhubs_test.go
new file mode 100644
index 0000000000..1237342676
--- /dev/null
+++ b/modules/azure/eventhubs/eventhubs_test.go
@@ -0,0 +1,82 @@
+package eventhubs_test
+
+import (
+ "context"
+ _ "embed"
+ "io"
+ "strings"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+
+ "github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/modules/azure/eventhubs"
+)
+
+//go:embed testdata/eventhubs_config.json
+var eventhubsConfig string
+
+func TestEventHubs_topology(t *testing.T) {
+ ctx := context.Background()
+
+ const azuriteImage = "mcr.microsoft.com/azure-storage/azurite:3.33.0"
+
+ ctr, err := eventhubs.Run(
+ ctx,
+ "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1",
+ eventhubs.WithAcceptEULA(),
+ eventhubs.WithAzuriteImage(azuriteImage),
+ )
+ testcontainers.CleanupContainer(t, ctr)
+ require.NoError(t, err)
+
+ // assert that both containers belong to the same network
+ eventHubsNetworks, err := ctr.Networks(ctx)
+ require.NoError(t, err)
+ require.Len(t, eventHubsNetworks, 1)
+
+ azuriteContainer := ctr.AzuriteContainer()
+ azuriteNetworks, err := azuriteContainer.Networks(ctx)
+ require.NoError(t, err)
+ require.Len(t, azuriteNetworks, 1)
+
+ require.Equal(t, azuriteNetworks[0], eventHubsNetworks[0])
+
+ // azurite image version
+ inspect, err := azuriteContainer.Inspect(ctx)
+ require.NoError(t, err)
+ require.Equal(t, azuriteImage, inspect.Config.Image)
+}
+
+func TestEventHubs_withConfig(t *testing.T) {
+ ctx := context.Background()
+
+ const azuriteImage = "mcr.microsoft.com/azure-storage/azurite:3.33.0"
+
+ ctr, err := eventhubs.Run(
+ ctx,
+ "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1",
+ eventhubs.WithAcceptEULA(),
+ eventhubs.WithAzuriteImage(azuriteImage),
+ eventhubs.WithConfig(strings.NewReader(eventhubsConfig)),
+ )
+ testcontainers.CleanupContainer(t, ctr)
+ require.NoError(t, err)
+
+ // assert that the config file was created in the right location.
+ rc, err := ctr.CopyFileFromContainer(ctx, "/Eventhubs_Emulator/ConfigFiles/Config.json")
+ require.NoError(t, err)
+ defer rc.Close()
+
+ content, err := io.ReadAll(rc)
+ require.NoError(t, err)
+ require.Equal(t, eventhubsConfig, string(content))
+}
+
+func TestEventHubs_noEULA(t *testing.T) {
+ ctx := context.Background()
+
+ ctr, err := eventhubs.Run(ctx, "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1")
+ require.Error(t, err)
+ require.Nil(t, ctr)
+}
diff --git a/modules/azure/eventhubs/examples_test.go b/modules/azure/eventhubs/examples_test.go
new file mode 100644
index 0000000000..b914333881
--- /dev/null
+++ b/modules/azure/eventhubs/examples_test.go
@@ -0,0 +1,143 @@
+// Examples in this file has been taken from the following article:
+// https://learn.microsoft.com/en-us/azure/event-hubs/event-hubs-go-get-started-send
+
+package eventhubs_test
+
+import (
+ "context"
+ "fmt"
+ "log"
+ "strings"
+
+ "github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs"
+
+ "github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/modules/azure/eventhubs"
+)
+
+func ExampleRun() {
+ ctx := context.Background()
+
+ azureContainer, err := eventhubs.Run(ctx, "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1", eventhubs.WithAcceptEULA())
+ defer func() {
+ if err := testcontainers.TerminateContainer(azureContainer); err != nil {
+ log.Printf("failed to terminate container: %s", err)
+ }
+ }()
+ if err != nil {
+ log.Printf("failed to start container: %s", err)
+ return
+ }
+ // }
+
+ state, err := azureContainer.State(ctx)
+ if err != nil {
+ log.Printf("failed to get container state: %s", err)
+ return
+ }
+
+ fmt.Println(state.Running)
+
+ // Output:
+ // true
+}
+
+func ExampleRun_sendEventsToEventHub() {
+ ctx := context.Background()
+
+ // cfg {
+ cfg := `{
+ "UserConfig": {
+ "NamespaceConfig": [
+ {
+ "Type": "EventHub",
+ "Name": "emulatorNs1",
+ "Entities": [
+ {
+ "Name": "eh1",
+ "PartitionCount": "1",
+ "ConsumerGroups": [
+ {
+ "Name": "cg1"
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "LoggingConfig": {
+ "Type": "File"
+ }
+ }
+}
+`
+ // }
+
+ // runEventHubsContainer {
+ eventHubsCtr, err := eventhubs.Run(ctx, "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1", eventhubs.WithAcceptEULA(), eventhubs.WithConfig(strings.NewReader(cfg)))
+ defer func() {
+ if err := testcontainers.TerminateContainer(eventHubsCtr); err != nil {
+ log.Printf("failed to terminate container: %s", err)
+ }
+ }()
+ if err != nil {
+ log.Printf("failed to start container: %s", err)
+ return
+ }
+ // }
+
+ // ===== 1. Create an Event Hubs producer client using a connection string to the namespace and the event hub =====
+ // createProducerClient {
+ producerClient, err := azeventhubs.NewProducerClientFromConnectionString(eventHubsCtr.MustConnectionString(ctx), "eh1", nil)
+ if err != nil {
+ log.Printf("failed to create producer client: %s", err)
+ return
+ }
+ defer producerClient.Close(context.TODO())
+ // }
+
+ // ===== 2. Create sample events =====
+ // createSampleEvents {
+ events := []*azeventhubs.EventData{
+ {
+ Body: []byte("hello"),
+ },
+ {
+ Body: []byte("world"),
+ },
+ }
+ // }
+
+ // ===== 3. Create a batch object and add sample events to the batch =====
+ // createBatch {
+ newBatchOptions := &azeventhubs.EventDataBatchOptions{}
+
+ batch, err := producerClient.NewEventDataBatch(context.TODO(), newBatchOptions)
+ if err != nil {
+ log.Printf("failed to create event data batch: %s", err)
+ return
+ }
+
+ for i := range events {
+ err = batch.AddEventData(events[i], nil)
+ if err != nil {
+ log.Printf("failed to add event data to batch: %s", err)
+ return
+ }
+ }
+ // }
+
+ // ===== 4. Send the batch of events to the event hub =====
+ // sendEventDataBatch {
+ err = producerClient.SendEventDataBatch(context.TODO(), batch, nil)
+ if err != nil {
+ log.Printf("failed to send event data batch: %s", err)
+ return
+ }
+ // }
+
+ fmt.Println(err)
+
+ // Output:
+ // <nil>
+}
diff --git a/modules/azure/eventhubs/options.go b/modules/azure/eventhubs/options.go
new file mode 100644
index 0000000000..985213f173
--- /dev/null
+++ b/modules/azure/eventhubs/options.go
@@ -0,0 +1,65 @@
+package eventhubs
+
+import (
+ "io"
+
+ "github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/modules/azure/azurite"
+)
+
+type options struct {
+ azuriteImage string
+ azuriteContainer *azurite.AzuriteContainer
+ network *testcontainers.DockerNetwork
+}
+
+func defaultOptions() options {
+ return options{
+ azuriteImage: "mcr.microsoft.com/azure-storage/azurite:3.33.0",
+ azuriteContainer: nil,
+ }
+}
+
+// Satisfy the testcontainers.CustomizeRequestOption interface
+var _ testcontainers.ContainerCustomizer = (Option)(nil)
+
+// Option is an option for the Redpanda container.
+type Option func(*options)
+
+// Customize is a NOOP. It's defined to satisfy the testcontainers.ContainerCustomizer interface.
+func (o Option) Customize(*testcontainers.GenericContainerRequest) error {
+ // NOOP to satisfy interface.
+ return nil
+}
+
+// WithAzuriteImage sets the image for the Azurite container.
+// By default, the image is "mcr.microsoft.com/azure-storage/azurite:3.33.0".
+func WithAzuriteImage(img string) Option {
+ return func(o *options) {
+ o.azuriteImage = img
+ }
+}
+
+// WithAcceptEULA sets the ACCEPT_EULA environment variable to "Y" for the eventhubs container.
+func WithAcceptEULA() testcontainers.CustomizeRequestOption {
+ return func(req *testcontainers.GenericContainerRequest) error {
+ req.Env["ACCEPT_EULA"] = "Y"
+
+ return nil
+ }
+}
+
+// WithConfig sets the eventhubs config file for the eventhubs container,
+// copying the content of the reader to the container file at
+// "/Eventhubs_Emulator/ConfigFiles/Config.json".
+func WithConfig(r io.Reader) testcontainers.CustomizeRequestOption {
+ return func(req *testcontainers.GenericContainerRequest) error {
+ req.Files = append(req.Files, testcontainers.ContainerFile{
+ Reader: r,
+ ContainerFilePath: containerConfigFile,
+ FileMode: 0o644,
+ })
+
+ return nil
+ }
+}
diff --git a/modules/azure/eventhubs/testdata/eventhubs_config.json b/modules/azure/eventhubs/testdata/eventhubs_config.json
new file mode 100644
index 0000000000..554be9d7cb
--- /dev/null
+++ b/modules/azure/eventhubs/testdata/eventhubs_config.json
@@ -0,0 +1,24 @@
+{
+ "UserConfig": {
+ "NamespaceConfig": [
+ {
+ "Type": "EventHub",
+ "Name": "emulatorNs1",
+ "Entities": [
+ {
+ "Name": "eh1",
+ "PartitionCount": "1",
+ "ConsumerGroups": [
+ {
+ "Name": "cg1"
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "LoggingConfig": {
+ "Type": "File"
+ }
+ }
+}
diff --git a/modules/azure/go.mod b/modules/azure/go.mod
index 1020a99d94..a9c202e237 100644
--- a/modules/azure/go.mod
+++ b/modules/azure/go.mod
@@ -5,6 +5,7 @@ go 1.23.0
require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0
+ github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.3.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue v1.0.0
github.com/docker/go-connections v0.5.0
@@ -16,6 +17,7 @@ require (
require (
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
+ github.com/Azure/go-amqp v1.3.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
diff --git a/modules/azure/go.sum b/modules/azure/go.sum
index cf30e6217d..cab4601e15 100644
--- a/modules/azure/go.sum
+++ b/modules/azure/go.sum
@@ -10,12 +10,18 @@ github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0 h1:NnE8y/opvxowwNcSNH
github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0/go.mod h1:GhHzPHiiHxZloo6WvKu9X7krmSAKTyGoIwoKMbrKTTA=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY=
+github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.3.0 h1:skbmKp8umb8jMxl4A4CwvYyfCblujU00XUB/ytUjEac=
+github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.3.0/go.mod h1:nynTZqX7jGM6FQy6Y+7uFT7Y+LhaAeO3q3d48VZzH5E=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/eventhub/armeventhub v1.3.0 h1:4hGvxD72TluuFIXVr8f4XkKZfqAa7Pj61t0jmQ7+kes=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/eventhub/armeventhub v1.3.0/go.mod h1:TSH7DcFItwAufy0Lz+Ft2cyopExCpxbOxI5SkH4dRNo=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0 h1:PiSrjRPpkQNjrM8H0WwKMnZUdu1RGMtd/LdGKUrOo+c=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0/go.mod h1:oDrbWx4ewMylP7xHivfgixbfGBT6APAwsSoHRKotnIc=
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0 h1:UXT0o77lXQrikd1kgwIPQOUect7EoR/+sbP4wQKdzxM=
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0/go.mod h1:cTvi54pg19DoT07ekoeMgE/taAwNtCShVeZqA+Iv2xI=
github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue v1.0.0 h1:lJwNFV+xYjHREUTHJKx/ZF6CJSt9znxmLw9DqSTvyRU=
github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue v1.0.0/go.mod h1:GfT0aGew8Qj5yiQVqOO5v7N8fanbJGyUoHqXg56qcVY=
+github.com/Azure/go-amqp v1.3.0 h1://1rikYhoIQNXJFXyoO/Rlb4+4EkHYfJceNtLlys2/4=
+github.com/Azure/go-amqp v1.3.0/go.mod h1:vZAogwdrkbyK3Mla8m/CxSc/aKdnTZ4IbPxl51Y5WZE=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 h1:kYRSnvJju5gYVyhkij+RTJ/VR6QIUaCfWeaFm2ycsjQ=
@@ -24,6 +30,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
+github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
github.com/containerd/containerd v1.7.18 h1:jqjZTQNfXGoEaZdW1WwPU0RqSn1Bm2Ay/KJPUuO8nao=
github.com/containerd/containerd v1.7.18/go.mod h1:IYEk9/IO6wAPUz2bCMVUbsfXjzw5UNP5fLz4PsUygQ4=
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
@@ -49,6 +57,8 @@ github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z
github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
+github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -61,6 +71,8 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -68,6 +80,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
From 3a5354c94e376a3baa9f476a583f1414fb57bff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Tue, 4 Mar 2025 18:05:00 +0100
Subject: [PATCH 03/43] fix: right import
---
modules/azure/azurite/azurite_test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/azure/azurite/azurite_test.go b/modules/azure/azurite/azurite_test.go
index 618fc28b0b..bacc69023f 100644
--- a/modules/azure/azurite/azurite_test.go
+++ b/modules/azure/azurite/azurite_test.go
@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/testcontainers/testcontainers-go"
- "github.com/testcontainers/testcontainers-go/modules/azurite"
+ "github.com/testcontainers/testcontainers-go/modules/azure/azurite"
)
func TestAzurite(t *testing.T) {
From 733963d41570fe172e0ec3eec8629718e32fa6d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Tue, 4 Mar 2025 18:05:49 +0100
Subject: [PATCH 04/43] chore: use tabs for Azurite code examples
---
docs/modules/azure.md | 23 ++++++++++--
modules/azure/azurite/examples_test.go | 52 ++++++++++++++++++++++----
2 files changed, 64 insertions(+), 11 deletions(-)
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index aa278664d6..1d4680da49 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -98,7 +98,14 @@ In the following example, we will create a container with Azurite and perform so
credentials, we will create an Azurite container, upload a blob to it, list the blobs, and download the blob. Finally, we will remove the created blob and container.
<!--codeinclude-->
-[Performing blob operations](../../modules/azure/azurite/examples_test.go) inside_block:blobOperations
+[Create Container](../../modules/azure/azurite/examples_test.go) inside_block:runForBlobOperations
+[Create Shared Key Credential](../../modules/azure/azurite/examples_test.go) inside_block:createSharedKeyCredential
+[Create Client](../../modules/azure/azurite/examples_test.go) inside_block:createClient
+[Create Container](../../modules/azure/azurite/examples_test.go) inside_block:createContainer
+[Upload and Download Blob](../../modules/azure/azurite/examples_test.go) inside_block:uploadDownloadBlob
+[List Blobs](../../modules/azure/azurite/examples_test.go) inside_block:listBlobs
+[Delete Blob](../../modules/azure/azurite/examples_test.go) inside_block:deleteBlob
+[Delete Container](../../modules/azure/azurite/examples_test.go) inside_block:deleteContainer
<!--/codeinclude-->
#### Queue Operations
@@ -107,7 +114,12 @@ In the following example, we will create an Azurite container and perform some q
credentials, we will create a queue, list the queues, and finally we will remove the created queue.
<!--codeinclude-->
-[Performing queue operations](../../modules/azure/azurite/examples_test.go) inside_block:queueOperations
+[Run Azurite Container](../../modules/azure/azurite/examples_test.go) inside_block:runForQueueOperations
+[Create Shared Key Credential](../../modules/azure/azurite/examples_test.go) inside_block:queueOperations_createSharedKeyCredential
+[Create Client](../../modules/azure/azurite/examples_test.go) inside_block:queueOperations_createClient
+[Create Queue](../../modules/azure/azurite/examples_test.go) inside_block:createQueue
+[List Queues](../../modules/azure/azurite/examples_test.go) inside_block:listQueues
+[Delete Queue](../../modules/azure/azurite/examples_test.go) inside_block:deleteQueue
<!--/codeinclude-->
#### Table Operations
@@ -116,7 +128,12 @@ In the following example, we will create an Azurite container and perform some t
credentials, we will create a table, list the tables, and finally we will remove the created table.
<!--codeinclude-->
-[Performing table operations](../../modules/azure/azurite/examples_test.go) inside_block:tableOperations
+[Run Azurite Container](../../modules/azure/azurite/examples_test.go) inside_block:runForTableOperations
+[Create Shared Key Credential](../../modules/azure/azurite/examples_test.go) inside_block:tableOperations_createSharedKeyCredential
+[Create Client](../../modules/azure/azurite/examples_test.go) inside_block:tableOperations_createClient
+[Create Table](../../modules/azure/azurite/examples_test.go) inside_block:createTable
+[List Tables](../../modules/azure/azurite/examples_test.go) inside_block:listTables
+[Delete Table](../../modules/azure/azurite/examples_test.go) inside_block:deleteTable
<!--/codeinclude-->
## EventHubs
diff --git a/modules/azure/azurite/examples_test.go b/modules/azure/azurite/examples_test.go
index 3dca021777..5b3f490b43 100644
--- a/modules/azure/azurite/examples_test.go
+++ b/modules/azure/azurite/examples_test.go
@@ -50,7 +50,7 @@ func ExampleRun() {
// This example demonstrates how to create a container, upload a blob, list blobs, and delete the container.
// Inspired by https://github.com/Azure/azure-sdk-for-go/blob/718000938221915fb2f3c7522d4fd09f7d74cafb/sdk/storage/azblob/examples_test.go#L36
func ExampleRun_blobOperations() {
- // blobOperations {
+ // runForBlobOperations {
ctx := context.Background()
azuriteContainer, err := azurite.Run(
@@ -68,14 +68,19 @@ func ExampleRun_blobOperations() {
return
}
+ // }
+
// using the built-in shared key credential type
+ // createSharedKeyCredential {
cred, err := azblob.NewSharedKeyCredential(azurite.AccountName, azurite.AccountKey)
if err != nil {
log.Printf("failed to create shared key credential: %s", err)
return
}
+ // }
// create an azblob.Client for the specified storage account that uses the above credentials
+ // createClient {
blobServiceURL := fmt.Sprintf("%s/%s", azuriteContainer.MustServiceURL(ctx, azurite.BlobService), azurite.AccountName)
client, err := azblob.NewClientWithSharedKeyCredential(blobServiceURL, cred, nil)
@@ -83,16 +88,20 @@ func ExampleRun_blobOperations() {
log.Printf("failed to create client: %s", err)
return
}
+ // }
// ===== 1. Create a container =====
+ // createContainer {
containerName := "testcontainer"
_, err = client.CreateContainer(context.TODO(), containerName, nil)
if err != nil {
log.Printf("failed to create container: %s", err)
return
}
+ // }
// ===== 2. Upload and Download a block blob =====
+ // uploadDownloadBlob {
blobData := "Hello world!"
blobName := "HelloWorld.txt"
@@ -124,6 +133,7 @@ func ExampleRun_blobOperations() {
log.Printf("failed to read downloaded data: %s", err)
return
}
+ // }
fmt.Println(string(downloadData))
@@ -133,6 +143,7 @@ func ExampleRun_blobOperations() {
}
// ===== 3. List blobs =====
+ // listBlobs {
// List methods returns a pager object which can be used to iterate over the results of a paging operation.
// To iterate over a page use the NextPage(context.Context) to fetch the next page of results.
// PageResponse() can be used to iterate over the results of the specific page.
@@ -146,21 +157,24 @@ func ExampleRun_blobOperations() {
fmt.Println(len(resp.Segment.BlobItems))
}
+ // }
// Delete the blob.
+ // deleteBlob {
_, err = client.DeleteBlob(context.TODO(), containerName, blobName, nil)
if err != nil {
log.Printf("failed to delete blob: %s", err)
return
}
+ // }
// Delete the container.
+ // deleteContainer {
_, err = client.DeleteContainer(context.TODO(), containerName, nil)
if err != nil {
log.Printf("failed to delete container: %s", err)
return
}
-
// }
// Output:
@@ -171,7 +185,7 @@ func ExampleRun_blobOperations() {
// This example demonstrates how to create, list and delete queues.
// Inspired by https://github.com/Azure/azure-sdk-for-go/blob/718000938221915fb2f3c7522d4fd09f7d74cafb/sdk/storage/azqueue/samples_test.go#L1
func ExampleRun_queueOperations() {
- // queueOperations {
+ // runForQueueOperations {
ctx := context.Background()
azuriteContainer, err := azurite.Run(
@@ -188,15 +202,19 @@ func ExampleRun_queueOperations() {
log.Printf("failed to start container: %s", err)
return
}
+ // }
// using the built-in shared key credential type
+ // queueOperations_createSharedKeyCredential {
cred, err := azqueue.NewSharedKeyCredential(azurite.AccountName, azurite.AccountKey)
if err != nil {
log.Printf("failed to create shared key credential: %s", err)
return
}
+ // }
// create an azqueue.Client for the specified storage account that uses the above credentials
+ // queueOperations_createClient {
queueServiceURL := fmt.Sprintf("%s/%s", azuriteContainer.MustServiceURL(ctx, azurite.QueueService), azurite.AccountName)
client, err := azqueue.NewServiceClientWithSharedKeyCredential(queueServiceURL, cred, nil)
@@ -204,7 +222,10 @@ func ExampleRun_queueOperations() {
log.Printf("failed to create client: %s", err)
return
}
+ // }
+ // ===== 1. Create a queue =====
+ // createQueue {
queueName := "testqueue"
_, err = client.CreateQueue(context.TODO(), queueName, &azqueue.CreateOptions{
@@ -214,7 +235,10 @@ func ExampleRun_queueOperations() {
log.Printf("failed to create queue: %s", err)
return
}
+ // }
+ // ===== 2. List queues =====
+ // listQueues {
pager := client.NewListQueuesPager(&azqueue.ListQueuesOptions{
Include: azqueue.ListQueuesInclude{Metadata: true},
})
@@ -230,8 +254,10 @@ func ExampleRun_queueOperations() {
fmt.Println(len(resp.Queues))
fmt.Println(*resp.Queues[0].Name)
}
+ // }
- // delete the queue
+ // ===== 3. Delete the queue =====
+ // deleteQueue {
_, err = client.DeleteQueue(context.TODO(), queueName, &azqueue.DeleteOptions{})
if err != nil {
log.Printf("failed to delete queue: %s", err)
@@ -248,7 +274,7 @@ func ExampleRun_queueOperations() {
// This example demonstrates how to create, list and delete tables.
// Inspired by https://github.com/Azure/azure-sdk-for-go/blob/718000938221915fb2f3c7522d4fd09f7d74cafb/sdk/data/aztables/example_test.go#L1
func ExampleRun_tableOperations() {
- // tableOperations {
+ // runForTableOperations {
ctx := context.Background()
azuriteContainer, err := azurite.Run(
@@ -265,15 +291,19 @@ func ExampleRun_tableOperations() {
log.Printf("failed to start container: %s", err)
return
}
+ // }
// using the built-in shared key credential type
+ // tableOperations_createSharedKeyCredential {
cred, err := aztables.NewSharedKeyCredential(azurite.AccountName, azurite.AccountKey)
if err != nil {
log.Printf("failed to create shared key credential: %s", err)
return
}
+ // }
// create an aztables.Client for the specified storage account that uses the above credentials
+ // tableOperations_createClient {
tablesServiceURL := fmt.Sprintf("%s/%s", azuriteContainer.MustServiceURL(ctx, azurite.TableService), azurite.AccountName)
client, err := aztables.NewServiceClientWithSharedKey(tablesServiceURL, cred, nil)
@@ -281,16 +311,20 @@ func ExampleRun_tableOperations() {
log.Printf("failed to create client: %s", err)
return
}
+ // }
+ // ===== 1. Create a table =====
+ // createTable {
tableName := "fromServiceClient"
- // Create a table
_, err = client.CreateTable(context.TODO(), tableName, nil)
if err != nil {
log.Printf("failed to create table: %s", err)
return
}
+ // }
- // List tables
+ // ===== 2. List tables =====
+ // listTables {
pager := client.NewListTablesPager(nil)
for pager.More() {
resp, err := pager.NextPage(context.Background())
@@ -302,8 +336,10 @@ func ExampleRun_tableOperations() {
fmt.Println(len(resp.Tables))
fmt.Println(*resp.Tables[0].Name)
}
+ // }
- // Delete a table
+ // ===== 3. Delete a table =====
+ // deleteTable {
_, err = client.DeleteTable(context.TODO(), tableName, nil)
if err != nil {
fmt.Println(err)
From 69d080b152bf3e672ce5569f0b0b1d8aff7918d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 6 Mar 2025 09:29:11 +0100
Subject: [PATCH 05/43] fix: azure has no go files
---
.github/workflows/ci-test-go.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci-test-go.yml b/.github/workflows/ci-test-go.yml
index e6b71b1a68..a546cee87e 100644
--- a/.github/workflows/ci-test-go.yml
+++ b/.github/workflows/ci-test-go.yml
@@ -65,7 +65,7 @@ jobs:
- name: ensure compilation
working-directory: ./${{ inputs.project-directory }}
- run: go build
+ run: go build ./...
- name: Install dependencies
shell: bash
From 25da330d4d92c0d9876de81a52d88cc4bd4be718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 6 Mar 2025 10:28:07 +0100
Subject: [PATCH 06/43] chore: rename
---
docs/modules/azure.md | 4 ++--
modules/azure/eventhubs/eventhubs.go | 4 ++--
modules/azure/eventhubs/examples_test.go | 7 +++----
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index 1d4680da49..71686d0353 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -152,12 +152,12 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
- `string`, the Docker image to use.
- `testcontainers.ContainerCustomizer`, a variadic argument for passing options.
-The EventHubs container needs an Azurite container to be running, for that reason _Testcontainers for Go_ automatically creates a Docker network and an Azurite container for EventHubs to work.
+The EventHubs container needs an Azurite container to be running, for that reason _Testcontainers for Go_ **automatically creates a Docker network and an Azurite container** for EventHubs to work.
When terminating the EventHubs container, the Azurite container and the Docker network are also terminated.
### Container Options
-When starting the Azurite container, you can pass options in a variadic way to configure it.
+When starting the EventHubs container, you can pass options in a variadic way to configure it.
#### Image
diff --git a/modules/azure/eventhubs/eventhubs.go b/modules/azure/eventhubs/eventhubs.go
index c36c141b40..58ce381b11 100644
--- a/modules/azure/eventhubs/eventhubs.go
+++ b/modules/azure/eventhubs/eventhubs.go
@@ -14,10 +14,10 @@ const (
defaultAMPQPort = "5672/tcp"
connectionStringFormat = "Endpoint=sb://%s;SharedAccessKeyName=%s;SharedAccessKey=%s;UseDevelopmentEmulator=true;"
- // aliasEventhubs is the alias for the eventhubs network
+ // aliasEventhubs is the alias for the eventhubs container in the network
aliasEventhubs = "eventhubs"
- // aliasAzurite is the alias for the azurite network
+ // aliasAzurite is the alias for the azurite container in the network
aliasAzurite = "azurite"
// containerConfigFile is the path to the eventhubs config file
diff --git a/modules/azure/eventhubs/examples_test.go b/modules/azure/eventhubs/examples_test.go
index b914333881..72472c9126 100644
--- a/modules/azure/eventhubs/examples_test.go
+++ b/modules/azure/eventhubs/examples_test.go
@@ -18,9 +18,9 @@ import (
func ExampleRun() {
ctx := context.Background()
- azureContainer, err := eventhubs.Run(ctx, "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1", eventhubs.WithAcceptEULA())
+ eventHubsCtr, err := eventhubs.Run(ctx, "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1", eventhubs.WithAcceptEULA())
defer func() {
- if err := testcontainers.TerminateContainer(azureContainer); err != nil {
+ if err := testcontainers.TerminateContainer(eventHubsCtr); err != nil {
log.Printf("failed to terminate container: %s", err)
}
}()
@@ -28,9 +28,8 @@ func ExampleRun() {
log.Printf("failed to start container: %s", err)
return
}
- // }
- state, err := azureContainer.State(ctx)
+ state, err := eventHubsCtr.State(ctx)
if err != nil {
log.Printf("failed to get container state: %s", err)
return
From 056d5195e9dbbec2cb7cf26e7e6c4e3cfc6fb7f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 6 Mar 2025 11:46:10 +0100
Subject: [PATCH 07/43] feat: add a way to share the MSSQL Server password in
the container
---
modules/mssql/mssql.go | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/modules/mssql/mssql.go b/modules/mssql/mssql.go
index 7044abb784..b70b49c747 100644
--- a/modules/mssql/mssql.go
+++ b/modules/mssql/mssql.go
@@ -24,6 +24,11 @@ type MSSQLServerContainer struct {
username string
}
+// Password returns the password for the MSSQLServer container
+func (c *MSSQLServerContainer) Password() string {
+ return c.password
+}
+
func WithAcceptEULA() testcontainers.CustomizeRequestOption {
return func(req *testcontainers.GenericContainerRequest) error {
req.Env["ACCEPT_EULA"] = "Y"
From 41a3225a86895b3437431ad19d1766a415e95de2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 6 Mar 2025 11:46:59 +0100
Subject: [PATCH 08/43] feat: add servicebus emulator module
---
docs/modules/azure.md | 86 +++++++++-
modules/azure/go.mod | 17 +-
modules/azure/go.sum | 21 +++
modules/azure/servicebus/examples_test.go | 161 ++++++++++++++++++
modules/azure/servicebus/options.go | 65 +++++++
modules/azure/servicebus/servicebus.go | 160 +++++++++++++++++
modules/azure/servicebus/servicebus_test.go | 82 +++++++++
.../testdata/servicebus_config.json | 28 +++
8 files changed, 615 insertions(+), 5 deletions(-)
create mode 100644 modules/azure/servicebus/examples_test.go
create mode 100644 modules/azure/servicebus/options.go
create mode 100644 modules/azure/servicebus/servicebus.go
create mode 100644 modules/azure/servicebus/servicebus_test.go
create mode 100644 modules/azure/servicebus/testdata/servicebus_config.json
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index 71686d0353..030281c9ca 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -20,7 +20,7 @@ The Azure module exposes the following Go packages:
- [Azurite](#azurite): `github.com/testcontainers/testcontainers-go/modules/azure/azurite`.
- [EventHubs](#eventhubs): `github.com/testcontainers/testcontainers-go/modules/azure/eventhubs`.
-
+- [ServiceBus](#servicebus): `github.com/testcontainers/testcontainers-go/modules/azure/servicebus`.
!!! warning "EULA Acceptance"
Due to licensing restrictions you are required to explicitly accept an End User License Agreement (EULA) for the EventHubs container image. This is facilitated through the `WithAcceptEULA` function.
@@ -219,4 +219,88 @@ In the following example, inspired by the [Azure Event Hubs Go SDK](https://lear
[Create Sample Events](../../modules/azure/eventhubs/examples_test.go) inside_block:createSampleEvents
[Create Batch](../../modules/azure/eventhubs/examples_test.go) inside_block:createBatch
[Send Event Data Batch to the EventHub](../../modules/azure/eventhubs/examples_test.go) inside_block:sendEventDataBatch
+<!--/codeinclude-->
+
+## ServiceBus
+
+### Run function
+
+- 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>
+
+The ServiceBus module exposes one entrypoint function to create the ServiceBus container, and this function receives three parameters:
+
+```golang
+func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*Container, error)
+```
+
+- `context.Context`, the Go context.
+- `string`, the Docker image to use.
+- `testcontainers.ContainerCustomizer`, a variadic argument for passing options.
+
+The ServiceBus container needs a MSSQL Server container to be running, for that reason _Testcontainers for Go_ **automatically creates a Docker network and an MSSQL Server container** for ServiceBus to work.
+When terminating the ServiceBus container, the MSSQL Server container and the Docker network are also terminated.
+
+### Container Options
+
+When starting the ServiceBus container, you can pass options in a variadic way to configure it.
+
+#### Image
+
+You must set a valid Docker image as the second argument in the `Run` function in order to use the ServiceBus container.
+E.g. `Run(context.Background(), "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1")`.
+
+{% include "../features/common_functional_options.md" %}
+
+#### WithMSSQLImage
+
+- 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>
+
+This option allows you to set a different MSSQL Server Docker image, instead of the default one.
+
+#### WithAcceptEULA
+
+- 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>
+
+This option allows you to accept the EULA for the ServiceBus container.
+
+#### WithConfig
+
+- 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>
+
+This option allows you to set a custom ServiceBus config file for the ServiceBus container.
+
+The config file must be a valid ServiceBus config file, and it must be a valid JSON object.
+
+<!--codeinclude-->
+[ServiceBus JSON Config](../../modules/azure/servicebus/testdata/servicebus_config.json)
+<!--/codeinclude-->
+
+### Container Methods
+
+The ServiceBus container exposes the following methods:
+
+#### ConnectionString
+
+- 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>
+
+Returns the connection string to connect to the ServiceBus container and an error, passing the Go context as parameter.
+
+#### MustConnectionString
+
+- 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>
+
+Returns the connection string to connect to the ServiceBus container, passing the Go context as parameter. If an error occurs, it panics.
+
+### Examples
+
+#### Send events to ServiceBus
+
+In the following example, inspired by the [Azure Event Hubs Go SDK](https://learn.microsoft.com/en-us/azure/event-hubs/event-hubs-go-get-started-send), we are creating an EventHubs container and sending events to it.
+
+<!--codeinclude-->
+[ServiceBus Config](../../modules/azure/servicebus/examples_test.go) inside_block:cfg
+[Run ServiceBus Container](../../modules/azure/servicebus/examples_test.go) inside_block:runServiceBusContainer
+[Create Client](../../modules/azure/servicebus/examples_test.go) inside_block:createClient
+[Send messages to a Queue](../../modules/azure/servicebus/examples_test.go) inside_block:sendMessages
+[Receive messages from a Queue](../../modules/azure/servicebus/examples_test.go) inside_block:receiveMessages
<!--/codeinclude-->
\ No newline at end of file
diff --git a/modules/azure/go.mod b/modules/azure/go.mod
index a9c202e237..f4f3f84cb3 100644
--- a/modules/azure/go.mod
+++ b/modules/azure/go.mod
@@ -12,13 +12,17 @@ require (
github.com/stretchr/testify v1.10.0
github.com/testcontainers/testcontainers-go v0.35.0
github.com/testcontainers/testcontainers-go/modules/azurite v0.35.0
+ github.com/testcontainers/testcontainers-go/modules/mssql v0.0.0-00010101000000-000000000000
)
require (
dario.cat/mergo v1.0.0 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.8.0 // indirect
github.com/Azure/go-amqp v1.3.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
+ github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/containerd/containerd v1.7.18 // indirect
@@ -35,8 +39,10 @@ require (
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-jwt/jwt/v5 v5.2.1 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/klauspost/compress v1.17.4 // indirect
+ github.com/kylelemons/godebug v1.1.0 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
@@ -47,6 +53,7 @@ require (
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 // indirect
+ github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
@@ -59,11 +66,13 @@ require (
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
- golang.org/x/crypto v0.32.0 // indirect
- golang.org/x/net v0.34.0 // indirect
- golang.org/x/sys v0.29.0 // indirect
- golang.org/x/text v0.21.0 // indirect
+ golang.org/x/crypto v0.33.0 // indirect
+ golang.org/x/net v0.35.0 // indirect
+ golang.org/x/sys v0.30.0 // indirect
+ golang.org/x/text v0.22.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
replace github.com/testcontainers/testcontainers-go => ../..
+
+replace github.com/testcontainers/testcontainers-go/modules/mssql => ../mssql
diff --git a/modules/azure/go.sum b/modules/azure/go.sum
index cab4601e15..179c7f9ba9 100644
--- a/modules/azure/go.sum
+++ b/modules/azure/go.sum
@@ -6,12 +6,16 @@ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WW
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 h1:B/dfvscEQtew9dVuoxqxrUKKv8Ih2f55PydknDamU+g=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0/go.mod h1:fiPSssYvltE08HJchL04dOy+RD4hgrjph0cwGGMntdI=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 h1:F0gBpfdPLGsw+nsgk6aqqkZS1jiixa5WwFe3fk/T3Ys=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2/go.mod h1:SqINnQ9lVVdRlyC8cd1lCI0SdX4n2paeABd2K8ggfnE=
github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0 h1:NnE8y/opvxowwNcSNHubQUiSSEhfk3dmooLGAOmPuKs=
github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0/go.mod h1:GhHzPHiiHxZloo6WvKu9X7krmSAKTyGoIwoKMbrKTTA=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY=
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.3.0 h1:skbmKp8umb8jMxl4A4CwvYyfCblujU00XUB/ytUjEac=
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.3.0/go.mod h1:nynTZqX7jGM6FQy6Y+7uFT7Y+LhaAeO3q3d48VZzH5E=
+github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.8.0 h1:JNgM3Tz592fUHU2vgwgvOgKxo5s9Ki0y2wicBeckn70=
+github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.8.0/go.mod h1:6vUKmzY17h6dpn9ZLAhM4R/rcrltBeq52qZIkUR7Oro=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/eventhub/armeventhub v1.3.0 h1:4hGvxD72TluuFIXVr8f4XkKZfqAa7Pj61t0jmQ7+kes=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/eventhub/armeventhub v1.3.0/go.mod h1:TSH7DcFItwAufy0Lz+Ft2cyopExCpxbOxI5SkH4dRNo=
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0 h1:PiSrjRPpkQNjrM8H0WwKMnZUdu1RGMtd/LdGKUrOo+c=
@@ -26,6 +30,8 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOEl
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 h1:kYRSnvJju5gYVyhkij+RTJ/VR6QIUaCfWeaFm2ycsjQ=
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3 h1:H5xDQaE3XowWfhZRUpnfC+rGZMEVoSiji+b+/HFAPU4=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
@@ -71,6 +77,10 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c=
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
+github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -96,6 +106,8 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/microsoft/go-mssqldb v1.7.0 h1:sgMPW0HA6Ihd37Yx0MzHyKD726C2kY/8KJsQtXHNaAs=
+github.com/microsoft/go-mssqldb v1.7.0/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA=
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
@@ -163,6 +175,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
+golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -171,6 +185,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
+golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -181,16 +197,21 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
diff --git a/modules/azure/servicebus/examples_test.go b/modules/azure/servicebus/examples_test.go
new file mode 100644
index 0000000000..95655c4d9c
--- /dev/null
+++ b/modules/azure/servicebus/examples_test.go
@@ -0,0 +1,161 @@
+package servicebus_test
+
+import (
+ "context"
+ "fmt"
+ "log"
+ "strings"
+
+ "github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus"
+ "github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/modules/azure/servicebus"
+)
+
+func ExampleRun() {
+ ctx := context.Background()
+
+ serviceBusContainer, err := servicebus.Run(ctx, "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1", servicebus.WithAcceptEULA())
+ defer func() {
+ if err := testcontainers.TerminateContainer(serviceBusContainer); err != nil {
+ log.Printf("failed to terminate container: %s", err)
+ }
+ }()
+ if err != nil {
+ log.Printf("failed to start container: %s", err)
+ return
+ }
+
+ state, err := serviceBusContainer.State(ctx)
+ if err != nil {
+ log.Printf("failed to get container state: %s", err)
+ return
+ }
+
+ fmt.Println(state.Running)
+
+ // Output:
+ // true
+}
+
+// ExampleRun_authenticateCreateClient is inspired by the example from the Azure Service Bus Go SDK:
+// https://learn.microsoft.com/en-us/azure/service-bus-messaging/service-bus-go-how-to-use-queues?tabs=bash
+func ExampleRun_authenticateCreateClient() {
+ // ===== 0. Create a Service Bus config including one queue =====
+ // cfg {
+ cfg := `{
+ "UserConfig": {
+ "Namespaces": [
+ {
+ "Name": "sbemulatorns",
+ "Queues": [
+ {
+ "Name": "queue.1",
+ "Properties": {
+ "DeadLetteringOnMessageExpiration": false,
+ "DefaultMessageTimeToLive": "PT1H",
+ "DuplicateDetectionHistoryTimeWindow": "PT20S",
+ "ForwardDeadLetteredMessagesTo": "",
+ "ForwardTo": "",
+ "LockDuration": "PT1M",
+ "MaxDeliveryCount": 10,
+ "RequiresDuplicateDetection": false,
+ "RequiresSession": false
+ }
+ }
+ ]
+ }
+ ],
+ "Logging": {
+ "Type": "File"
+ }
+ }
+}`
+ // }
+
+ // ===== 1. Run the Service Bus container =====
+ // runServiceBusContainer {
+ ctx := context.Background()
+
+ serviceBusContainer, err := servicebus.Run(
+ ctx,
+ "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1",
+ servicebus.WithAcceptEULA(),
+ servicebus.WithConfig(strings.NewReader(cfg)),
+ )
+ defer func() {
+ if err := testcontainers.TerminateContainer(serviceBusContainer); err != nil {
+ log.Printf("failed to terminate container: %s", err)
+ }
+ }()
+ if err != nil {
+ log.Printf("failed to start container: %s", err)
+ return
+ }
+ // }
+
+ // ===== 2. Create a Service Bus client using a connection string to the namespace =====
+ // createClient {
+ client, err := azservicebus.NewClientFromConnectionString(serviceBusContainer.MustConnectionString(ctx), nil)
+ if err != nil {
+ log.Printf("failed to create client: %s", err)
+ return
+ }
+ // }
+
+ // ===== 3. Send messages to a queue =====
+ // sendMessages {
+ message := "Hello, Testcontainers!"
+
+ sender, err := client.NewSender("queue.1", nil)
+ if err != nil {
+ log.Printf("failed to create sender: %s", err)
+ return
+ }
+ defer sender.Close(context.TODO())
+
+ sbMessage := &azservicebus.Message{
+ Body: []byte(message),
+ }
+ err = sender.SendMessage(context.TODO(), sbMessage, nil)
+ if err != nil {
+ fmt.Printf("failed to send message: %s", err)
+ return
+ }
+ // }
+
+ // ===== 4. Receive messages from the queue =====
+ // receiveMessages {
+ receiver, err := client.NewReceiverForQueue("queue.1", nil)
+ if err != nil {
+ fmt.Printf("failed to create receiver: %s", err)
+ return
+ }
+ defer receiver.Close(context.TODO())
+
+ // Receive 1 message from the queue
+ messagesCount := 1
+
+ messages, err := receiver.ReceiveMessages(context.TODO(), messagesCount, nil)
+ if err != nil {
+ fmt.Printf("failed to receive messages: %s", err)
+ return
+ }
+
+ fmt.Printf("received %d messages\n", len(messages))
+
+ for _, message := range messages {
+ body := message.Body
+ fmt.Printf("%s\n", string(body))
+
+ err = receiver.CompleteMessage(context.TODO(), message, nil)
+ if err != nil {
+ fmt.Printf("failed to complete message: %s", err)
+ return
+ }
+ }
+ // }
+
+ // Output:
+ // received 1 messages
+ // Hello, Testcontainers!
+}
diff --git a/modules/azure/servicebus/options.go b/modules/azure/servicebus/options.go
new file mode 100644
index 0000000000..86b4be5520
--- /dev/null
+++ b/modules/azure/servicebus/options.go
@@ -0,0 +1,65 @@
+package servicebus
+
+import (
+ "io"
+
+ "github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/modules/mssql"
+)
+
+type options struct {
+ mssqlImage string
+ mssqlContainer *mssql.MSSQLServerContainer
+ network *testcontainers.DockerNetwork
+}
+
+func defaultOptions() options {
+ return options{
+ mssqlImage: defaultMSSQLImage,
+ mssqlContainer: nil,
+ }
+}
+
+// Satisfy the testcontainers.CustomizeRequestOption interface
+var _ testcontainers.ContainerCustomizer = (Option)(nil)
+
+// Option is an option for the Redpanda container.
+type Option func(*options)
+
+// Customize is a NOOP. It's defined to satisfy the testcontainers.ContainerCustomizer interface.
+func (o Option) Customize(*testcontainers.GenericContainerRequest) error {
+ // NOOP to satisfy interface.
+ return nil
+}
+
+// WithMSSQLImage sets the image for the MSSQL container.
+// By default, the image is "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04".
+func WithMSSQLImage(img string) Option {
+ return func(o *options) {
+ o.mssqlImage = img
+ }
+}
+
+// WithAcceptEULA sets the ACCEPT_EULA environment variable to "Y" for the eventhubs container.
+func WithAcceptEULA() testcontainers.CustomizeRequestOption {
+ return func(req *testcontainers.GenericContainerRequest) error {
+ req.Env["ACCEPT_EULA"] = "Y"
+
+ return nil
+ }
+}
+
+// WithConfig sets the eventhubs config file for the eventhubs container,
+// copying the content of the reader to the container file at
+// "/ServiceBus_Emulator/ConfigFiles/Config.json".
+func WithConfig(r io.Reader) testcontainers.CustomizeRequestOption {
+ return func(req *testcontainers.GenericContainerRequest) error {
+ req.Files = append(req.Files, testcontainers.ContainerFile{
+ Reader: r,
+ ContainerFilePath: containerConfigFile,
+ FileMode: 0o644,
+ })
+
+ return nil
+ }
+}
diff --git a/modules/azure/servicebus/servicebus.go b/modules/azure/servicebus/servicebus.go
new file mode 100644
index 0000000000..1b217a0ae8
--- /dev/null
+++ b/modules/azure/servicebus/servicebus.go
@@ -0,0 +1,160 @@
+package servicebus
+
+import (
+ "context"
+ "errors"
+ "fmt"
+
+ "github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/modules/mssql"
+ "github.com/testcontainers/testcontainers-go/network"
+ "github.com/testcontainers/testcontainers-go/wait"
+)
+
+const (
+ defaultPort = "5672/tcp"
+ defaultSharedAccessKeyName = "RootManageSharedAccessKey"
+ defaultSharedAccessKey = "SAS_KEY_VALUE"
+ connectionStringFormat = "Endpoint=sb://%s;SharedAccessKeyName=%s;SharedAccessKey=%s;UseDevelopmentEmulator=true;"
+
+ // aliasServiceBus is the alias for the servicebus container in the network
+ aliasServiceBus = "servicebus"
+
+ // aliasMSSQL is the alias for the mssql network
+ aliasMSSQL = "mssql"
+
+ // defaultMSSQLImage is the default image for the mssql container
+ defaultMSSQLImage = "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04"
+
+ // containerConfigFile is the path to the config file for the servicebus container
+ containerConfigFile = "/ServiceBus_Emulator/ConfigFiles/Config.json"
+)
+
+// Container represents the Azure Event Hubs container type used in the module
+type Container struct {
+ testcontainers.Container
+ mssqlOptions *options
+}
+
+func (c *Container) MSSQLContainer() *mssql.MSSQLServerContainer {
+ return c.mssqlOptions.mssqlContainer
+}
+
+// Terminate terminates the etcd container, its child nodes, and the network in which the cluster is running
+// to communicate between the nodes.
+func (c *Container) Terminate(ctx context.Context, opts ...testcontainers.TerminateOption) error {
+ var errs []error
+
+ if c.Container != nil {
+ // terminate the eventhubs container
+ if err := c.Container.Terminate(ctx, opts...); err != nil {
+ errs = append(errs, fmt.Errorf("terminate eventhubs container: %w", err))
+ }
+ }
+
+ // terminate the mssql container if it was created
+ if c.mssqlOptions.mssqlContainer != nil {
+ if err := c.mssqlOptions.mssqlContainer.Terminate(ctx, opts...); err != nil {
+ errs = append(errs, fmt.Errorf("terminate mssql container: %w", err))
+ }
+ }
+
+ // remove the mssql network if it was created
+ if c.mssqlOptions.network != nil {
+ if err := c.mssqlOptions.network.Remove(ctx); err != nil {
+ errs = append(errs, fmt.Errorf("remove mssql network: %w", err))
+ }
+ }
+
+ return errors.Join(errs...)
+}
+
+// Run creates an instance of the Azure Event Hubs container type
+func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*Container, error) {
+ req := testcontainers.ContainerRequest{
+ Image: img,
+ Env: make(map[string]string),
+ ExposedPorts: []string{defaultPort},
+ WaitingFor: wait.ForAll(
+ wait.ForListeningPort(defaultPort),
+ wait.ForLog(".*Emulator Service is Successfully Up!.*").AsRegexp(),
+ ),
+ }
+
+ genericContainerReq := testcontainers.GenericContainerRequest{
+ ContainerRequest: req,
+ Started: true,
+ }
+
+ defaultOptions := defaultOptions()
+ for _, opt := range opts {
+ if err := opt.Customize(&genericContainerReq); err != nil {
+ return nil, fmt.Errorf("customize: %w", err)
+ }
+ if o, ok := opt.(Option); ok {
+ o(&defaultOptions)
+ }
+ }
+
+ if genericContainerReq.Env["ACCEPT_EULA"] == "" {
+ return nil, errors.New("EULA not accepted. Please use the WithAcceptEULA option to accept the EULA")
+ }
+
+ c := &Container{mssqlOptions: &defaultOptions}
+
+ if defaultOptions.mssqlContainer == nil {
+ mssqlNetwork, err := network.New(ctx)
+ if err != nil {
+ return c, fmt.Errorf("new mssql network: %w", err)
+ }
+ defaultOptions.network = mssqlNetwork
+
+ // Start the mssql container first. The EULA is accepted by default, as it is required by the servicebus emulator.
+ mssqlContainer, err := mssql.Run(ctx, defaultOptions.mssqlImage, mssql.WithAcceptEULA(), network.WithNetwork([]string{aliasMSSQL}, mssqlNetwork))
+ if err != nil {
+ return nil, fmt.Errorf("run mssql container: %w", err)
+ }
+ defaultOptions.mssqlContainer = mssqlContainer
+
+ genericContainerReq.Env["SQL_SERVER"] = aliasMSSQL
+ genericContainerReq.Env["MSSQL_SA_PASSWORD"] = mssqlContainer.Password()
+
+ // apply the network to the eventhubs container
+ err = network.WithNetwork([]string{aliasServiceBus}, mssqlNetwork)(&genericContainerReq)
+ if err != nil {
+ return c, fmt.Errorf("with network: %w", err)
+ }
+ }
+
+ var err error
+ c.Container, err = testcontainers.GenericContainer(ctx, genericContainerReq)
+ if err != nil {
+ return c, fmt.Errorf("generic container: %w", err)
+ }
+
+ return c, nil
+}
+
+// ConnectionString returns the connection string for the eventhubs container,
+// using the following format:
+// Endpoint=sb://<hostname>:<port>;SharedAccessKeyName=<key-name>;SharedAccessKey=<key>;UseDevelopmentEmulator=true;
+func (c *Container) ConnectionString(ctx context.Context) (string, error) {
+ // we are passing an empty proto to get the host:port string
+ hostPort, err := c.PortEndpoint(ctx, defaultPort, "")
+ if err != nil {
+ return "", fmt.Errorf("port endpoint: %w", err)
+ }
+
+ return fmt.Sprintf(connectionStringFormat, hostPort, defaultSharedAccessKeyName, defaultSharedAccessKey), nil
+}
+
+// MustConnectionString returns the connection string for the eventhubs container,
+// calling [Container.ConnectionString] and panicking if it returns an error.
+func (c *Container) MustConnectionString(ctx context.Context) string {
+ url, err := c.ConnectionString(ctx)
+ if err != nil {
+ panic(err)
+ }
+
+ return url
+}
diff --git a/modules/azure/servicebus/servicebus_test.go b/modules/azure/servicebus/servicebus_test.go
new file mode 100644
index 0000000000..87241d67a4
--- /dev/null
+++ b/modules/azure/servicebus/servicebus_test.go
@@ -0,0 +1,82 @@
+package servicebus_test
+
+import (
+ "context"
+ _ "embed"
+ "io"
+ "strings"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+
+ "github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/modules/azure/servicebus"
+)
+
+//go:embed testdata/servicebus_config.json
+var servicebusConfig string
+
+func TestServiceBus_topology(t *testing.T) {
+ ctx := context.Background()
+
+ const mssqlImage = "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04"
+
+ ctr, err := servicebus.Run(
+ ctx,
+ "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1",
+ servicebus.WithAcceptEULA(),
+ servicebus.WithMSSQLImage(mssqlImage),
+ )
+ testcontainers.CleanupContainer(t, ctr)
+ require.NoError(t, err)
+
+ // assert that both containers belong to the same network
+ serviceBusNetworks, err := ctr.Networks(ctx)
+ require.NoError(t, err)
+ require.Len(t, serviceBusNetworks, 1)
+
+ mssqlContainer := ctr.MSSQLContainer()
+ mssqlNetworks, err := mssqlContainer.Networks(ctx)
+ require.NoError(t, err)
+ require.Len(t, mssqlNetworks, 1)
+
+ require.Equal(t, mssqlNetworks[0], serviceBusNetworks[0])
+
+ // mssql image version
+ inspect, err := mssqlContainer.Inspect(ctx)
+ require.NoError(t, err)
+ require.Equal(t, mssqlImage, inspect.Config.Image)
+}
+
+func TestServiceBus_withConfig(t *testing.T) {
+ ctx := context.Background()
+
+ const mssqlImage = "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04"
+
+ ctr, err := servicebus.Run(
+ ctx,
+ "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1",
+ servicebus.WithAcceptEULA(),
+ servicebus.WithMSSQLImage(mssqlImage),
+ servicebus.WithConfig(strings.NewReader(servicebusConfig)),
+ )
+ testcontainers.CleanupContainer(t, ctr)
+ require.NoError(t, err)
+
+ // assert that the config file was created in the right location.
+ rc, err := ctr.CopyFileFromContainer(ctx, "/ServiceBus_Emulator/ConfigFiles/Config.json")
+ require.NoError(t, err)
+ defer rc.Close()
+
+ content, err := io.ReadAll(rc)
+ require.NoError(t, err)
+ require.Equal(t, servicebusConfig, string(content))
+}
+
+func TestServiceBus_noEULA(t *testing.T) {
+ ctx := context.Background()
+
+ ctr, err := servicebus.Run(ctx, "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1")
+ require.Error(t, err)
+ require.Nil(t, ctr)
+}
diff --git a/modules/azure/servicebus/testdata/servicebus_config.json b/modules/azure/servicebus/testdata/servicebus_config.json
new file mode 100644
index 0000000000..49371b9f95
--- /dev/null
+++ b/modules/azure/servicebus/testdata/servicebus_config.json
@@ -0,0 +1,28 @@
+{
+ "UserConfig": {
+ "Namespaces": [
+ {
+ "Name": "sbemulatorns",
+ "Queues": [
+ {
+ "Name": "queue.1",
+ "Properties": {
+ "DeadLetteringOnMessageExpiration": false,
+ "DefaultMessageTimeToLive": "PT1H",
+ "DuplicateDetectionHistoryTimeWindow": "PT20S",
+ "ForwardDeadLetteredMessagesTo": "",
+ "ForwardTo": "",
+ "LockDuration": "PT1M",
+ "MaxDeliveryCount": 10,
+ "RequiresDuplicateDetection": false,
+ "RequiresSession": false
+ }
+ }
+ ]
+ }
+ ],
+ "Logging": {
+ "Type": "File"
+ }
+ }
+}
From de0bcdc1e9318a28bf88b3958c1e3242dc4a056b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 6 Mar 2025 11:49:03 +0100
Subject: [PATCH 09/43] chore: add wait strategy for the eventhubs container
---
modules/azure/eventhubs/eventhubs.go | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/modules/azure/eventhubs/eventhubs.go b/modules/azure/eventhubs/eventhubs.go
index 58ce381b11..b574c1c9bb 100644
--- a/modules/azure/eventhubs/eventhubs.go
+++ b/modules/azure/eventhubs/eventhubs.go
@@ -8,6 +8,7 @@ import (
"github.com/testcontainers/testcontainers-go"
"github.com/testcontainers/testcontainers-go/modules/azure/azurite"
"github.com/testcontainers/testcontainers-go/network"
+ "github.com/testcontainers/testcontainers-go/wait"
)
const (
@@ -68,6 +69,10 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
req := testcontainers.ContainerRequest{
Image: img,
Env: make(map[string]string),
+ WaitingFor: wait.ForAll(
+ wait.ForListeningPort(defaultAMPQPort),
+ wait.ForLog(".*Emulator Service is Successfully Up.*").AsRegexp(),
+ ),
}
genericContainerReq := testcontainers.GenericContainerRequest{
From de62a496d38059cd42936560fdeddbc0d7a8aaaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 6 Mar 2025 11:50:19 +0100
Subject: [PATCH 10/43] chore: add more robust wait strategies for the azurite
container
---
modules/azure/azurite/azurite.go | 3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/azure/azurite/azurite.go b/modules/azure/azurite/azurite.go
index 0dc3037c95..d98e70b690 100644
--- a/modules/azure/azurite/azurite.go
+++ b/modules/azure/azurite/azurite.go
@@ -99,12 +99,15 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
switch srv {
case BlobService:
genericContainerReq.Cmd = append(genericContainerReq.Cmd, "--blobHost", "0.0.0.0")
+ waitingFor = append(waitingFor, wait.ForListeningPort(BlobPort))
waitingFor = append(waitingFor, wait.ForLog("Blob service is successfully listening"))
case QueueService:
genericContainerReq.Cmd = append(genericContainerReq.Cmd, "--queueHost", "0.0.0.0")
+ waitingFor = append(waitingFor, wait.ForListeningPort(QueuePort))
waitingFor = append(waitingFor, wait.ForLog("Queue service is successfully listening"))
case TableService:
genericContainerReq.Cmd = append(genericContainerReq.Cmd, "--tableHost", "0.0.0.0")
+ waitingFor = append(waitingFor, wait.ForListeningPort(TablePort))
waitingFor = append(waitingFor, wait.ForLog("Table service is successfully listening"))
}
}
From 87b684304e5a020c459147f7ebd5748dc274b3e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 6 Mar 2025 11:56:03 +0100
Subject: [PATCH 11/43] chore: add more tests for the azurite module
---
modules/azure/azurite/azurite_test.go | 44 +++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/modules/azure/azurite/azurite_test.go b/modules/azure/azurite/azurite_test.go
index bacc69023f..a6b9edd3c9 100644
--- a/modules/azure/azurite/azurite_test.go
+++ b/modules/azure/azurite/azurite_test.go
@@ -19,3 +19,47 @@ func TestAzurite(t *testing.T) {
// perform assertions
}
+
+func TestAzurite_inMemoryPersistence(t *testing.T) {
+ ctx := context.Background()
+
+ t.Run("v28-above", func(t *testing.T) {
+ ctr, err := azurite.Run(ctx, "mcr.microsoft.com/azure-storage/azurite:3.28.0", azurite.WithInMemoryPersistence(64))
+ testcontainers.CleanupContainer(t, ctr)
+ require.NoError(t, err)
+ })
+
+ t.Run("v27-below", func(t *testing.T) {
+ ctr, err := azurite.Run(ctx, "mcr.microsoft.com/azure-storage/azurite:3.23.0", azurite.WithInMemoryPersistence(64))
+ testcontainers.CleanupContainer(t, ctr)
+ require.Error(t, err)
+ })
+}
+
+func TestAzurite_serviceURL(t *testing.T) {
+ ctx := context.Background()
+
+ ctr, err := azurite.Run(ctx, "mcr.microsoft.com/azure-storage/azurite:3.23.0")
+ testcontainers.CleanupContainer(t, ctr)
+ require.NoError(t, err)
+
+ t.Run("blob", func(t *testing.T) {
+ _, err := ctr.ServiceURL(ctx, azurite.BlobService)
+ require.NoError(t, err)
+ })
+
+ t.Run("queue", func(t *testing.T) {
+ _, err := ctr.ServiceURL(ctx, azurite.QueueService)
+ require.NoError(t, err)
+ })
+
+ t.Run("table", func(t *testing.T) {
+ _, err := ctr.ServiceURL(ctx, azurite.TableService)
+ require.NoError(t, err)
+ })
+
+ t.Run("unknown-service", func(t *testing.T) {
+ _, err := ctr.ServiceURL(ctx, "unknown")
+ require.Error(t, err)
+ })
+}
From 5b2c75a1b112d494fd8b23e43f282d1cd521cad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 6 Mar 2025 11:56:25 +0100
Subject: [PATCH 12/43] chore: run mod tidy
---
modules/azure/go.mod | 6 +-----
modules/azure/go.sum | 17 ++---------------
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/modules/azure/go.mod b/modules/azure/go.mod
index f4f3f84cb3..6d46735a5e 100644
--- a/modules/azure/go.mod
+++ b/modules/azure/go.mod
@@ -6,6 +6,7 @@ require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.3.0
+ github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.8.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue v1.0.0
github.com/docker/go-connections v0.5.0
@@ -19,10 +20,8 @@ require (
dario.cat/mergo v1.0.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
- github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.8.0 // indirect
github.com/Azure/go-amqp v1.3.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
- github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/containerd/containerd v1.7.18 // indirect
@@ -39,10 +38,8 @@ require (
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-jwt/jwt/v5 v5.2.1 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/klauspost/compress v1.17.4 // indirect
- github.com/kylelemons/godebug v1.1.0 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
@@ -53,7 +50,6 @@ require (
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 // indirect
- github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
diff --git a/modules/azure/go.sum b/modules/azure/go.sum
index 179c7f9ba9..e6db084560 100644
--- a/modules/azure/go.sum
+++ b/modules/azure/go.sum
@@ -4,8 +4,6 @@ github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 h1:B/dfvscEQtew9dVuoxqxrUKKv8Ih2f55PydknDamU+g=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0/go.mod h1:fiPSssYvltE08HJchL04dOy+RD4hgrjph0cwGGMntdI=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 h1:F0gBpfdPLGsw+nsgk6aqqkZS1jiixa5WwFe3fk/T3Ys=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2/go.mod h1:SqINnQ9lVVdRlyC8cd1lCI0SdX4n2paeABd2K8ggfnE=
github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0 h1:NnE8y/opvxowwNcSNHubQUiSSEhfk3dmooLGAOmPuKs=
@@ -28,8 +26,6 @@ github.com/Azure/go-amqp v1.3.0 h1://1rikYhoIQNXJFXyoO/Rlb4+4EkHYfJceNtLlys2/4=
github.com/Azure/go-amqp v1.3.0/go.mod h1:vZAogwdrkbyK3Mla8m/CxSc/aKdnTZ4IbPxl51Y5WZE=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 h1:kYRSnvJju5gYVyhkij+RTJ/VR6QIUaCfWeaFm2ycsjQ=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3 h1:H5xDQaE3XowWfhZRUpnfC+rGZMEVoSiji+b+/HFAPU4=
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
@@ -173,8 +169,6 @@ go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v8
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -183,8 +177,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -197,19 +189,14 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
From 74ab1a57bcd74a8e6ed5475f2b24bc800ce30016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 6 Mar 2025 12:20:48 +0100
Subject: [PATCH 13/43] fix: use the new azurite imports
---
modules/azure/azurite/examples_test.go | 2 +-
modules/azurite/go.mod | 4 ++--
modules/azurite/go.sum | 20 ++++++++++----------
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/modules/azure/azurite/examples_test.go b/modules/azure/azurite/examples_test.go
index 5b3f490b43..7a59b7ee65 100644
--- a/modules/azure/azurite/examples_test.go
+++ b/modules/azure/azurite/examples_test.go
@@ -13,7 +13,7 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/storage/azqueue"
"github.com/testcontainers/testcontainers-go"
- "github.com/testcontainers/testcontainers-go/modules/azurite"
+ "github.com/testcontainers/testcontainers-go/modules/azure/azurite"
)
func ExampleRun() {
diff --git a/modules/azurite/go.mod b/modules/azurite/go.mod
index 3fa2247661..481be944da 100644
--- a/modules/azurite/go.mod
+++ b/modules/azurite/go.mod
@@ -56,8 +56,8 @@ require (
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
- golang.org/x/crypto v0.32.0 // indirect
- golang.org/x/sys v0.29.0 // indirect
+ golang.org/x/crypto v0.33.0 // indirect
+ golang.org/x/sys v0.30.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/modules/azurite/go.sum b/modules/azurite/go.sum
index c92dfe0ba6..60b0b327ee 100644
--- a/modules/azurite/go.sum
+++ b/modules/azurite/go.sum
@@ -135,16 +135,16 @@ go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v8
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
+golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
+golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
+golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
+golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -157,14 +157,14 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
-golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
+golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
From 0379d78588201eb49fbb2016b77ccf3a5e4cdd49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 6 Mar 2025 13:13:42 +0100
Subject: [PATCH 14/43] fix: lint
---
modules/azure/servicebus/examples_test.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules/azure/servicebus/examples_test.go b/modules/azure/servicebus/examples_test.go
index 95655c4d9c..e4cb3ee029 100644
--- a/modules/azure/servicebus/examples_test.go
+++ b/modules/azure/servicebus/examples_test.go
@@ -7,6 +7,7 @@ import (
"strings"
"github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus"
+
"github.com/testcontainers/testcontainers-go"
"github.com/testcontainers/testcontainers-go/modules/azure/servicebus"
)
From 80480d44e39901be0cfdc3a9cabf17b33c31fbae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 6 Mar 2025 14:02:38 +0100
Subject: [PATCH 15/43] chore: remove unused import
---
modules/azure/go.mod | 1 -
1 file changed, 1 deletion(-)
diff --git a/modules/azure/go.mod b/modules/azure/go.mod
index 6d46735a5e..12472a9fe6 100644
--- a/modules/azure/go.mod
+++ b/modules/azure/go.mod
@@ -12,7 +12,6 @@ require (
github.com/docker/go-connections v0.5.0
github.com/stretchr/testify v1.10.0
github.com/testcontainers/testcontainers-go v0.35.0
- github.com/testcontainers/testcontainers-go/modules/azurite v0.35.0
github.com/testcontainers/testcontainers-go/modules/mssql v0.0.0-00010101000000-000000000000
)
From 71ea08bd5eae04f6c43956dfedb952445d28f922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 6 Mar 2025 14:03:34 +0100
Subject: [PATCH 16/43] chore: pin mssql version
---
modules/azure/go.mod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/azure/go.mod b/modules/azure/go.mod
index 12472a9fe6..9971b86f5a 100644
--- a/modules/azure/go.mod
+++ b/modules/azure/go.mod
@@ -12,7 +12,7 @@ require (
github.com/docker/go-connections v0.5.0
github.com/stretchr/testify v1.10.0
github.com/testcontainers/testcontainers-go v0.35.0
- github.com/testcontainers/testcontainers-go/modules/mssql v0.0.0-00010101000000-000000000000
+ github.com/testcontainers/testcontainers-go/modules/mssql v0.35.0
)
require (
From 05ccaad527287b5e5de9fcd8283851e0414b352a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 6 Mar 2025 15:05:06 +0100
Subject: [PATCH 17/43] fix: mod tidy
---
modules/azure/go.sum | 2 --
1 file changed, 2 deletions(-)
diff --git a/modules/azure/go.sum b/modules/azure/go.sum
index e6db084560..5ef0b91208 100644
--- a/modules/azure/go.sum
+++ b/modules/azure/go.sum
@@ -140,8 +140,6 @@ github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/testcontainers/testcontainers-go/modules/azurite v0.35.0 h1:gUZ25e1DVE/0+ZZ0nupsIo+C1j7UNloN7Pkg3w6tceI=
-github.com/testcontainers/testcontainers-go/modules/azurite v0.35.0/go.mod h1:2Fc67EpyOEexLAF99zhSuzu9H22zd83pkjxEHHTtHf4=
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
From fbf78a0874c061ca762a70c75ab90219ee48a1e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Mon, 10 Mar 2025 17:05:52 +0100
Subject: [PATCH 18/43] wip: cosmosdb container
---
modules/azure/cosmosdb/cosmosdb.go | 119 +++++++++++++++
modules/azure/cosmosdb/cosmosdb_test.go | 20 +++
modules/azure/cosmosdb/examples_test.go | 188 ++++++++++++++++++++++++
modules/azure/go.mod | 2 +
modules/azure/go.sum | 4 +
5 files changed, 333 insertions(+)
create mode 100644 modules/azure/cosmosdb/cosmosdb.go
create mode 100644 modules/azure/cosmosdb/cosmosdb_test.go
create mode 100644 modules/azure/cosmosdb/examples_test.go
diff --git a/modules/azure/cosmosdb/cosmosdb.go b/modules/azure/cosmosdb/cosmosdb.go
new file mode 100644
index 0000000000..b29a06a3bb
--- /dev/null
+++ b/modules/azure/cosmosdb/cosmosdb.go
@@ -0,0 +1,119 @@
+package cosmosdb
+
+import (
+ "context"
+ "fmt"
+ "strconv"
+ "time"
+
+ "github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/wait"
+)
+
+const (
+ defaultPort = "8081/tcp"
+
+ connectionStringFormat = "AccountEndpoint=%s;AccountKey=%s"
+
+ // EmulatorKey is a known constant and specified in Azure Cosmos DB Documents.
+ // This key is also used as password for emulator certificate file.
+ EmulatorKey = "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="
+)
+
+// Container represents the Azure CosmosDB emulator container type used in the module
+type Container struct {
+ testcontainers.Container
+}
+
+// Run creates an instance of the Azure CosmosDB emulator container type
+func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*Container, error) {
+ req := testcontainers.ContainerRequest{
+ Image: img,
+ Env: map[string]string{
+ "AZURE_COSMOS_EMULATOR_PARTITION_COUNT": "15",
+ "AZURE_COSMOS_EMULATOR_ENABLE_DATA_PERSISTENCE": "false",
+ "LOG_LEVEL": "info",
+ },
+ ExposedPorts: []string{defaultPort},
+ }
+
+ genericContainerReq := testcontainers.GenericContainerRequest{
+ ContainerRequest: req,
+ Started: true,
+ }
+
+ for _, opt := range opts {
+ if err := opt.Customize(&genericContainerReq); err != nil {
+ return nil, fmt.Errorf("customize: %w", err)
+ }
+ }
+
+ occurrences := genericContainerReq.Env["AZURE_COSMOS_EMULATOR_PARTITION_COUNT"]
+ occurrencesInt, err := strconv.Atoi(occurrences)
+ if err != nil {
+ return nil, fmt.Errorf("convert partition count to int: %w", err)
+ }
+
+ genericContainerReq.WaitingFor = wait.ForAll(
+ wait.ForListeningPort(defaultPort).SkipInternalCheck(),
+ // the log message format, for 3 partitions, is:
+ // "Started 1/4 partitions"
+ // "Started 2/4 partitions"
+ // "Started 3/4 partitions"
+ // "Started 4/4 partitions"
+ // "Started"
+ wait.ForLog("Started").WithStartupTimeout(time.Minute).WithOccurrence(occurrencesInt+2),
+ )
+
+ container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
+ var c *Container
+ if container != nil {
+ c = &Container{Container: container}
+ }
+
+ if err != nil {
+ return c, fmt.Errorf("generic container: %w", err)
+ }
+
+ return c, nil
+}
+
+// ConnectionString returns the connection string for the cosmosdb emulator,
+// using the following format: AccountEndpoint=</host:port>;AccountKey=<key>;
+func (c *Container) ConnectionString(ctx context.Context) (string, error) {
+ hostPort, err := c.PortEndpoint(ctx, defaultPort, "http")
+ if err != nil {
+ return "", fmt.Errorf("port endpoint: %w", err)
+ }
+
+ return fmt.Sprintf(connectionStringFormat, hostPort, EmulatorKey), nil
+}
+
+// MustConnectionString returns the connection string for the cosmosdb emulator,
+// calling [Container.ConnectionString] and panicking if it returns an error.
+func (c *Container) MustConnectionString(ctx context.Context) string {
+ connString, err := c.ConnectionString(ctx)
+ if err != nil {
+ panic(err)
+ }
+
+ return connString
+}
+
+// WithPartitionCount sets the partition count for the cosmosdb emulator.
+// The default is 15.
+func WithPartitionCount(count int) testcontainers.CustomizeRequestOption {
+ return func(req *testcontainers.GenericContainerRequest) error {
+ req.Env["AZURE_COSMOS_EMULATOR_PARTITION_COUNT"] = strconv.Itoa(count)
+ return nil
+ }
+}
+
+// WithLogLevel sets the log level for the cosmosdb emulator.
+// The default is "info".
+func WithLogLevel(level string) testcontainers.CustomizeRequestOption {
+ return func(req *testcontainers.GenericContainerRequest) error {
+ req.Env["LOG_LEVEL"] = level
+ return nil
+ }
+}
diff --git a/modules/azure/cosmosdb/cosmosdb_test.go b/modules/azure/cosmosdb/cosmosdb_test.go
new file mode 100644
index 0000000000..4e03def606
--- /dev/null
+++ b/modules/azure/cosmosdb/cosmosdb_test.go
@@ -0,0 +1,20 @@
+package cosmosdb_test
+
+import (
+ "context"
+ _ "embed"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+
+ "github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/modules/azure/cosmosdb"
+)
+
+func TestCosmosDB(t *testing.T) {
+ ctx := context.Background()
+
+ ctr, err := cosmosdb.Run(ctx, "mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest")
+ testcontainers.CleanupContainer(t, ctr)
+ require.NoError(t, err)
+}
diff --git a/modules/azure/cosmosdb/examples_test.go b/modules/azure/cosmosdb/examples_test.go
new file mode 100644
index 0000000000..6bf6d2d77c
--- /dev/null
+++ b/modules/azure/cosmosdb/examples_test.go
@@ -0,0 +1,188 @@
+package cosmosdb_test
+
+import (
+ "context"
+ "crypto/tls"
+ "encoding/json"
+ "fmt"
+ "log"
+ "net/http"
+
+ "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
+ "github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos"
+
+ "github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/modules/azure/cosmosdb"
+)
+
+func ExampleRun() {
+ // runCosmosDBContainer {
+ ctx := context.Background()
+
+ cosmosdbCtr, err := cosmosdb.Run(
+ ctx,
+ "mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest",
+ )
+ defer func() {
+ if err := testcontainers.TerminateContainer(cosmosdbCtr); err != nil {
+ log.Printf("failed to terminate container: %s", err)
+ }
+ }()
+ if err != nil {
+ log.Printf("failed to start container: %s", err)
+ return
+ }
+ // }
+
+ state, err := cosmosdbCtr.State(ctx)
+ if err != nil {
+ log.Printf("failed to get container state: %s", err)
+ return
+ }
+
+ fmt.Println(state.Running)
+
+ // Output:
+ // true
+}
+
+// ExampleRun_authenticateCreateClient is inspired by the example from the Azure CosmosDB Go SDK:
+// https://docs.azure.cn/en-us/cosmos-db/nosql/samples-go
+func ExampleRun_authenticateCreateClient() {
+ // ===== 1. Run the CosmosDB container =====
+ ctx := context.Background()
+
+ cosmosdbContainer, err := cosmosdb.Run(
+ ctx,
+ "mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest",
+ cosmosdb.WithPartitionCount(3),
+ cosmosdb.WithLogLevel("debug"),
+ )
+ defer func() {
+ if err := testcontainers.TerminateContainer(cosmosdbContainer); err != nil {
+ log.Printf("failed to terminate container: %s", err)
+ }
+ }()
+ if err != nil {
+ log.Printf("failed to start container: %s", err)
+ return
+ }
+
+ // ===== 2. Create a CosmosDB client using a connection string to the container =====
+ // createClient {
+ clientOpts := azcosmos.ClientOptions{
+ ClientOptions: policy.ClientOptions{
+ Transport: &http.Client{
+ Transport: &http.Transport{
+ TLSClientConfig: &tls.Config{
+ InsecureSkipVerify: true,
+ },
+ },
+ },
+ },
+ }
+
+ client, err := azcosmos.NewClientFromConnectionString(cosmosdbContainer.MustConnectionString(ctx), &clientOpts)
+ if err != nil {
+ log.Printf("failed to create client: %s", err)
+ return
+ }
+ // }
+
+ // ===== 3. Create a CosmosDB database =====
+ // createDatabase {
+ dbName := "myDatabase"
+
+ databaseClient, err := client.NewDatabase(dbName)
+ if err != nil {
+ log.Printf("failed to create database: %s", err)
+ return
+ }
+ // }
+
+ // ===== 4. Create a CosmosDB container =====
+ // createContainer {
+ containerName := "myContainer"
+
+ cosmosDBContainerClient, err := databaseClient.NewContainer(containerName)
+ if err != nil {
+ log.Printf("failed to create container: %s", err)
+ return
+ }
+ // }
+
+ fmt.Println(cosmosDBContainerClient.ID())
+
+ // ===== 5. CRUD Operations =====
+ item := map[string]string{
+ "id": "1",
+ "value": "2",
+ }
+
+ marshalled, err := json.Marshal(item)
+ if err != nil {
+ log.Printf("failed to marshal item: %s", err)
+ return
+ }
+
+ pk := azcosmos.NewPartitionKeyString("1")
+ id := "1"
+
+ // Create an item
+ itemResponse, err := cosmosDBContainerClient.CreateItem(context.Background(), pk, marshalled, nil)
+ if err != nil {
+ log.Printf("failed to create item: %s", err)
+ return
+ }
+
+ // Read an item
+ itemResponse, err = cosmosDBContainerClient.ReadItem(context.Background(), pk, id, nil)
+ if err != nil {
+ log.Printf("failed to read item: %s", err)
+ return
+ }
+
+ var itemResponseBody map[string]string
+ err = json.Unmarshal(itemResponse.Value, &itemResponseBody)
+ if err != nil {
+ log.Printf("failed to unmarshal item: %s", err)
+ return
+ }
+
+ itemResponseBody["value"] = "3"
+ marshalledReplace, err := json.Marshal(itemResponseBody)
+ if err != nil {
+ log.Printf("failed to marshal item: %s", err)
+ return
+ }
+
+ // Replace an item
+ itemResponse, err = cosmosDBContainerClient.ReplaceItem(context.Background(), pk, id, marshalledReplace, nil)
+ if err != nil {
+ log.Printf("failed to replace item: %s", err)
+ return
+ }
+
+ // Patch an item
+ patch := azcosmos.PatchOperations{}
+
+ patch.AppendAdd("/newField", "newValue")
+ patch.AppendRemove("/oldFieldToRemove")
+
+ itemResponse, err = cosmosDBContainerClient.PatchItem(context.Background(), pk, id, patch, nil)
+ if err != nil {
+ log.Printf("failed to patch item: %s", err)
+ return
+ }
+
+ // Delete an item
+ itemResponse, err = cosmosDBContainerClient.DeleteItem(context.Background(), pk, id, nil)
+ if err != nil {
+ log.Printf("failed to delete item: %s", err)
+ return
+ }
+
+ // Output:
+ // myDatabase
+ // myContainer
+}
diff --git a/modules/azure/go.mod b/modules/azure/go.mod
index 9971b86f5a..62f3d7c3b3 100644
--- a/modules/azure/go.mod
+++ b/modules/azure/go.mod
@@ -4,6 +4,7 @@ go 1.23.0
require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
+ github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos v1.3.0
github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.3.0
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.8.0
@@ -17,6 +18,7 @@ require (
require (
dario.cat/mergo v1.0.0 // indirect
+ github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/Azure/go-amqp v1.3.0 // indirect
diff --git a/modules/azure/go.sum b/modules/azure/go.sum
index 5ef0b91208..b9bb07fb52 100644
--- a/modules/azure/go.sum
+++ b/modules/azure/go.sum
@@ -2,10 +2,14 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
+github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU=
+github.com/Azure/azure-sdk-for-go v68.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 h1:F0gBpfdPLGsw+nsgk6aqqkZS1jiixa5WwFe3fk/T3Ys=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2/go.mod h1:SqINnQ9lVVdRlyC8cd1lCI0SdX4n2paeABd2K8ggfnE=
+github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos v1.3.0 h1:RGcdpSElvcXCwxydI0xzOBu1Gvp88OoiTGfbtO/z1m0=
+github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos v1.3.0/go.mod h1:YwUyrNUtcZcibA99JcfCP6UUp95VVQKO2MJfBzgJDwA=
github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0 h1:NnE8y/opvxowwNcSNHubQUiSSEhfk3dmooLGAOmPuKs=
github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0/go.mod h1:GhHzPHiiHxZloo6WvKu9X7krmSAKTyGoIwoKMbrKTTA=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY=
From fc1e31cf11cee6e3fb4b338636331817ce3688d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Tue, 11 Mar 2025 12:24:44 +0100
Subject: [PATCH 19/43] Revert "wip: cosmosdb container"
This reverts commit fbf78a0874c061ca762a70c75ab90219ee48a1e5.
---
modules/azure/cosmosdb/cosmosdb.go | 119 ---------------
modules/azure/cosmosdb/cosmosdb_test.go | 20 ---
modules/azure/cosmosdb/examples_test.go | 188 ------------------------
modules/azure/go.mod | 2 -
modules/azure/go.sum | 4 -
5 files changed, 333 deletions(-)
delete mode 100644 modules/azure/cosmosdb/cosmosdb.go
delete mode 100644 modules/azure/cosmosdb/cosmosdb_test.go
delete mode 100644 modules/azure/cosmosdb/examples_test.go
diff --git a/modules/azure/cosmosdb/cosmosdb.go b/modules/azure/cosmosdb/cosmosdb.go
deleted file mode 100644
index b29a06a3bb..0000000000
--- a/modules/azure/cosmosdb/cosmosdb.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package cosmosdb
-
-import (
- "context"
- "fmt"
- "strconv"
- "time"
-
- "github.com/testcontainers/testcontainers-go"
- "github.com/testcontainers/testcontainers-go/wait"
-)
-
-const (
- defaultPort = "8081/tcp"
-
- connectionStringFormat = "AccountEndpoint=%s;AccountKey=%s"
-
- // EmulatorKey is a known constant and specified in Azure Cosmos DB Documents.
- // This key is also used as password for emulator certificate file.
- EmulatorKey = "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="
-)
-
-// Container represents the Azure CosmosDB emulator container type used in the module
-type Container struct {
- testcontainers.Container
-}
-
-// Run creates an instance of the Azure CosmosDB emulator container type
-func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*Container, error) {
- req := testcontainers.ContainerRequest{
- Image: img,
- Env: map[string]string{
- "AZURE_COSMOS_EMULATOR_PARTITION_COUNT": "15",
- "AZURE_COSMOS_EMULATOR_ENABLE_DATA_PERSISTENCE": "false",
- "LOG_LEVEL": "info",
- },
- ExposedPorts: []string{defaultPort},
- }
-
- genericContainerReq := testcontainers.GenericContainerRequest{
- ContainerRequest: req,
- Started: true,
- }
-
- for _, opt := range opts {
- if err := opt.Customize(&genericContainerReq); err != nil {
- return nil, fmt.Errorf("customize: %w", err)
- }
- }
-
- occurrences := genericContainerReq.Env["AZURE_COSMOS_EMULATOR_PARTITION_COUNT"]
- occurrencesInt, err := strconv.Atoi(occurrences)
- if err != nil {
- return nil, fmt.Errorf("convert partition count to int: %w", err)
- }
-
- genericContainerReq.WaitingFor = wait.ForAll(
- wait.ForListeningPort(defaultPort).SkipInternalCheck(),
- // the log message format, for 3 partitions, is:
- // "Started 1/4 partitions"
- // "Started 2/4 partitions"
- // "Started 3/4 partitions"
- // "Started 4/4 partitions"
- // "Started"
- wait.ForLog("Started").WithStartupTimeout(time.Minute).WithOccurrence(occurrencesInt+2),
- )
-
- container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
- var c *Container
- if container != nil {
- c = &Container{Container: container}
- }
-
- if err != nil {
- return c, fmt.Errorf("generic container: %w", err)
- }
-
- return c, nil
-}
-
-// ConnectionString returns the connection string for the cosmosdb emulator,
-// using the following format: AccountEndpoint=</host:port>;AccountKey=<key>;
-func (c *Container) ConnectionString(ctx context.Context) (string, error) {
- hostPort, err := c.PortEndpoint(ctx, defaultPort, "http")
- if err != nil {
- return "", fmt.Errorf("port endpoint: %w", err)
- }
-
- return fmt.Sprintf(connectionStringFormat, hostPort, EmulatorKey), nil
-}
-
-// MustConnectionString returns the connection string for the cosmosdb emulator,
-// calling [Container.ConnectionString] and panicking if it returns an error.
-func (c *Container) MustConnectionString(ctx context.Context) string {
- connString, err := c.ConnectionString(ctx)
- if err != nil {
- panic(err)
- }
-
- return connString
-}
-
-// WithPartitionCount sets the partition count for the cosmosdb emulator.
-// The default is 15.
-func WithPartitionCount(count int) testcontainers.CustomizeRequestOption {
- return func(req *testcontainers.GenericContainerRequest) error {
- req.Env["AZURE_COSMOS_EMULATOR_PARTITION_COUNT"] = strconv.Itoa(count)
- return nil
- }
-}
-
-// WithLogLevel sets the log level for the cosmosdb emulator.
-// The default is "info".
-func WithLogLevel(level string) testcontainers.CustomizeRequestOption {
- return func(req *testcontainers.GenericContainerRequest) error {
- req.Env["LOG_LEVEL"] = level
- return nil
- }
-}
diff --git a/modules/azure/cosmosdb/cosmosdb_test.go b/modules/azure/cosmosdb/cosmosdb_test.go
deleted file mode 100644
index 4e03def606..0000000000
--- a/modules/azure/cosmosdb/cosmosdb_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package cosmosdb_test
-
-import (
- "context"
- _ "embed"
- "testing"
-
- "github.com/stretchr/testify/require"
-
- "github.com/testcontainers/testcontainers-go"
- "github.com/testcontainers/testcontainers-go/modules/azure/cosmosdb"
-)
-
-func TestCosmosDB(t *testing.T) {
- ctx := context.Background()
-
- ctr, err := cosmosdb.Run(ctx, "mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest")
- testcontainers.CleanupContainer(t, ctr)
- require.NoError(t, err)
-}
diff --git a/modules/azure/cosmosdb/examples_test.go b/modules/azure/cosmosdb/examples_test.go
deleted file mode 100644
index 6bf6d2d77c..0000000000
--- a/modules/azure/cosmosdb/examples_test.go
+++ /dev/null
@@ -1,188 +0,0 @@
-package cosmosdb_test
-
-import (
- "context"
- "crypto/tls"
- "encoding/json"
- "fmt"
- "log"
- "net/http"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos"
-
- "github.com/testcontainers/testcontainers-go"
- "github.com/testcontainers/testcontainers-go/modules/azure/cosmosdb"
-)
-
-func ExampleRun() {
- // runCosmosDBContainer {
- ctx := context.Background()
-
- cosmosdbCtr, err := cosmosdb.Run(
- ctx,
- "mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest",
- )
- defer func() {
- if err := testcontainers.TerminateContainer(cosmosdbCtr); err != nil {
- log.Printf("failed to terminate container: %s", err)
- }
- }()
- if err != nil {
- log.Printf("failed to start container: %s", err)
- return
- }
- // }
-
- state, err := cosmosdbCtr.State(ctx)
- if err != nil {
- log.Printf("failed to get container state: %s", err)
- return
- }
-
- fmt.Println(state.Running)
-
- // Output:
- // true
-}
-
-// ExampleRun_authenticateCreateClient is inspired by the example from the Azure CosmosDB Go SDK:
-// https://docs.azure.cn/en-us/cosmos-db/nosql/samples-go
-func ExampleRun_authenticateCreateClient() {
- // ===== 1. Run the CosmosDB container =====
- ctx := context.Background()
-
- cosmosdbContainer, err := cosmosdb.Run(
- ctx,
- "mcr.microsoft.com/cosmosdb/linux/azure-cosmos-emulator:latest",
- cosmosdb.WithPartitionCount(3),
- cosmosdb.WithLogLevel("debug"),
- )
- defer func() {
- if err := testcontainers.TerminateContainer(cosmosdbContainer); err != nil {
- log.Printf("failed to terminate container: %s", err)
- }
- }()
- if err != nil {
- log.Printf("failed to start container: %s", err)
- return
- }
-
- // ===== 2. Create a CosmosDB client using a connection string to the container =====
- // createClient {
- clientOpts := azcosmos.ClientOptions{
- ClientOptions: policy.ClientOptions{
- Transport: &http.Client{
- Transport: &http.Transport{
- TLSClientConfig: &tls.Config{
- InsecureSkipVerify: true,
- },
- },
- },
- },
- }
-
- client, err := azcosmos.NewClientFromConnectionString(cosmosdbContainer.MustConnectionString(ctx), &clientOpts)
- if err != nil {
- log.Printf("failed to create client: %s", err)
- return
- }
- // }
-
- // ===== 3. Create a CosmosDB database =====
- // createDatabase {
- dbName := "myDatabase"
-
- databaseClient, err := client.NewDatabase(dbName)
- if err != nil {
- log.Printf("failed to create database: %s", err)
- return
- }
- // }
-
- // ===== 4. Create a CosmosDB container =====
- // createContainer {
- containerName := "myContainer"
-
- cosmosDBContainerClient, err := databaseClient.NewContainer(containerName)
- if err != nil {
- log.Printf("failed to create container: %s", err)
- return
- }
- // }
-
- fmt.Println(cosmosDBContainerClient.ID())
-
- // ===== 5. CRUD Operations =====
- item := map[string]string{
- "id": "1",
- "value": "2",
- }
-
- marshalled, err := json.Marshal(item)
- if err != nil {
- log.Printf("failed to marshal item: %s", err)
- return
- }
-
- pk := azcosmos.NewPartitionKeyString("1")
- id := "1"
-
- // Create an item
- itemResponse, err := cosmosDBContainerClient.CreateItem(context.Background(), pk, marshalled, nil)
- if err != nil {
- log.Printf("failed to create item: %s", err)
- return
- }
-
- // Read an item
- itemResponse, err = cosmosDBContainerClient.ReadItem(context.Background(), pk, id, nil)
- if err != nil {
- log.Printf("failed to read item: %s", err)
- return
- }
-
- var itemResponseBody map[string]string
- err = json.Unmarshal(itemResponse.Value, &itemResponseBody)
- if err != nil {
- log.Printf("failed to unmarshal item: %s", err)
- return
- }
-
- itemResponseBody["value"] = "3"
- marshalledReplace, err := json.Marshal(itemResponseBody)
- if err != nil {
- log.Printf("failed to marshal item: %s", err)
- return
- }
-
- // Replace an item
- itemResponse, err = cosmosDBContainerClient.ReplaceItem(context.Background(), pk, id, marshalledReplace, nil)
- if err != nil {
- log.Printf("failed to replace item: %s", err)
- return
- }
-
- // Patch an item
- patch := azcosmos.PatchOperations{}
-
- patch.AppendAdd("/newField", "newValue")
- patch.AppendRemove("/oldFieldToRemove")
-
- itemResponse, err = cosmosDBContainerClient.PatchItem(context.Background(), pk, id, patch, nil)
- if err != nil {
- log.Printf("failed to patch item: %s", err)
- return
- }
-
- // Delete an item
- itemResponse, err = cosmosDBContainerClient.DeleteItem(context.Background(), pk, id, nil)
- if err != nil {
- log.Printf("failed to delete item: %s", err)
- return
- }
-
- // Output:
- // myDatabase
- // myContainer
-}
diff --git a/modules/azure/go.mod b/modules/azure/go.mod
index 62f3d7c3b3..9971b86f5a 100644
--- a/modules/azure/go.mod
+++ b/modules/azure/go.mod
@@ -4,7 +4,6 @@ go 1.23.0
require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
- github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos v1.3.0
github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.3.0
github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.8.0
@@ -18,7 +17,6 @@ require (
require (
dario.cat/mergo v1.0.0 // indirect
- github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/Azure/go-amqp v1.3.0 // indirect
diff --git a/modules/azure/go.sum b/modules/azure/go.sum
index b9bb07fb52..5ef0b91208 100644
--- a/modules/azure/go.sum
+++ b/modules/azure/go.sum
@@ -2,14 +2,10 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
-github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU=
-github.com/Azure/azure-sdk-for-go v68.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 h1:F0gBpfdPLGsw+nsgk6aqqkZS1jiixa5WwFe3fk/T3Ys=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2/go.mod h1:SqINnQ9lVVdRlyC8cd1lCI0SdX4n2paeABd2K8ggfnE=
-github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos v1.3.0 h1:RGcdpSElvcXCwxydI0xzOBu1Gvp88OoiTGfbtO/z1m0=
-github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos v1.3.0/go.mod h1:YwUyrNUtcZcibA99JcfCP6UUp95VVQKO2MJfBzgJDwA=
github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0 h1:NnE8y/opvxowwNcSNHubQUiSSEhfk3dmooLGAOmPuKs=
github.com/Azure/azure-sdk-for-go/sdk/data/aztables v1.3.0/go.mod h1:GhHzPHiiHxZloo6WvKu9X7krmSAKTyGoIwoKMbrKTTA=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY=
From 5a26e071ea1e1617d72ac22728366f012aa0111d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Tue, 11 Mar 2025 13:28:48 +0100
Subject: [PATCH 20/43] chore: retry in example tests
---
modules/azure/eventhubs/examples_test.go | 18 ++++++++++++++----
modules/azure/servicebus/examples_test.go | 17 +++++++++++++----
2 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/modules/azure/eventhubs/examples_test.go b/modules/azure/eventhubs/examples_test.go
index 72472c9126..1b23dcfbd4 100644
--- a/modules/azure/eventhubs/examples_test.go
+++ b/modules/azure/eventhubs/examples_test.go
@@ -111,10 +111,20 @@ func ExampleRun_sendEventsToEventHub() {
// createBatch {
newBatchOptions := &azeventhubs.EventDataBatchOptions{}
- batch, err := producerClient.NewEventDataBatch(context.TODO(), newBatchOptions)
- if err != nil {
- log.Printf("failed to create event data batch: %s", err)
- return
+ var batch *azeventhubs.EventDataBatch
+ maxRetries := 3
+ // Retry creating the event data batch 3 times, because the event hub is created from the configuration
+ // and Testcontainers cannot add a wait strategy for the event hub to be created.
+ for retries := 0; retries < maxRetries; retries++ {
+ batch, err = producerClient.NewEventDataBatch(context.TODO(), newBatchOptions)
+ if err == nil {
+ break
+ }
+
+ if retries == maxRetries-1 {
+ log.Printf("failed to create event data batch after %d attempts: %s", maxRetries, err)
+ return
+ }
}
for i := range events {
diff --git a/modules/azure/servicebus/examples_test.go b/modules/azure/servicebus/examples_test.go
index e4cb3ee029..5d014fa1f1 100644
--- a/modules/azure/servicebus/examples_test.go
+++ b/modules/azure/servicebus/examples_test.go
@@ -117,10 +117,19 @@ func ExampleRun_authenticateCreateClient() {
sbMessage := &azservicebus.Message{
Body: []byte(message),
}
- err = sender.SendMessage(context.TODO(), sbMessage, nil)
- if err != nil {
- fmt.Printf("failed to send message: %s", err)
- return
+ maxRetries := 3
+ // Retry sending the message 3 times, because the queue is created from the configuration
+ // and Testcontainers cannot add a wait strategy for the queue to be created.
+ for retries := 0; retries < maxRetries; retries++ {
+ err = sender.SendMessage(context.TODO(), sbMessage, nil)
+ if err == nil {
+ break
+ }
+
+ if retries == maxRetries-1 {
+ fmt.Printf("failed to send message after %d attempts: %s", maxRetries, err)
+ return
+ }
}
// }
From 0b451381637c3f0d197e5a58dbc885a89a7d9830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Tue, 11 Mar 2025 17:10:55 +0100
Subject: [PATCH 21/43] chore: docs and wrap errors
---
modules/azure/azurite/azurite.go | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/modules/azure/azurite/azurite.go b/modules/azure/azurite/azurite.go
index d98e70b690..a25557ec3c 100644
--- a/modules/azure/azurite/azurite.go
+++ b/modules/azure/azurite/azurite.go
@@ -33,10 +33,11 @@ type AzuriteContainer struct {
Settings options
}
+// ServiceURL returns the URL of the given service
func (c *AzuriteContainer) ServiceURL(ctx context.Context, srv Service) (string, error) {
hostname, err := c.Host(ctx)
if err != nil {
- return "", err
+ return "", fmt.Errorf("host: %w", err)
}
var port nat.Port
@@ -53,12 +54,13 @@ func (c *AzuriteContainer) ServiceURL(ctx context.Context, srv Service) (string,
mappedPort, err := c.MappedPort(ctx, port)
if err != nil {
- return "", err
+ return "", fmt.Errorf("mapped port: %w", err)
}
return fmt.Sprintf("http://%s:%d", hostname, mappedPort.Int()), nil
}
+// MustServiceURL returns the URL of the given service, panics if an error occurs
func (c *AzuriteContainer) MustServiceURL(ctx context.Context, srv Service) string {
url, err := c.ServiceURL(ctx, srv)
if err != nil {
@@ -87,7 +89,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
settings := defaultOptions()
for _, opt := range opts {
if err := opt.Customize(&genericContainerReq); err != nil {
- return nil, err
+ return nil, fmt.Errorf("customize: %w", err)
}
}
From 192f58e76983f661a9ea39b1eaf2aafa9ebacc60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Tue, 11 Mar 2025 17:12:41 +0100
Subject: [PATCH 22/43] docs: add method docs for MSSQL
---
modules/mssql/mssql.go | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/modules/mssql/mssql.go b/modules/mssql/mssql.go
index b70b49c747..d4a107cdeb 100644
--- a/modules/mssql/mssql.go
+++ b/modules/mssql/mssql.go
@@ -29,6 +29,7 @@ func (c *MSSQLServerContainer) Password() string {
return c.password
}
+// WithAcceptEULA sets the ACCEPT_EULA environment variable to "Y"
func WithAcceptEULA() testcontainers.CustomizeRequestOption {
return func(req *testcontainers.GenericContainerRequest) error {
req.Env["ACCEPT_EULA"] = "Y"
@@ -37,6 +38,7 @@ func WithAcceptEULA() testcontainers.CustomizeRequestOption {
}
}
+// WithPassword sets the MSSQL_SA_PASSWORD environment variable to the provided password
func WithPassword(password string) testcontainers.CustomizeRequestOption {
return func(req *testcontainers.GenericContainerRequest) error {
if password == "" {
@@ -124,7 +126,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
for _, opt := range opts {
if err := opt.Customize(&genericContainerReq); err != nil {
- return nil, err
+ return nil, fmt.Errorf("customize: %w", err)
}
}
@@ -141,15 +143,16 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
return c, nil
}
+// ConnectionString returns the connection string for the MSSQLServer container
func (c *MSSQLServerContainer) ConnectionString(ctx context.Context, args ...string) (string, error) {
host, err := c.Host(ctx)
if err != nil {
- return "", err
+ return "", fmt.Errorf("host: %w", err)
}
containerPort, err := c.MappedPort(ctx, defaultPort)
if err != nil {
- return "", err
+ return "", fmt.Errorf("mapped port: %w", err)
}
extraArgs := strings.Join(args, "&")
From b07a6213ad473adb9e034a916954ebe78663d196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 12 Mar 2025 11:41:03 +0100
Subject: [PATCH 23/43] chore: refine ServiceBus wait strategies
---
docs/modules/azure.md | 6 +++++-
modules/azure/servicebus/examples_test.go | 4 ++--
modules/azure/servicebus/servicebus.go | 12 ++++++++----
modules/azure/servicebus/servicebus_test.go | 6 +++---
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index c28e94c77a..d28d244b91 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -240,6 +240,10 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
The ServiceBus container needs a MSSQL Server container to be running, for that reason _Testcontainers for Go_ **automatically creates a Docker network and an MSSQL Server container** for ServiceBus to work.
When terminating the ServiceBus container, the MSSQL Server container and the Docker network are also terminated.
+!!! info
+ Since version `1.1.2` of the ServiceBus emulator, it's possible to set the `SQL_WAIT_INTERVAL` environment variable to the given seconds.
+ This module sets it to `0` by default, because the MSSQL Server container is started first.
+
### Container Options
When starting the ServiceBus container, you can pass options in a variadic way to configure it.
@@ -247,7 +251,7 @@ When starting the ServiceBus container, you can pass options in a variadic way t
#### Image
Use the second argument in the `Run` function to set a valid Docker image.
-In example: `Run(context.Background(), "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1")`.
+In example: `Run(context.Background(), "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2")`.
{% include "../features/common_functional_options.md" %}
diff --git a/modules/azure/servicebus/examples_test.go b/modules/azure/servicebus/examples_test.go
index 5d014fa1f1..0546452482 100644
--- a/modules/azure/servicebus/examples_test.go
+++ b/modules/azure/servicebus/examples_test.go
@@ -15,7 +15,7 @@ import (
func ExampleRun() {
ctx := context.Background()
- serviceBusContainer, err := servicebus.Run(ctx, "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1", servicebus.WithAcceptEULA())
+ serviceBusContainer, err := servicebus.Run(ctx, "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2", servicebus.WithAcceptEULA())
defer func() {
if err := testcontainers.TerminateContainer(serviceBusContainer); err != nil {
log.Printf("failed to terminate container: %s", err)
@@ -79,7 +79,7 @@ func ExampleRun_authenticateCreateClient() {
serviceBusContainer, err := servicebus.Run(
ctx,
- "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1",
+ "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2",
servicebus.WithAcceptEULA(),
servicebus.WithConfig(strings.NewReader(cfg)),
)
diff --git a/modules/azure/servicebus/servicebus.go b/modules/azure/servicebus/servicebus.go
index 1b217a0ae8..ac3979d1d7 100644
--- a/modules/azure/servicebus/servicebus.go
+++ b/modules/azure/servicebus/servicebus.go
@@ -13,6 +13,7 @@ import (
const (
defaultPort = "5672/tcp"
+ defaultHTTPPort = "5300/tcp"
defaultSharedAccessKeyName = "RootManageSharedAccessKey"
defaultSharedAccessKey = "SAS_KEY_VALUE"
connectionStringFormat = "Endpoint=sb://%s;SharedAccessKeyName=%s;SharedAccessKey=%s;UseDevelopmentEmulator=true;"
@@ -72,12 +73,15 @@ func (c *Container) Terminate(ctx context.Context, opts ...testcontainers.Termin
// Run creates an instance of the Azure Event Hubs container type
func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*Container, error) {
req := testcontainers.ContainerRequest{
- Image: img,
- Env: make(map[string]string),
- ExposedPorts: []string{defaultPort},
+ Image: img,
+ Env: map[string]string{
+ "SQL_WAIT_INTERVAL": "0", // default is zero because the MSSQL container is started first
+ },
+ ExposedPorts: []string{defaultPort, defaultHTTPPort},
WaitingFor: wait.ForAll(
wait.ForListeningPort(defaultPort),
- wait.ForLog(".*Emulator Service is Successfully Up!.*").AsRegexp(),
+ wait.ForListeningPort(defaultHTTPPort),
+ wait.ForHTTP("/health").WithPort(defaultHTTPPort),
),
}
diff --git a/modules/azure/servicebus/servicebus_test.go b/modules/azure/servicebus/servicebus_test.go
index 87241d67a4..fbdaab9047 100644
--- a/modules/azure/servicebus/servicebus_test.go
+++ b/modules/azure/servicebus/servicebus_test.go
@@ -23,7 +23,7 @@ func TestServiceBus_topology(t *testing.T) {
ctr, err := servicebus.Run(
ctx,
- "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1",
+ "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2",
servicebus.WithAcceptEULA(),
servicebus.WithMSSQLImage(mssqlImage),
)
@@ -55,7 +55,7 @@ func TestServiceBus_withConfig(t *testing.T) {
ctr, err := servicebus.Run(
ctx,
- "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1",
+ "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2",
servicebus.WithAcceptEULA(),
servicebus.WithMSSQLImage(mssqlImage),
servicebus.WithConfig(strings.NewReader(servicebusConfig)),
@@ -76,7 +76,7 @@ func TestServiceBus_withConfig(t *testing.T) {
func TestServiceBus_noEULA(t *testing.T) {
ctx := context.Background()
- ctr, err := servicebus.Run(ctx, "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.0.1")
+ ctr, err := servicebus.Run(ctx, "mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2")
require.Error(t, err)
require.Nil(t, ctr)
}
From fcd6383c306e019fef74f5bd64569084a8b09873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 12 Mar 2025 11:50:57 +0100
Subject: [PATCH 24/43] chore: customiser MSSQL Server
---
docs/modules/azure.md | 4 ++--
modules/azure/servicebus/options.go | 6 ++++--
modules/azure/servicebus/servicebus.go | 9 ++++++++-
modules/azure/servicebus/servicebus_test.go | 7 ++++---
4 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index d28d244b91..ec4bc622b6 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -255,11 +255,11 @@ In example: `Run(context.Background(), "mcr.microsoft.com/azure-messaging/servic
{% include "../features/common_functional_options.md" %}
-#### WithMSSQLImage
+#### WithMSSQL
- 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>
-This option allows you to set a different MSSQL Server Docker image, instead of the default one.
+This option allows you to set a different MSSQL Server Docker image, instead of the default one, and also pass options to the MSSQL container, in the form of a variadic argument of `testcontainers.ContainerCustomizer`.
#### WithAcceptEULA
diff --git a/modules/azure/servicebus/options.go b/modules/azure/servicebus/options.go
index 86b4be5520..3931f3523b 100644
--- a/modules/azure/servicebus/options.go
+++ b/modules/azure/servicebus/options.go
@@ -9,6 +9,7 @@ import (
type options struct {
mssqlImage string
+ mssqlOptions []testcontainers.ContainerCustomizer
mssqlContainer *mssql.MSSQLServerContainer
network *testcontainers.DockerNetwork
}
@@ -32,11 +33,12 @@ func (o Option) Customize(*testcontainers.GenericContainerRequest) error {
return nil
}
-// WithMSSQLImage sets the image for the MSSQL container.
+// WithMSSQL sets the image and options for the MSSQL container.
// By default, the image is "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04".
-func WithMSSQLImage(img string) Option {
+func WithMSSQL(img string, opts ...testcontainers.ContainerCustomizer) Option {
return func(o *options) {
o.mssqlImage = img
+ o.mssqlOptions = opts
}
}
diff --git a/modules/azure/servicebus/servicebus.go b/modules/azure/servicebus/servicebus.go
index ac3979d1d7..b59a91f4df 100644
--- a/modules/azure/servicebus/servicebus.go
+++ b/modules/azure/servicebus/servicebus.go
@@ -113,8 +113,15 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
}
defaultOptions.network = mssqlNetwork
+ mssqlOpts := []testcontainers.ContainerCustomizer{
+ mssql.WithAcceptEULA(),
+ network.WithNetwork([]string{aliasMSSQL}, mssqlNetwork),
+ }
+
+ mssqlOpts = append(mssqlOpts, defaultOptions.mssqlOptions...)
+
// Start the mssql container first. The EULA is accepted by default, as it is required by the servicebus emulator.
- mssqlContainer, err := mssql.Run(ctx, defaultOptions.mssqlImage, mssql.WithAcceptEULA(), network.WithNetwork([]string{aliasMSSQL}, mssqlNetwork))
+ mssqlContainer, err := mssql.Run(ctx, defaultOptions.mssqlImage, mssqlOpts...)
if err != nil {
return nil, fmt.Errorf("run mssql container: %w", err)
}
diff --git a/modules/azure/servicebus/servicebus_test.go b/modules/azure/servicebus/servicebus_test.go
index fbdaab9047..e8db5e47ee 100644
--- a/modules/azure/servicebus/servicebus_test.go
+++ b/modules/azure/servicebus/servicebus_test.go
@@ -25,7 +25,7 @@ func TestServiceBus_topology(t *testing.T) {
ctx,
"mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2",
servicebus.WithAcceptEULA(),
- servicebus.WithMSSQLImage(mssqlImage),
+ servicebus.WithMSSQL(mssqlImage, testcontainers.WithEnv(map[string]string{"TESTCONTAINERS_TEST_VAR": "test"})),
)
testcontainers.CleanupContainer(t, ctr)
require.NoError(t, err)
@@ -42,10 +42,11 @@ func TestServiceBus_topology(t *testing.T) {
require.Equal(t, mssqlNetworks[0], serviceBusNetworks[0])
- // mssql image version
+ // mssql image version and custom options
inspect, err := mssqlContainer.Inspect(ctx)
require.NoError(t, err)
require.Equal(t, mssqlImage, inspect.Config.Image)
+ require.Contains(t, inspect.Config.Env, "TESTCONTAINERS_TEST_VAR=test")
}
func TestServiceBus_withConfig(t *testing.T) {
@@ -57,7 +58,7 @@ func TestServiceBus_withConfig(t *testing.T) {
ctx,
"mcr.microsoft.com/azure-messaging/servicebus-emulator:1.1.2",
servicebus.WithAcceptEULA(),
- servicebus.WithMSSQLImage(mssqlImage),
+ servicebus.WithMSSQL(mssqlImage),
servicebus.WithConfig(strings.NewReader(servicebusConfig)),
)
testcontainers.CleanupContainer(t, ctr)
From 3f4ebc742b25f9ba40558d7709c9867c51ed666c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 12 Mar 2025 11:53:27 +0100
Subject: [PATCH 25/43] chore: customise Azurite container
---
docs/modules/azure.md | 4 ++--
modules/azure/eventhubs/eventhubs.go | 7 ++++++-
modules/azure/eventhubs/eventhubs_test.go | 7 ++++---
modules/azure/eventhubs/options.go | 6 ++++--
4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index ec4bc622b6..80a0b2fbc9 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -166,11 +166,11 @@ In example: `Run(context.Background(), "mcr.microsoft.com/azure-storage/azurite:
{% include "../features/common_functional_options.md" %}
-#### WithAzuriteImage
+#### WithAzurite
- 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>
-This option allows you to set a different Azurite Docker image, instead of the default one.
+This option allows you to set a different Azurite Docker image, instead of the default one, and also pass options to the Azurite container, in the form of a variadic argument of `testcontainers.ContainerCustomizer`.
#### WithAcceptEULA
diff --git a/modules/azure/eventhubs/eventhubs.go b/modules/azure/eventhubs/eventhubs.go
index b574c1c9bb..97f6dc18b8 100644
--- a/modules/azure/eventhubs/eventhubs.go
+++ b/modules/azure/eventhubs/eventhubs.go
@@ -103,8 +103,13 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
}
defaultOptions.network = azuriteNetwork
+ azuriteOpts := []testcontainers.ContainerCustomizer{
+ network.WithNetwork([]string{aliasAzurite}, azuriteNetwork),
+ }
+ azuriteOpts = append(azuriteOpts, defaultOptions.azuriteOptions...)
+
// start the azurite container first
- azuriteContainer, err := azurite.Run(ctx, defaultOptions.azuriteImage, network.WithNetwork([]string{aliasAzurite}, azuriteNetwork))
+ azuriteContainer, err := azurite.Run(ctx, defaultOptions.azuriteImage, azuriteOpts...)
if err != nil {
return nil, fmt.Errorf("run azurite container: %w", err)
}
diff --git a/modules/azure/eventhubs/eventhubs_test.go b/modules/azure/eventhubs/eventhubs_test.go
index 1237342676..3e2b038f0d 100644
--- a/modules/azure/eventhubs/eventhubs_test.go
+++ b/modules/azure/eventhubs/eventhubs_test.go
@@ -25,7 +25,7 @@ func TestEventHubs_topology(t *testing.T) {
ctx,
"mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1",
eventhubs.WithAcceptEULA(),
- eventhubs.WithAzuriteImage(azuriteImage),
+ eventhubs.WithAzurite(azuriteImage, testcontainers.WithEnv(map[string]string{"TESTCONTAINERS_TEST_VAR": "test"})),
)
testcontainers.CleanupContainer(t, ctr)
require.NoError(t, err)
@@ -42,10 +42,11 @@ func TestEventHubs_topology(t *testing.T) {
require.Equal(t, azuriteNetworks[0], eventHubsNetworks[0])
- // azurite image version
+ // azurite image version and custom options
inspect, err := azuriteContainer.Inspect(ctx)
require.NoError(t, err)
require.Equal(t, azuriteImage, inspect.Config.Image)
+ require.Contains(t, inspect.Config.Env, "TESTCONTAINERS_TEST_VAR=test")
}
func TestEventHubs_withConfig(t *testing.T) {
@@ -57,7 +58,7 @@ func TestEventHubs_withConfig(t *testing.T) {
ctx,
"mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1",
eventhubs.WithAcceptEULA(),
- eventhubs.WithAzuriteImage(azuriteImage),
+ eventhubs.WithAzurite(azuriteImage),
eventhubs.WithConfig(strings.NewReader(eventhubsConfig)),
)
testcontainers.CleanupContainer(t, ctr)
diff --git a/modules/azure/eventhubs/options.go b/modules/azure/eventhubs/options.go
index 985213f173..308c9a70c3 100644
--- a/modules/azure/eventhubs/options.go
+++ b/modules/azure/eventhubs/options.go
@@ -9,6 +9,7 @@ import (
type options struct {
azuriteImage string
+ azuriteOptions []testcontainers.ContainerCustomizer
azuriteContainer *azurite.AzuriteContainer
network *testcontainers.DockerNetwork
}
@@ -32,11 +33,12 @@ func (o Option) Customize(*testcontainers.GenericContainerRequest) error {
return nil
}
-// WithAzuriteImage sets the image for the Azurite container.
+// WithAzurite sets the image and options for the Azurite container.
// By default, the image is "mcr.microsoft.com/azure-storage/azurite:3.33.0".
-func WithAzuriteImage(img string) Option {
+func WithAzurite(img string, opts ...testcontainers.ContainerCustomizer) Option {
return func(o *options) {
o.azuriteImage = img
+ o.azuriteOptions = opts
}
}
From 751b6520d4471a5f976662521d7fe39e25e65d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 12 Mar 2025 12:04:02 +0100
Subject: [PATCH 26/43] fix: add azure to dependabot
---
.github/dependabot.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ca0d8b93ef..0f621c1cb1 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -17,6 +17,7 @@ updates:
- /examples/toxiproxy
- /modulegen
- /modules/artemis
+ - /modules/azure
- /modules/azurite
- /modules/cassandra
- /modules/chroma
From 71953266a7e50689fccb21ab88e0e5e4bef51bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 12 Mar 2025 17:31:26 +0100
Subject: [PATCH 27/43] chore: refine EventHubs wait strategies
---
docs/modules/azure.md | 2 +-
modules/azure/eventhubs/eventhubs.go | 9 ++++++---
modules/azure/eventhubs/eventhubs_test.go | 6 +++---
modules/azure/eventhubs/examples_test.go | 4 ++--
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index 80a0b2fbc9..004341e4e6 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -162,7 +162,7 @@ When starting the EventHubs container, you can pass options in a variadic way to
#### Image
Use the second argument in the `Run` function to set a valid Docker image.
-In example: `Run(context.Background(), "mcr.microsoft.com/azure-storage/azurite:3.28.0")`.
+In example: `Run(context.Background(), "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1")`.
{% include "../features/common_functional_options.md" %}
diff --git a/modules/azure/eventhubs/eventhubs.go b/modules/azure/eventhubs/eventhubs.go
index 97f6dc18b8..5cb56f62e7 100644
--- a/modules/azure/eventhubs/eventhubs.go
+++ b/modules/azure/eventhubs/eventhubs.go
@@ -13,6 +13,7 @@ import (
const (
defaultAMPQPort = "5672/tcp"
+ defaultHTTPPort = "5300/tcp"
connectionStringFormat = "Endpoint=sb://%s;SharedAccessKeyName=%s;SharedAccessKey=%s;UseDevelopmentEmulator=true;"
// aliasEventhubs is the alias for the eventhubs container in the network
@@ -67,11 +68,13 @@ func (c *Container) Terminate(ctx context.Context, opts ...testcontainers.Termin
// Run creates an instance of the Azure Event Hubs container type
func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*Container, error) {
req := testcontainers.ContainerRequest{
- Image: img,
- Env: make(map[string]string),
+ Image: img,
+ ExposedPorts: []string{defaultAMPQPort, defaultHTTPPort},
+ Env: make(map[string]string),
WaitingFor: wait.ForAll(
wait.ForListeningPort(defaultAMPQPort),
- wait.ForLog(".*Emulator Service is Successfully Up.*").AsRegexp(),
+ wait.ForListeningPort(defaultHTTPPort),
+ wait.ForHTTP("/health").WithPort(defaultHTTPPort),
),
}
diff --git a/modules/azure/eventhubs/eventhubs_test.go b/modules/azure/eventhubs/eventhubs_test.go
index 3e2b038f0d..2e49b16872 100644
--- a/modules/azure/eventhubs/eventhubs_test.go
+++ b/modules/azure/eventhubs/eventhubs_test.go
@@ -23,7 +23,7 @@ func TestEventHubs_topology(t *testing.T) {
ctr, err := eventhubs.Run(
ctx,
- "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1",
+ "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.1.0",
eventhubs.WithAcceptEULA(),
eventhubs.WithAzurite(azuriteImage, testcontainers.WithEnv(map[string]string{"TESTCONTAINERS_TEST_VAR": "test"})),
)
@@ -56,7 +56,7 @@ func TestEventHubs_withConfig(t *testing.T) {
ctr, err := eventhubs.Run(
ctx,
- "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1",
+ "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.1.0",
eventhubs.WithAcceptEULA(),
eventhubs.WithAzurite(azuriteImage),
eventhubs.WithConfig(strings.NewReader(eventhubsConfig)),
@@ -77,7 +77,7 @@ func TestEventHubs_withConfig(t *testing.T) {
func TestEventHubs_noEULA(t *testing.T) {
ctx := context.Background()
- ctr, err := eventhubs.Run(ctx, "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1")
+ ctr, err := eventhubs.Run(ctx, "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.1.0")
require.Error(t, err)
require.Nil(t, ctr)
}
diff --git a/modules/azure/eventhubs/examples_test.go b/modules/azure/eventhubs/examples_test.go
index 1b23dcfbd4..1e0f692efe 100644
--- a/modules/azure/eventhubs/examples_test.go
+++ b/modules/azure/eventhubs/examples_test.go
@@ -18,7 +18,7 @@ import (
func ExampleRun() {
ctx := context.Background()
- eventHubsCtr, err := eventhubs.Run(ctx, "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1", eventhubs.WithAcceptEULA())
+ eventHubsCtr, err := eventhubs.Run(ctx, "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.1.0", eventhubs.WithAcceptEULA())
defer func() {
if err := testcontainers.TerminateContainer(eventHubsCtr); err != nil {
log.Printf("failed to terminate container: %s", err)
@@ -73,7 +73,7 @@ func ExampleRun_sendEventsToEventHub() {
// }
// runEventHubsContainer {
- eventHubsCtr, err := eventhubs.Run(ctx, "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.0.1", eventhubs.WithAcceptEULA(), eventhubs.WithConfig(strings.NewReader(cfg)))
+ eventHubsCtr, err := eventhubs.Run(ctx, "mcr.microsoft.com/azure-messaging/eventhubs-emulator:2.1.0", eventhubs.WithAcceptEULA(), eventhubs.WithConfig(strings.NewReader(cfg)))
defer func() {
if err := testcontainers.TerminateContainer(eventHubsCtr); err != nil {
log.Printf("failed to terminate container: %s", err)
From 4f1ede5fcafdd60df7ef59aa754a16346e9fe706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 12 Mar 2025 18:26:50 +0100
Subject: [PATCH 28/43] chore: handle EULA variable correctly
---
modules/azure/eventhubs/eventhubs.go | 3 ++-
modules/azure/servicebus/servicebus.go | 3 ++-
modules/mssql/mssql.go | 5 ++++
modules/mssql/mssql_test.go | 32 +++++++++++++++-----------
4 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/modules/azure/eventhubs/eventhubs.go b/modules/azure/eventhubs/eventhubs.go
index 5cb56f62e7..9c76d4cd44 100644
--- a/modules/azure/eventhubs/eventhubs.go
+++ b/modules/azure/eventhubs/eventhubs.go
@@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
+ "strings"
"github.com/testcontainers/testcontainers-go"
"github.com/testcontainers/testcontainers-go/modules/azure/azurite"
@@ -93,7 +94,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
}
}
- if genericContainerReq.Env["ACCEPT_EULA"] == "" {
+ if strings.ToUpper(genericContainerReq.Env["ACCEPT_EULA"]) != "Y" {
return nil, errors.New("EULA not accepted. Please use the WithAcceptEULA option to accept the EULA")
}
diff --git a/modules/azure/servicebus/servicebus.go b/modules/azure/servicebus/servicebus.go
index b59a91f4df..9d69c85771 100644
--- a/modules/azure/servicebus/servicebus.go
+++ b/modules/azure/servicebus/servicebus.go
@@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
+ "strings"
"github.com/testcontainers/testcontainers-go"
"github.com/testcontainers/testcontainers-go/modules/mssql"
@@ -100,7 +101,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
}
}
- if genericContainerReq.Env["ACCEPT_EULA"] == "" {
+ if strings.ToUpper(genericContainerReq.Env["ACCEPT_EULA"]) != "Y" {
return nil, errors.New("EULA not accepted. Please use the WithAcceptEULA option to accept the EULA")
}
diff --git a/modules/mssql/mssql.go b/modules/mssql/mssql.go
index d4a107cdeb..dba0f4c7ee 100644
--- a/modules/mssql/mssql.go
+++ b/modules/mssql/mssql.go
@@ -2,6 +2,7 @@ package mssql
import (
"context"
+ "errors"
"fmt"
"io"
"strings"
@@ -130,6 +131,10 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
}
}
+ if strings.ToUpper(genericContainerReq.Env["ACCEPT_EULA"]) != "Y" {
+ return nil, errors.New("EULA not accepted. Please use the WithAcceptEULA option to accept the EULA")
+ }
+
container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
var c *MSSQLServerContainer
if container != nil {
diff --git a/modules/mssql/mssql_test.go b/modules/mssql/mssql_test.go
index fffd977355..c0c8feead3 100644
--- a/modules/mssql/mssql_test.go
+++ b/modules/mssql/mssql_test.go
@@ -47,20 +47,26 @@ func TestMSSQLServer(t *testing.T) {
func TestMSSQLServerWithMissingEulaOption(t *testing.T) {
ctx := context.Background()
- ctr, err := mssql.Run(ctx,
- "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04",
- testcontainers.WithWaitStrategy(
- wait.ForLog("The SQL Server End-User License Agreement (EULA) must be accepted")),
- )
- testcontainers.CleanupContainer(t, ctr)
- require.NoError(t, err)
-
- state, err := ctr.State(ctx)
- require.NoError(t, err)
+ t.Run("empty", func(t *testing.T) {
+ ctr, err := mssql.Run(ctx,
+ "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04",
+ testcontainers.WithWaitStrategy(
+ wait.ForLog("The SQL Server End-User License Agreement (EULA) must be accepted")),
+ )
+ testcontainers.CleanupContainer(t, ctr)
+ require.Error(t, err)
+ })
- if !state.Running {
- t.Log("Success: Confirmed proper handling of missing EULA, so container is not running.")
- }
+ t.Run("not-y", func(t *testing.T) {
+ ctr, err := mssql.Run(ctx,
+ "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04",
+ testcontainers.WithEnv(map[string]string{"ACCEPT_EULA": "yes"}),
+ testcontainers.WithWaitStrategy(
+ wait.ForLog("The SQL Server End-User License Agreement (EULA) must be accepted")),
+ )
+ testcontainers.CleanupContainer(t, ctr)
+ require.Error(t, err)
+ })
}
func TestMSSQLServerWithConnectionStringParameters(t *testing.T) {
From 75a15d0b74129027e668ed8070b2c9219f9a18d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 12 Mar 2025 18:27:48 +0100
Subject: [PATCH 29/43] docs: proper comments
---
modules/azure/azurite/services.go | 8 +++++++-
modules/azure/eventhubs/eventhubs.go | 4 ++--
modules/azure/servicebus/servicebus.go | 7 +++----
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/modules/azure/azurite/services.go b/modules/azure/azurite/services.go
index a832a031f5..69c9ade850 100644
--- a/modules/azure/azurite/services.go
+++ b/modules/azure/azurite/services.go
@@ -1,9 +1,15 @@
package azurite
const (
- BlobService Service = "blob"
+ // BlobService is the service name for the Blob service
+ BlobService Service = "blob"
+
+ // QueueService is the service name for the Queue service
QueueService Service = "queue"
+
+ // TableService is the service name for the Table service
TableService Service = "table"
)
+// Service is the type for the services that Azurite can provide
type Service string
diff --git a/modules/azure/eventhubs/eventhubs.go b/modules/azure/eventhubs/eventhubs.go
index 9c76d4cd44..1ee32adc21 100644
--- a/modules/azure/eventhubs/eventhubs.go
+++ b/modules/azure/eventhubs/eventhubs.go
@@ -33,12 +33,12 @@ type Container struct {
azuriteOptions *options
}
+// AzuriteContainer returns the azurite container that is used by the eventhubs container
func (c *Container) AzuriteContainer() *azurite.AzuriteContainer {
return c.azuriteOptions.azuriteContainer
}
-// Terminate terminates the etcd container, its child nodes, and the network in which the cluster is running
-// to communicate between the nodes.
+// Terminate terminates the eventhubs container, the azurite container, and the network to communicate between them.
func (c *Container) Terminate(ctx context.Context, opts ...testcontainers.TerminateOption) error {
var errs []error
diff --git a/modules/azure/servicebus/servicebus.go b/modules/azure/servicebus/servicebus.go
index 9d69c85771..171ab3a132 100644
--- a/modules/azure/servicebus/servicebus.go
+++ b/modules/azure/servicebus/servicebus.go
@@ -32,7 +32,7 @@ const (
containerConfigFile = "/ServiceBus_Emulator/ConfigFiles/Config.json"
)
-// Container represents the Azure Event Hubs container type used in the module
+// Container represents the Azure ServiceBus container type used in the module
type Container struct {
testcontainers.Container
mssqlOptions *options
@@ -42,13 +42,12 @@ func (c *Container) MSSQLContainer() *mssql.MSSQLServerContainer {
return c.mssqlOptions.mssqlContainer
}
-// Terminate terminates the etcd container, its child nodes, and the network in which the cluster is running
-// to communicate between the nodes.
+// Terminate terminates the servicebus container, the mssql container, and the network to communicate between them.
func (c *Container) Terminate(ctx context.Context, opts ...testcontainers.TerminateOption) error {
var errs []error
if c.Container != nil {
- // terminate the eventhubs container
+ // terminate the servicebus container
if err := c.Container.Terminate(ctx, opts...); err != nil {
errs = append(errs, fmt.Errorf("terminate eventhubs container: %w", err))
}
From 98ad9b3f0dc4a30b86a8d457b2dfd80ee700d27e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 12 Mar 2025 18:28:08 +0100
Subject: [PATCH 30/43] chore!: remove settings, as it not used
---
modules/azure/azurite/azurite.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/azure/azurite/azurite.go b/modules/azure/azurite/azurite.go
index a25557ec3c..b01b827154 100644
--- a/modules/azure/azurite/azurite.go
+++ b/modules/azure/azurite/azurite.go
@@ -30,7 +30,7 @@ const (
// AzuriteContainer represents the Azurite container type used in the module
type AzuriteContainer struct {
testcontainers.Container
- Settings options
+ opts options
}
// ServiceURL returns the URL of the given service
@@ -122,7 +122,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
var c *AzuriteContainer
if container != nil {
- c = &AzuriteContainer{Container: container, Settings: settings}
+ c = &AzuriteContainer{Container: container, opts: settings}
}
if err != nil {
From 9a4fde1b7caa8ea7fd160fdcd1ef4fef30341d0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 12 Mar 2025 18:28:25 +0100
Subject: [PATCH 31/43] fixup comments
---
modules/azure/servicebus/servicebus.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules/azure/servicebus/servicebus.go b/modules/azure/servicebus/servicebus.go
index 171ab3a132..debc9baa5e 100644
--- a/modules/azure/servicebus/servicebus.go
+++ b/modules/azure/servicebus/servicebus.go
@@ -38,6 +38,7 @@ type Container struct {
mssqlOptions *options
}
+// MSSQLContainer returns the mssql container that is used by the servicebus container
func (c *Container) MSSQLContainer() *mssql.MSSQLServerContainer {
return c.mssqlOptions.mssqlContainer
}
From 4529186c19dfa9d0148c94c4742627856117e118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 12 Mar 2025 18:28:56 +0100
Subject: [PATCH 32/43] chore: options returns error
---
modules/azure/eventhubs/eventhubs.go | 4 +++-
modules/azure/eventhubs/options.go | 5 +++--
modules/azure/servicebus/options.go | 5 +++--
modules/azure/servicebus/servicebus.go | 4 +++-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/modules/azure/eventhubs/eventhubs.go b/modules/azure/eventhubs/eventhubs.go
index 1ee32adc21..59bef45df8 100644
--- a/modules/azure/eventhubs/eventhubs.go
+++ b/modules/azure/eventhubs/eventhubs.go
@@ -90,7 +90,9 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
return nil, fmt.Errorf("customize: %w", err)
}
if o, ok := opt.(Option); ok {
- o(&defaultOptions)
+ if err := o(&defaultOptions); err != nil {
+ return nil, fmt.Errorf("eventhubsoption: %w", err)
+ }
}
}
diff --git a/modules/azure/eventhubs/options.go b/modules/azure/eventhubs/options.go
index 308c9a70c3..6423c11851 100644
--- a/modules/azure/eventhubs/options.go
+++ b/modules/azure/eventhubs/options.go
@@ -25,7 +25,7 @@ func defaultOptions() options {
var _ testcontainers.ContainerCustomizer = (Option)(nil)
// Option is an option for the Redpanda container.
-type Option func(*options)
+type Option func(*options) error
// Customize is a NOOP. It's defined to satisfy the testcontainers.ContainerCustomizer interface.
func (o Option) Customize(*testcontainers.GenericContainerRequest) error {
@@ -36,9 +36,10 @@ func (o Option) Customize(*testcontainers.GenericContainerRequest) error {
// WithAzurite sets the image and options for the Azurite container.
// By default, the image is "mcr.microsoft.com/azure-storage/azurite:3.33.0".
func WithAzurite(img string, opts ...testcontainers.ContainerCustomizer) Option {
- return func(o *options) {
+ return func(o *options) error {
o.azuriteImage = img
o.azuriteOptions = opts
+ return nil
}
}
diff --git a/modules/azure/servicebus/options.go b/modules/azure/servicebus/options.go
index 3931f3523b..b1af0b6a32 100644
--- a/modules/azure/servicebus/options.go
+++ b/modules/azure/servicebus/options.go
@@ -25,7 +25,7 @@ func defaultOptions() options {
var _ testcontainers.ContainerCustomizer = (Option)(nil)
// Option is an option for the Redpanda container.
-type Option func(*options)
+type Option func(*options) error
// Customize is a NOOP. It's defined to satisfy the testcontainers.ContainerCustomizer interface.
func (o Option) Customize(*testcontainers.GenericContainerRequest) error {
@@ -36,9 +36,10 @@ func (o Option) Customize(*testcontainers.GenericContainerRequest) error {
// WithMSSQL sets the image and options for the MSSQL container.
// By default, the image is "mcr.microsoft.com/mssql/server:2022-CU14-ubuntu-22.04".
func WithMSSQL(img string, opts ...testcontainers.ContainerCustomizer) Option {
- return func(o *options) {
+ return func(o *options) error {
o.mssqlImage = img
o.mssqlOptions = opts
+ return nil
}
}
diff --git a/modules/azure/servicebus/servicebus.go b/modules/azure/servicebus/servicebus.go
index debc9baa5e..d2373cb1ca 100644
--- a/modules/azure/servicebus/servicebus.go
+++ b/modules/azure/servicebus/servicebus.go
@@ -97,7 +97,9 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
return nil, fmt.Errorf("customize: %w", err)
}
if o, ok := opt.(Option); ok {
- o(&defaultOptions)
+ if err := o(&defaultOptions); err != nil {
+ return nil, fmt.Errorf("servicebus option: %w", err)
+ }
}
}
From 03e5d4d608d56878c02c0154423becfe6d2dcb16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 12 Mar 2025 18:29:12 +0100
Subject: [PATCH 33/43] chore: do not leak network
---
modules/azure/eventhubs/eventhubs.go | 2 +-
modules/azure/servicebus/servicebus.go | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/azure/eventhubs/eventhubs.go b/modules/azure/eventhubs/eventhubs.go
index 59bef45df8..c44de067b8 100644
--- a/modules/azure/eventhubs/eventhubs.go
+++ b/modules/azure/eventhubs/eventhubs.go
@@ -117,7 +117,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
// start the azurite container first
azuriteContainer, err := azurite.Run(ctx, defaultOptions.azuriteImage, azuriteOpts...)
if err != nil {
- return nil, fmt.Errorf("run azurite container: %w", err)
+ return c, fmt.Errorf("run azurite container: %w", err)
}
defaultOptions.azuriteContainer = azuriteContainer
diff --git a/modules/azure/servicebus/servicebus.go b/modules/azure/servicebus/servicebus.go
index d2373cb1ca..2b7067da1f 100644
--- a/modules/azure/servicebus/servicebus.go
+++ b/modules/azure/servicebus/servicebus.go
@@ -50,7 +50,7 @@ func (c *Container) Terminate(ctx context.Context, opts ...testcontainers.Termin
if c.Container != nil {
// terminate the servicebus container
if err := c.Container.Terminate(ctx, opts...); err != nil {
- errs = append(errs, fmt.Errorf("terminate eventhubs container: %w", err))
+ errs = append(errs, fmt.Errorf("terminate servicebus container: %w", err))
}
}
@@ -126,7 +126,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
// Start the mssql container first. The EULA is accepted by default, as it is required by the servicebus emulator.
mssqlContainer, err := mssql.Run(ctx, defaultOptions.mssqlImage, mssqlOpts...)
if err != nil {
- return nil, fmt.Errorf("run mssql container: %w", err)
+ return c, fmt.Errorf("run mssql container: %w", err)
}
defaultOptions.mssqlContainer = mssqlContainer
From e64edb7f11012293e464d7803bf64380badd7ddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 12 Mar 2025 18:29:27 +0100
Subject: [PATCH 34/43] chore: simplify wait strategies
---
modules/azure/azurite/azurite.go | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/modules/azure/azurite/azurite.go b/modules/azure/azurite/azurite.go
index b01b827154..da5553fd9b 100644
--- a/modules/azure/azurite/azurite.go
+++ b/modules/azure/azurite/azurite.go
@@ -96,27 +96,22 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
// 2. evaluate the enabled services to apply the right wait strategy and Cmd options
enabledServices := settings.EnabledServices
if len(enabledServices) > 0 {
- waitingFor := make([]wait.Strategy, 0)
+ waitingFor := make([]wait.Strategy, 0, len(enabledServices))
for _, srv := range enabledServices {
switch srv {
case BlobService:
genericContainerReq.Cmd = append(genericContainerReq.Cmd, "--blobHost", "0.0.0.0")
waitingFor = append(waitingFor, wait.ForListeningPort(BlobPort))
- waitingFor = append(waitingFor, wait.ForLog("Blob service is successfully listening"))
case QueueService:
genericContainerReq.Cmd = append(genericContainerReq.Cmd, "--queueHost", "0.0.0.0")
waitingFor = append(waitingFor, wait.ForListeningPort(QueuePort))
- waitingFor = append(waitingFor, wait.ForLog("Queue service is successfully listening"))
case TableService:
genericContainerReq.Cmd = append(genericContainerReq.Cmd, "--tableHost", "0.0.0.0")
waitingFor = append(waitingFor, wait.ForListeningPort(TablePort))
- waitingFor = append(waitingFor, wait.ForLog("Table service is successfully listening"))
}
}
- if len(waitingFor) > 0 {
- genericContainerReq.WaitingFor = wait.ForAll(waitingFor...)
- }
+ genericContainerReq.WaitingFor = wait.ForAll(genericContainerReq.WaitingFor, wait.ForAll(waitingFor...))
}
container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
From 6e5f9bf2c5d236c36d390ef3e0e0e720731732dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 12 Mar 2025 20:53:56 +0100
Subject: [PATCH 35/43] fix: wait for all does not handle nil waits
---
modules/azure/azurite/azurite.go | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/modules/azure/azurite/azurite.go b/modules/azure/azurite/azurite.go
index da5553fd9b..5e2a63a579 100644
--- a/modules/azure/azurite/azurite.go
+++ b/modules/azure/azurite/azurite.go
@@ -111,7 +111,11 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
}
}
- genericContainerReq.WaitingFor = wait.ForAll(genericContainerReq.WaitingFor, wait.ForAll(waitingFor...))
+ if genericContainerReq.WaitingFor != nil {
+ genericContainerReq.WaitingFor = wait.ForAll(genericContainerReq.WaitingFor, wait.ForAll(waitingFor...))
+ } else {
+ genericContainerReq.WaitingFor = wait.ForAll(waitingFor...)
+ }
}
container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
From 96c60a6d0b8529ec10319ed1d60f2b0d713edfbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 13 Mar 2025 07:26:45 +0100
Subject: [PATCH 36/43] chore!: remove Must methods from the azure containers
---
docs/modules/azure.md | 18 ------------------
modules/azure/azurite/azurite.go | 10 ----------
modules/azure/azurite/examples_test.go | 22 +++++++++++++++++++---
modules/azure/eventhubs/eventhubs.go | 11 -----------
modules/azure/eventhubs/examples_test.go | 8 +++++++-
modules/azure/servicebus/examples_test.go | 8 +++++++-
modules/azure/servicebus/servicebus.go | 11 -----------
7 files changed, 33 insertions(+), 55 deletions(-)
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index 004341e4e6..254fdb8fe1 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -84,12 +84,6 @@ The Azurite container exposes the following methods:
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>
-
-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.
-
### Examples
#### Blob Operations
@@ -200,12 +194,6 @@ The EventHubs container exposes the following methods:
Returns the connection string to connect to the EventHubs container and an error, passing the Go context as parameter.
-#### MustConnectionString
-
-- 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>
-
-Returns the connection string to connect to the EventHubs container, passing the Go context as parameter. If an error occurs, it panics.
-
### Examples
#### Send events to EventHubs
@@ -289,12 +277,6 @@ The ServiceBus container exposes the following methods:
Returns the connection string to connect to the ServiceBus container and an error, passing the Go context as parameter.
-#### MustConnectionString
-
-- 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>
-
-Returns the connection string to connect to the ServiceBus container, passing the Go context as parameter. If an error occurs, it panics.
-
### Examples
#### Send events to ServiceBus
diff --git a/modules/azure/azurite/azurite.go b/modules/azure/azurite/azurite.go
index 5e2a63a579..e82362d02b 100644
--- a/modules/azure/azurite/azurite.go
+++ b/modules/azure/azurite/azurite.go
@@ -60,16 +60,6 @@ func (c *AzuriteContainer) ServiceURL(ctx context.Context, srv Service) (string,
return fmt.Sprintf("http://%s:%d", hostname, mappedPort.Int()), nil
}
-// MustServiceURL returns the URL of the given service, panics if an error occurs
-func (c *AzuriteContainer) MustServiceURL(ctx context.Context, srv Service) string {
- url, err := c.ServiceURL(ctx, srv)
- if err != nil {
- panic(err)
- }
-
- return url
-}
-
// Run creates an instance of the Azurite container type
func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*AzuriteContainer, error) {
req := testcontainers.ContainerRequest{
diff --git a/modules/azure/azurite/examples_test.go b/modules/azure/azurite/examples_test.go
index 7a59b7ee65..4c79eb4e5b 100644
--- a/modules/azure/azurite/examples_test.go
+++ b/modules/azure/azurite/examples_test.go
@@ -81,7 +81,13 @@ func ExampleRun_blobOperations() {
// create an azblob.Client for the specified storage account that uses the above credentials
// createClient {
- blobServiceURL := fmt.Sprintf("%s/%s", azuriteContainer.MustServiceURL(ctx, azurite.BlobService), azurite.AccountName)
+ serviceURL, err := azuriteContainer.ServiceURL(ctx, azurite.BlobService)
+ if err != nil {
+ log.Printf("failed to get service URL: %s", err)
+ return
+ }
+
+ blobServiceURL := serviceURL + "/" + azurite.AccountName
client, err := azblob.NewClientWithSharedKeyCredential(blobServiceURL, cred, nil)
if err != nil {
@@ -215,7 +221,12 @@ func ExampleRun_queueOperations() {
// create an azqueue.Client for the specified storage account that uses the above credentials
// queueOperations_createClient {
- queueServiceURL := fmt.Sprintf("%s/%s", azuriteContainer.MustServiceURL(ctx, azurite.QueueService), azurite.AccountName)
+ serviceURL, err := azuriteContainer.ServiceURL(ctx, azurite.QueueService)
+ if err != nil {
+ log.Printf("failed to get service URL: %s", err)
+ return
+ }
+ queueServiceURL := serviceURL + "/" + azurite.AccountName
client, err := azqueue.NewServiceClientWithSharedKeyCredential(queueServiceURL, cred, nil)
if err != nil {
@@ -304,7 +315,12 @@ func ExampleRun_tableOperations() {
// create an aztables.Client for the specified storage account that uses the above credentials
// tableOperations_createClient {
- tablesServiceURL := fmt.Sprintf("%s/%s", azuriteContainer.MustServiceURL(ctx, azurite.TableService), azurite.AccountName)
+ serviceURL, err := azuriteContainer.ServiceURL(ctx, azurite.TableService)
+ if err != nil {
+ log.Printf("failed to get service URL: %s", err)
+ return
+ }
+ tablesServiceURL := serviceURL + "/" + azurite.AccountName
client, err := aztables.NewServiceClientWithSharedKey(tablesServiceURL, cred, nil)
if err != nil {
diff --git a/modules/azure/eventhubs/eventhubs.go b/modules/azure/eventhubs/eventhubs.go
index c44de067b8..f67910598f 100644
--- a/modules/azure/eventhubs/eventhubs.go
+++ b/modules/azure/eventhubs/eventhubs.go
@@ -152,14 +152,3 @@ func (c *Container) ConnectionString(ctx context.Context) (string, error) {
return fmt.Sprintf(connectionStringFormat, hostPort, azurite.AccountName, azurite.AccountKey), nil
}
-
-// MustConnectionString returns the connection string for the eventhubs container,
-// calling [Container.ConnectionString] and panicking if it returns an error.
-func (c *Container) MustConnectionString(ctx context.Context) string {
- url, err := c.ConnectionString(ctx)
- if err != nil {
- panic(err)
- }
-
- return url
-}
diff --git a/modules/azure/eventhubs/examples_test.go b/modules/azure/eventhubs/examples_test.go
index 1e0f692efe..727e7daae3 100644
--- a/modules/azure/eventhubs/examples_test.go
+++ b/modules/azure/eventhubs/examples_test.go
@@ -87,7 +87,13 @@ func ExampleRun_sendEventsToEventHub() {
// ===== 1. Create an Event Hubs producer client using a connection string to the namespace and the event hub =====
// createProducerClient {
- producerClient, err := azeventhubs.NewProducerClientFromConnectionString(eventHubsCtr.MustConnectionString(ctx), "eh1", nil)
+ connectionString, err := eventHubsCtr.ConnectionString(ctx)
+ if err != nil {
+ log.Printf("failed to get connection string: %s", err)
+ return
+ }
+
+ producerClient, err := azeventhubs.NewProducerClientFromConnectionString(connectionString, "eh1", nil)
if err != nil {
log.Printf("failed to create producer client: %s", err)
return
diff --git a/modules/azure/servicebus/examples_test.go b/modules/azure/servicebus/examples_test.go
index 0546452482..b30f77e5d8 100644
--- a/modules/azure/servicebus/examples_test.go
+++ b/modules/azure/servicebus/examples_test.go
@@ -96,7 +96,13 @@ func ExampleRun_authenticateCreateClient() {
// ===== 2. Create a Service Bus client using a connection string to the namespace =====
// createClient {
- client, err := azservicebus.NewClientFromConnectionString(serviceBusContainer.MustConnectionString(ctx), nil)
+ connectionString, err := serviceBusContainer.ConnectionString(ctx)
+ if err != nil {
+ log.Printf("failed to get connection string: %s", err)
+ return
+ }
+
+ client, err := azservicebus.NewClientFromConnectionString(connectionString, nil)
if err != nil {
log.Printf("failed to create client: %s", err)
return
diff --git a/modules/azure/servicebus/servicebus.go b/modules/azure/servicebus/servicebus.go
index 2b7067da1f..e1ba08c544 100644
--- a/modules/azure/servicebus/servicebus.go
+++ b/modules/azure/servicebus/servicebus.go
@@ -161,14 +161,3 @@ func (c *Container) ConnectionString(ctx context.Context) (string, error) {
return fmt.Sprintf(connectionStringFormat, hostPort, defaultSharedAccessKeyName, defaultSharedAccessKey), nil
}
-
-// MustConnectionString returns the connection string for the eventhubs container,
-// calling [Container.ConnectionString] and panicking if it returns an error.
-func (c *Container) MustConnectionString(ctx context.Context) string {
- url, err := c.ConnectionString(ctx)
- if err != nil {
- panic(err)
- }
-
- return url
-}
From 8933b6e5d7b07fc42bcab60bb234759993371529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 13 Mar 2025 18:25:24 +0100
Subject: [PATCH 37/43] fix: wait for http code 200 OK
---
modules/azure/eventhubs/eventhubs.go | 5 ++++-
modules/azure/servicebus/servicebus.go | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/modules/azure/eventhubs/eventhubs.go b/modules/azure/eventhubs/eventhubs.go
index f67910598f..cabff1861e 100644
--- a/modules/azure/eventhubs/eventhubs.go
+++ b/modules/azure/eventhubs/eventhubs.go
@@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
+ "net/http"
"strings"
"github.com/testcontainers/testcontainers-go"
@@ -75,7 +76,9 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
WaitingFor: wait.ForAll(
wait.ForListeningPort(defaultAMPQPort),
wait.ForListeningPort(defaultHTTPPort),
- wait.ForHTTP("/health").WithPort(defaultHTTPPort),
+ wait.ForHTTP("/health").WithPort(defaultHTTPPort).WithStatusCodeMatcher(func(status int) bool {
+ return status == http.StatusOK
+ }),
),
}
diff --git a/modules/azure/servicebus/servicebus.go b/modules/azure/servicebus/servicebus.go
index e1ba08c544..2a3fe0f8e9 100644
--- a/modules/azure/servicebus/servicebus.go
+++ b/modules/azure/servicebus/servicebus.go
@@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
+ "net/http"
"strings"
"github.com/testcontainers/testcontainers-go"
@@ -82,7 +83,9 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
WaitingFor: wait.ForAll(
wait.ForListeningPort(defaultPort),
wait.ForListeningPort(defaultHTTPPort),
- wait.ForHTTP("/health").WithPort(defaultHTTPPort),
+ wait.ForHTTP("/health").WithPort(defaultHTTPPort).WithStatusCodeMatcher(func(status int) bool {
+ return status == http.StatusOK
+ }),
),
}
From 3bc45689344a264a003151deba1483ce9dc6244a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Fri, 14 Mar 2025 10:50:45 +0100
Subject: [PATCH 38/43] fix: wait for the default port in the MSSQL Server
module
---
modules/mssql/mssql.go | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/modules/mssql/mssql.go b/modules/mssql/mssql.go
index dba0f4c7ee..88b934cb13 100644
--- a/modules/mssql/mssql.go
+++ b/modules/mssql/mssql.go
@@ -6,6 +6,7 @@ import (
"fmt"
"io"
"strings"
+ "time"
"github.com/testcontainers/testcontainers-go"
tcexec "github.com/testcontainers/testcontainers-go/exec"
@@ -117,7 +118,10 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
Env: map[string]string{
"MSSQL_SA_PASSWORD": defaultPassword,
},
- WaitingFor: wait.ForLog("Recovery is complete."),
+ WaitingFor: wait.ForAll(
+ wait.ForListeningPort(defaultPort).WithStartupTimeout(time.Minute),
+ wait.ForLog("Recovery is complete."),
+ ),
}
genericContainerReq := testcontainers.GenericContainerRequest{
From 1537421db85f6df9521486c6a330cfe6ede9c4a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Mon, 17 Mar 2025 19:00:52 +0100
Subject: [PATCH 39/43] fix: mod tidy azurite
---
modules/azurite/go.mod | 1 -
1 file changed, 1 deletion(-)
diff --git a/modules/azurite/go.mod b/modules/azurite/go.mod
index 1baa3e956d..e04b615228 100644
--- a/modules/azurite/go.mod
+++ b/modules/azurite/go.mod
@@ -58,7 +58,6 @@ require (
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
golang.org/x/crypto v0.35.0 // indirect
- golang.org/x/net v0.36.0 // indirect
golang.org/x/sys v0.30.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
From b92fb28141d998bf58a22f4d94165bfb80e82824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Wed, 19 Mar 2025 13:27:10 +0100
Subject: [PATCH 40/43] chore: rename container type for Azurite
---
modules/azure/azurite/azurite.go | 12 ++++++------
modules/azure/eventhubs/eventhubs.go | 2 +-
modules/azure/eventhubs/options.go | 2 +-
modules/azurite/azurite.go | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/azure/azurite/azurite.go b/modules/azure/azurite/azurite.go
index e82362d02b..79c62f44e9 100644
--- a/modules/azure/azurite/azurite.go
+++ b/modules/azure/azurite/azurite.go
@@ -27,14 +27,14 @@ const (
// }
)
-// AzuriteContainer represents the Azurite container type used in the module
-type AzuriteContainer struct {
+// Container represents the Azurite container type used in the module
+type Container struct {
testcontainers.Container
opts options
}
// ServiceURL returns the URL of the given service
-func (c *AzuriteContainer) ServiceURL(ctx context.Context, srv Service) (string, error) {
+func (c *Container) ServiceURL(ctx context.Context, srv Service) (string, error) {
hostname, err := c.Host(ctx)
if err != nil {
return "", fmt.Errorf("host: %w", err)
@@ -61,7 +61,7 @@ func (c *AzuriteContainer) ServiceURL(ctx context.Context, srv Service) (string,
}
// Run creates an instance of the Azurite container type
-func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*AzuriteContainer, error) {
+func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*Container, error) {
req := testcontainers.ContainerRequest{
Image: img,
ExposedPorts: []string{BlobPort, QueuePort, TablePort},
@@ -109,9 +109,9 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
}
container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
- var c *AzuriteContainer
+ var c *Container
if container != nil {
- c = &AzuriteContainer{Container: container, opts: settings}
+ c = &Container{Container: container, opts: settings}
}
if err != nil {
diff --git a/modules/azure/eventhubs/eventhubs.go b/modules/azure/eventhubs/eventhubs.go
index cabff1861e..d4b4fd4b20 100644
--- a/modules/azure/eventhubs/eventhubs.go
+++ b/modules/azure/eventhubs/eventhubs.go
@@ -35,7 +35,7 @@ type Container struct {
}
// AzuriteContainer returns the azurite container that is used by the eventhubs container
-func (c *Container) AzuriteContainer() *azurite.AzuriteContainer {
+func (c *Container) AzuriteContainer() *azurite.Container {
return c.azuriteOptions.azuriteContainer
}
diff --git a/modules/azure/eventhubs/options.go b/modules/azure/eventhubs/options.go
index 6423c11851..f439d3df2d 100644
--- a/modules/azure/eventhubs/options.go
+++ b/modules/azure/eventhubs/options.go
@@ -10,7 +10,7 @@ import (
type options struct {
azuriteImage string
azuriteOptions []testcontainers.ContainerCustomizer
- azuriteContainer *azurite.AzuriteContainer
+ azuriteContainer *azurite.Container
network *testcontainers.DockerNetwork
}
diff --git a/modules/azurite/azurite.go b/modules/azurite/azurite.go
index 6956acb0c1..6bd01ad729 100644
--- a/modules/azurite/azurite.go
+++ b/modules/azurite/azurite.go
@@ -33,7 +33,7 @@ const (
// Deprecated: This type is deprecated in favor of the one in "modules/azure/azurite".
// AzuriteContainer represents the Azurite container type used in the module
-type AzuriteContainer = azurite.AzuriteContainer
+type AzuriteContainer = azurite.Container
// Deprecated: This function is deprecated in favor of the one in "modules/azure/azurite".
// RunContainer creates an instance of the Azurite container type
From 9c4ec5a820e21fda5986532425c5d0932570c55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Fri, 21 Mar 2025 10:30:28 +0100
Subject: [PATCH 41/43] chore: save variable
---
modules/azure/azurite/azurite.go | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/modules/azure/azurite/azurite.go b/modules/azure/azurite/azurite.go
index 79c62f44e9..bc88cce26b 100644
--- a/modules/azure/azurite/azurite.go
+++ b/modules/azure/azurite/azurite.go
@@ -84,10 +84,9 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
}
// 2. evaluate the enabled services to apply the right wait strategy and Cmd options
- enabledServices := settings.EnabledServices
- if len(enabledServices) > 0 {
- waitingFor := make([]wait.Strategy, 0, len(enabledServices))
- for _, srv := range enabledServices {
+ if len(settings.EnabledServices) > 0 {
+ waitingFor := make([]wait.Strategy, 0, len(settings.EnabledServices))
+ for _, srv := range settings.EnabledServices {
switch srv {
case BlobService:
genericContainerReq.Cmd = append(genericContainerReq.Cmd, "--blobHost", "0.0.0.0")
From d0f0a31cef7262c005b393824721c25d61471488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Fri, 21 Mar 2025 11:14:13 +0100
Subject: [PATCH 42/43] chore: do not expose services
---
docs/modules/azure.md | 18 +++++++++++++++---
modules/azure/azurite/azurite.go | 26 +++++++++++++++++++++++---
modules/azure/azurite/azurite_test.go | 11 +++--------
modules/azure/azurite/examples_test.go | 6 +++---
modules/azure/azurite/options.go | 4 ++--
modules/azure/azurite/services.go | 24 ++++++++++++++++++++----
6 files changed, 66 insertions(+), 23 deletions(-)
diff --git a/docs/modules/azure.md b/docs/modules/azure.md
index 254fdb8fe1..e838ef6241 100644
--- a/docs/modules/azure.md
+++ b/docs/modules/azure.md
@@ -72,17 +72,29 @@ If you want to use in-memory persistence, you can use `WithInMemoryPersistence(m
Please read the [Azurite documentation](https://github.com/Azure/Azurite?tab=readme-ov-file#use-in-memory-storage) for more information.
!!! warning
- This option is only available in Azurite versions 3.28.0 and later.
+ This option is only available in Azurite versions `3.28.0` and later.
### Container Methods
The Azurite container exposes the following methods:
-#### ServiceURL
+#### BlobServiceURL
- 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>
-Returns the service URL to connect to the Azurite container and an error, passing the Go context and the service name as parameters.
+Returns the service URL to connect to the Blob service of the Azurite container and an error, passing the Go context as parameter.
+
+#### QueueServiceURL
+
+- 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>
+
+Returns the service URL to connect to the Queue service of the Azurite container and an error, passing the Go context as parameter.
+
+#### TableServiceURL
+
+- 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>
+
+Returns the service URL to connect to the Table service of the Azurite container and an error, passing the Go context as parameter.
### Examples
diff --git a/modules/azure/azurite/azurite.go b/modules/azure/azurite/azurite.go
index bc88cce26b..5ce648c480 100644
--- a/modules/azure/azurite/azurite.go
+++ b/modules/azure/azurite/azurite.go
@@ -33,8 +33,28 @@ type Container struct {
opts options
}
+// Deprecated: Use [azure.BlobServiceURL], [azure.QueueServiceURL], or [azure.TableServiceURL] methods instead.
// ServiceURL returns the URL of the given service
func (c *Container) ServiceURL(ctx context.Context, srv Service) (string, error) {
+ return c.serviceURL(ctx, srv)
+}
+
+// BlobServiceURL returns the URL of the Blob service
+func (c *Container) BlobServiceURL(ctx context.Context) (string, error) {
+ return c.serviceURL(ctx, blobService)
+}
+
+// QueueServiceURL returns the URL of the Queue service
+func (c *Container) QueueServiceURL(ctx context.Context) (string, error) {
+ return c.serviceURL(ctx, queueService)
+}
+
+// TableServiceURL returns the URL of the Table service
+func (c *Container) TableServiceURL(ctx context.Context) (string, error) {
+ return c.serviceURL(ctx, tableService)
+}
+
+func (c *Container) serviceURL(ctx context.Context, srv service) (string, error) {
hostname, err := c.Host(ctx)
if err != nil {
return "", fmt.Errorf("host: %w", err)
@@ -42,11 +62,11 @@ func (c *Container) ServiceURL(ctx context.Context, srv Service) (string, error)
var port nat.Port
switch srv {
- case BlobService:
+ case blobService:
port = BlobPort
- case QueueService:
+ case queueService:
port = QueuePort
- case TableService:
+ case tableService:
port = TablePort
default:
return "", fmt.Errorf("unknown service: %s", srv)
diff --git a/modules/azure/azurite/azurite_test.go b/modules/azure/azurite/azurite_test.go
index a6b9edd3c9..1809ae767e 100644
--- a/modules/azure/azurite/azurite_test.go
+++ b/modules/azure/azurite/azurite_test.go
@@ -44,22 +44,17 @@ func TestAzurite_serviceURL(t *testing.T) {
require.NoError(t, err)
t.Run("blob", func(t *testing.T) {
- _, err := ctr.ServiceURL(ctx, azurite.BlobService)
+ _, err := ctr.BlobServiceURL(ctx)
require.NoError(t, err)
})
t.Run("queue", func(t *testing.T) {
- _, err := ctr.ServiceURL(ctx, azurite.QueueService)
+ _, err := ctr.QueueServiceURL(ctx)
require.NoError(t, err)
})
t.Run("table", func(t *testing.T) {
- _, err := ctr.ServiceURL(ctx, azurite.TableService)
+ _, err := ctr.TableServiceURL(ctx)
require.NoError(t, err)
})
-
- t.Run("unknown-service", func(t *testing.T) {
- _, err := ctr.ServiceURL(ctx, "unknown")
- require.Error(t, err)
- })
}
diff --git a/modules/azure/azurite/examples_test.go b/modules/azure/azurite/examples_test.go
index 4c79eb4e5b..9fc8c91f21 100644
--- a/modules/azure/azurite/examples_test.go
+++ b/modules/azure/azurite/examples_test.go
@@ -81,7 +81,7 @@ func ExampleRun_blobOperations() {
// create an azblob.Client for the specified storage account that uses the above credentials
// createClient {
- serviceURL, err := azuriteContainer.ServiceURL(ctx, azurite.BlobService)
+ serviceURL, err := azuriteContainer.BlobServiceURL(ctx)
if err != nil {
log.Printf("failed to get service URL: %s", err)
return
@@ -221,7 +221,7 @@ func ExampleRun_queueOperations() {
// create an azqueue.Client for the specified storage account that uses the above credentials
// queueOperations_createClient {
- serviceURL, err := azuriteContainer.ServiceURL(ctx, azurite.QueueService)
+ serviceURL, err := azuriteContainer.QueueServiceURL(ctx)
if err != nil {
log.Printf("failed to get service URL: %s", err)
return
@@ -315,7 +315,7 @@ func ExampleRun_tableOperations() {
// create an aztables.Client for the specified storage account that uses the above credentials
// tableOperations_createClient {
- serviceURL, err := azuriteContainer.ServiceURL(ctx, azurite.TableService)
+ serviceURL, err := azuriteContainer.TableServiceURL(ctx)
if err != nil {
log.Printf("failed to get service URL: %s", err)
return
diff --git a/modules/azure/azurite/options.go b/modules/azure/azurite/options.go
index 8e93721360..70f464fcff 100644
--- a/modules/azure/azurite/options.go
+++ b/modules/azure/azurite/options.go
@@ -8,12 +8,12 @@ import (
type options struct {
// EnabledServices is a list of services that should be enabled
- EnabledServices []Service
+ EnabledServices []service
}
func defaultOptions() options {
return options{
- EnabledServices: []Service{BlobService, QueueService, TableService},
+ EnabledServices: []service{blobService, queueService, tableService},
}
}
diff --git a/modules/azure/azurite/services.go b/modules/azure/azurite/services.go
index 69c9ade850..3b1fb5a23d 100644
--- a/modules/azure/azurite/services.go
+++ b/modules/azure/azurite/services.go
@@ -1,15 +1,31 @@
package azurite
const (
+ // blobService is the service name for the Blob service
+ blobService Service = "blob"
+
+ // Deprecated: this constant is kept for backward compatibility, but it'll be removed in the next major version.
// BlobService is the service name for the Blob service
- BlobService Service = "blob"
+ BlobService Service = blobService
+
+ // queueService is the service name for the Queue service
+ queueService Service = "queue"
+ // Deprecated: this constant is kept for backward compatibility, but it'll be removed in the next major version.
// QueueService is the service name for the Queue service
- QueueService Service = "queue"
+ QueueService Service = queueService
+ // tableService is the service name for the Table service
+ tableService Service = "table"
+
+ // Deprecated: this constant is kept for backward compatibility, but it'll be removed in the next major version.
// TableService is the service name for the Table service
- TableService Service = "table"
+ TableService Service = tableService
)
+// Deprecated: this type is kept for backward compatibility, but it'll be removed in the next major version.
// Service is the type for the services that Azurite can provide
-type Service string
+type Service = service
+
+// service is the type for the services that Azurite can provide
+type service string
From f23f143ae5f00349b051e6c5c465bfa9fec2f626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Fri, 21 Mar 2025 11:19:50 +0100
Subject: [PATCH 43/43] chore: exclude azurite deprecations from lint
Services are now internal
---
modules/azurite/services.go | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/modules/azurite/services.go b/modules/azurite/services.go
index d3b2c3d0dc..1d69269a00 100644
--- a/modules/azurite/services.go
+++ b/modules/azurite/services.go
@@ -7,15 +7,25 @@ import (
const (
// Deprecated: This constant is deprecated in favor of the one in "modules/azure/azurite".
// Please use that package instead for all new code.
+ //
+ //nolint:staticcheck
BlobService Service = azurite.BlobService
+
// Deprecated: This constant is deprecated in favor of the one in "modules/azure/azurite".
// Please use that package instead for all new code.
+ //
+ //nolint:staticcheck
QueueService Service = azurite.QueueService
+
// Deprecated: This constant is deprecated in favor of the one in "modules/azure/azurite".
// Please use that package instead for all new code.
+ //
+ //nolint:staticcheck
TableService Service = azurite.TableService
)
// Deprecated: This type is deprecated in favor of the one in "modules/azure/azurite".
// Please use that package instead for all new code.
+//
+//nolint:staticcheck
type Service = azurite.Service