Skip to content

chore(couchbase): use Run function #3401

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
merged 2 commits into from
Oct 2, 2025
Merged

chore(couchbase): use Run function #3401

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8030a0
chore(couchbase): use Run function
mdelapenya Oct 2, 2025
4940f14
fix: do not mutate caller's opts
mdelapenya Oct 2, 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
33 changes: 14 additions & 19 deletions modules/couchbase/couchbase.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,27 +72,19 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
indexStorageMode: MemoryOptimized,
}

req := testcontainers.ContainerRequest{
Image: img,
ExposedPorts: []string{MGMT_PORT + "/tcp", MGMT_SSL_PORT + "/tcp"},
}

genericContainerReq := testcontainers.GenericContainerRequest{
ContainerRequest: req,
Started: true,
moduleOpts := []testcontainers.ContainerCustomizer{
testcontainers.WithExposedPorts(MGMT_PORT+"/tcp", MGMT_SSL_PORT+"/tcp"),
}

serviceCustomizers := make([]testcontainers.ContainerCustomizer, 0, len(initialServices))
for _, srv := range initialServices {
opts = append(opts, withService(srv))
serviceCustomizers = append(serviceCustomizers, withService(srv))
}

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

// transfer options to the config
serviceCustomizers = append(serviceCustomizers, opts...)

// transfer options to the config
for _, opt := range serviceCustomizers {
if bucketCustomizer, ok := opt.(bucketCustomizer); ok {
// If the option is a bucketCustomizer, we need to add the buckets to the request
config.buckets = append(config.buckets, bucketCustomizer.buckets...)
Expand All @@ -113,13 +105,16 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
}
}

container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
moduleOpts = append(moduleOpts, serviceCustomizers...)

ctr, err := testcontainers.Run(ctx, img, moduleOpts...)
var couchbaseContainer *CouchbaseContainer
if container != nil {
couchbaseContainer = &CouchbaseContainer{container, config}
if ctr != nil {
couchbaseContainer = &CouchbaseContainer{Container: ctr, config: config}
}

if err != nil {
return couchbaseContainer, err
return couchbaseContainer, fmt.Errorf("run couchbase: %w", err)
}

if err = couchbaseContainer.initCluster(ctx); err != nil {
Expand Down
Loading