Skip to content

chore(inbucket|influxdb|mongodb|k3s): use Run function #3413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdelapenya merged 6 commits into from
Oct 6, 2025
Merged

chore(inbucket|influxdb|mongodb|k3s): use Run function #3413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d0d165
chore(inbucket): use Run function
mdelapenya Oct 3, 2025
099295d
chore(influxdb): use Run function
mdelapenya Oct 3, 2025
5706866
chore(mongodb): use Run function
mdelapenya Oct 6, 2025
1ace0ec
chore(k3s): use Run function
mdelapenya Oct 6, 2025
140f71a
chore(influx): use primitive options
mdelapenya Oct 6, 2025
687c1b8
chore: simplify
mdelapenya Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions modules/inbucket/inbucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,35 +36,24 @@ func RunContainer(ctx context.Context, opts ...testcontainers.ContainerCustomize

// Run creates an instance of the Inbucket container type
func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*InbucketContainer, error) {
req := testcontainers.ContainerRequest{
Image: img,
ExposedPorts: []string{"2500/tcp", "9000/tcp", "1100/tcp"},
WaitingFor: wait.ForAll(
moduleOpts := []testcontainers.ContainerCustomizer{
testcontainers.WithExposedPorts("2500/tcp", "9000/tcp", "1100/tcp"),
testcontainers.WithWaitStrategy(
wait.ForListeningPort("2500/tcp"),
wait.ForListeningPort("9000/tcp"),
wait.ForListeningPort("1100/tcp"),
),
}
moduleOpts = append(moduleOpts, opts...)

genericContainerReq := testcontainers.GenericContainerRequest{
ContainerRequest: req,
Started: true,
}

for _, opt := range opts {
if err := opt.Customize(&genericContainerReq); err != nil {
return nil, err
}
}

container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
container, err := testcontainers.Run(ctx, img, moduleOpts...)
var c *InbucketContainer
if container != nil {
c = &InbucketContainer{Container: container}
}

if err != nil {
return c, fmt.Errorf("generic container: %w", err)
return c, fmt.Errorf("run inbucket: %w", err)
}

return c, nil
Expand Down
119 changes: 50 additions & 69 deletions modules/influxdb/influxdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,38 +28,28 @@ func RunContainer(ctx context.Context, opts ...testcontainers.ContainerCustomize

// Run creates an instance of the InfluxDB container type
func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*InfluxDbContainer, error) {
req := testcontainers.ContainerRequest{
Image: img,
ExposedPorts: []string{"8086/tcp", "8088/tcp"},
Env: map[string]string{
moduleOpts := []testcontainers.ContainerCustomizer{
testcontainers.WithExposedPorts("8086/tcp", "8088/tcp"),
testcontainers.WithEnv(map[string]string{
"INFLUXDB_BIND_ADDRESS": ":8088",
"INFLUXDB_HTTP_BIND_ADDRESS": ":8086",
"INFLUXDB_REPORTING_DISABLED": "true",
"INFLUXDB_MONITOR_STORE_ENABLED": "false",
"INFLUXDB_HTTP_HTTPS_ENABLED": "false",
"INFLUXDB_HTTP_AUTH_ENABLED": "false",
},
WaitingFor: waitForHTTPHealth(),
}
genericContainerReq := testcontainers.GenericContainerRequest{
ContainerRequest: req,
Started: true,
}

for _, opt := range opts {
if err := opt.Customize(&genericContainerReq); err != nil {
return nil, err
}
}),
testcontainers.WithWaitStrategy(waitForHTTPHealth()),
}
moduleOpts = append(moduleOpts, opts...)

container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
container, err := testcontainers.Run(ctx, img, moduleOpts...)
var c *InfluxDbContainer
if container != nil {
c = &InfluxDbContainer{Container: container}
}

if err != nil {
return c, fmt.Errorf("generic container: %w", err)
return c, fmt.Errorf("run influxdb: %w", err)
}

return c, nil
Expand All @@ -80,36 +70,29 @@ func (c *InfluxDbContainer) ConnectionUrl(ctx context.Context) (string, error) {
}

func WithUsername(username string) testcontainers.CustomizeRequestOption {
return func(req *testcontainers.GenericContainerRequest) error {
req.Env["INFLUXDB_USER"] = username
return nil
}
return testcontainers.WithEnv(map[string]string{
"INFLUXDB_USER": username,
})
}

func WithPassword(password string) testcontainers.CustomizeRequestOption {
return func(req *testcontainers.GenericContainerRequest) error {
req.Env["INFLUXDB_PASSWORD"] = password
return nil
}
return testcontainers.WithEnv(map[string]string{
"INFLUXDB_PASSWORD": password,
})
}

func WithDatabase(database string) testcontainers.CustomizeRequestOption {
return func(req *testcontainers.GenericContainerRequest) error {
req.Env["INFLUXDB_DATABASE"] = database
return nil
}
return testcontainers.WithEnv(map[string]string{
"INFLUXDB_DATABASE": database,
})
}

func WithConfigFile(configFile string) testcontainers.CustomizeRequestOption {
return func(req *testcontainers.GenericContainerRequest) error {
cf := testcontainers.ContainerFile{
HostFilePath: configFile,
ContainerFilePath: "/etc/influxdb/influxdb.conf",
FileMode: 0o755,
}
req.Files = append(req.Files, cf)
return nil
}
return testcontainers.WithFiles(testcontainers.ContainerFile{
HostFilePath: configFile,
ContainerFilePath: "/etc/influxdb/influxdb.conf",
FileMode: 0o755,
})
}

// withV2 configures the influxdb container to be compatible with InfluxDB v2
Expand All @@ -122,21 +105,17 @@ func withV2(req *testcontainers.GenericContainerRequest, org, bucket string) err
return errors.New("bucket name is required")
}

req.Env["DOCKER_INFLUXDB_INIT_ORG"] = org
req.Env["DOCKER_INFLUXDB_INIT_BUCKET"] = bucket
req.Env["DOCKER_INFLUXDB_INIT_MODE"] = "setup" // Always setup, we wont be migrating from v1 to v2
return nil
return testcontainers.WithEnv(map[string]string{
"DOCKER_INFLUXDB_INIT_ORG": org,
"DOCKER_INFLUXDB_INIT_BUCKET": bucket,
"DOCKER_INFLUXDB_INIT_MODE": "setup", // Always setup, we wont be migrating from v1 to v2
})(req)
}

// WithV2 configures the influxdb container to be compatible with InfluxDB v2
func WithV2(org, bucket string) testcontainers.CustomizeRequestOption {
return func(req *testcontainers.GenericContainerRequest) error {
err := withV2(req, org, bucket)
if err != nil {
return err
}

return nil
return withV2(req, org, bucket)
}
}

Expand Down Expand Up @@ -168,9 +147,10 @@ func WithV2Auth(org, bucket, username, password string) testcontainers.Customize
return errors.New("username and password file already set, use either WithV2Auth or WithV2SecretsAuth")
}

req.Env["DOCKER_INFLUXDB_INIT_USERNAME"] = username
req.Env["DOCKER_INFLUXDB_INIT_PASSWORD"] = password
return nil
return testcontainers.WithEnv(map[string]string{
"DOCKER_INFLUXDB_INIT_USERNAME": username,
"DOCKER_INFLUXDB_INIT_PASSWORD": password,
})(req)
}
}

Expand All @@ -195,9 +175,10 @@ func WithV2SecretsAuth(org, bucket, usernameFile, passwordFile string) testconta
return err
}

req.Env["DOCKER_INFLUXDB_INIT_USERNAME_FILE"] = secretsPath(usernameFile)
req.Env["DOCKER_INFLUXDB_INIT_PASSWORD_FILE"] = secretsPath(passwordFile)
return nil
return testcontainers.WithEnv(map[string]string{
"DOCKER_INFLUXDB_INIT_USERNAME_FILE": secretsPath(usernameFile),
"DOCKER_INFLUXDB_INIT_PASSWORD_FILE": secretsPath(passwordFile),
})(req)
}
}

Expand All @@ -208,9 +189,9 @@ func WithV2Retention(retention time.Duration) testcontainers.CustomizeRequestOpt
return errors.New("retention is required")
}

req.Env["DOCKER_INFLUXDB_INIT_RETENTION"] = retention.String()

return nil
return testcontainers.WithEnv(map[string]string{
"DOCKER_INFLUXDB_INIT_RETENTION": retention.String(),
})(req)
}
}

Expand All @@ -225,9 +206,9 @@ func WithV2AdminToken(token string) testcontainers.CustomizeRequestOption {
return errors.New("admin token file already set, use either WithV2AdminToken or WithV2SecretsAdminToken")
}

req.Env["DOCKER_INFLUXDB_INIT_ADMIN_TOKEN"] = token

return nil
return testcontainers.WithEnv(map[string]string{
"DOCKER_INFLUXDB_INIT_ADMIN_TOKEN": token,
})(req)
}
}

Expand All @@ -242,9 +223,9 @@ func WithV2SecretsAdminToken(tokenFile string) testcontainers.CustomizeRequestOp
return errors.New("admin token already set, use either WithV2AdminToken or WithV2SecretsAdminToken")
}

req.Env["DOCKER_INFLUXDB_INIT_ADMIN_TOKEN_FILE"] = secretsPath(tokenFile)

return nil
return testcontainers.WithEnv(map[string]string{
"DOCKER_INFLUXDB_INIT_ADMIN_TOKEN_FILE": secretsPath(tokenFile),
})(req)
}
}

Expand All @@ -254,18 +235,18 @@ func WithV2SecretsAdminToken(tokenFile string) testcontainers.CustomizeRequestOp
//nolint:staticcheck //FIXME
func WithInitDb(srcPath string) testcontainers.CustomizeRequestOption {
return func(req *testcontainers.GenericContainerRequest) error {
cf := testcontainers.ContainerFile{
if err := testcontainers.WithFiles(testcontainers.ContainerFile{
HostFilePath: path.Join(srcPath, "docker-entrypoint-initdb.d"),
ContainerFilePath: "/",
FileMode: 0o755,
})(req); err != nil {
return err
}
req.Files = append(req.Files, cf)

req.WaitingFor = wait.ForAll(
return testcontainers.WithAdditionalWaitStrategy(
wait.ForLog("Server shutdown completed"),
waitForHTTPHealth(),
)
return nil
)(req)
}
}

Expand Down
43 changes: 15 additions & 28 deletions modules/k3s/k3s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,51 +61,38 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
return nil, err
}

req := testcontainers.ContainerRequest{
Image: img,
ExposedPorts: []string{
defaultKubeSecurePort,
defaultRancherWebhookPort,
},
HostConfigModifier: func(hc *container.HostConfig) {
moduleOpts := []testcontainers.ContainerCustomizer{
testcontainers.WithExposedPorts(defaultKubeSecurePort, defaultRancherWebhookPort),
testcontainers.WithHostConfigModifier(func(hc *container.HostConfig) {
hc.Privileged = true
hc.CgroupnsMode = "host"
hc.Tmpfs = map[string]string{
"/run": "",
"/var/run": "",
}
hc.Mounts = []mount.Mount{}
},
Cmd: []string{
}),
testcontainers.WithCmd(
"server",
"--disable=traefik",
"--tls-san=" + host, // Host which will be used to access the Kubernetes server from tests.
},
Env: map[string]string{
"--tls-san="+host, // Host which will be used to access the Kubernetes server from tests.
),
testcontainers.WithEnv(map[string]string{
"K3S_KUBECONFIG_MODE": "644",
},
WaitingFor: wait.ForLog(".*Node controller sync successful.*").AsRegexp(),
}),
testcontainers.WithWaitStrategy(wait.ForLog(".*Node controller sync successful.*").AsRegexp()),
}

genericContainerReq := testcontainers.GenericContainerRequest{
ContainerRequest: req,
Started: true,
}

for _, opt := range opts {
if err := opt.Customize(&genericContainerReq); err != nil {
return nil, err
}
}
moduleOpts = append(moduleOpts, opts...)

container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
ctr, err := testcontainers.Run(ctx, img, moduleOpts...)
var c *K3sContainer
if container != nil {
c = &K3sContainer{Container: container}
if ctr != nil {
c = &K3sContainer{Container: ctr}
}

if err != nil {
return c, fmt.Errorf("generic container: %w", err)
return c, fmt.Errorf("run k3s: %w", err)
}

return c, nil
Expand Down
Loading
Loading