Skip to content
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

Upgrade neo4j module to use features from v0.29.1 of testcontainers-go #2463

Merged
merged 3 commits into from
Apr 3, 2024
Merged

Upgrade neo4j module to use features from v0.29.1 of testcontainers-go #2463

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8aae05f
Configure enterprise license using the new WithEnv option
danielorbach Apr 2, 2024
27aa00c
Fix typo in WithEnv documentation
danielorbach Apr 2, 2024
41b99e4
Merge branch 'main' into upgrade-v0.29.1
mdelapenya Apr 3, 2024
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
2 changes: 1 addition & 1 deletion docs/features/common_functional_options.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Using the `WithImageSubstitutors` options, you could define your own substitutio
If you need to either pass additional environment variables to a container or override them, you can use `testcontainers.WithEnv` for example:

```golang
postgres, err = postgresModule.RunContainer(ctx, testcontainers.WithEnv(map[string]string{"POSTGRES_INITDB_ARGS", "--no-sync"}))
postgres, err = postgresModule.RunContainer(ctx, testcontainers.WithEnv(map[string]string{"POSTGRES_INITDB_ARGS": "--no-sync"}))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch!

```

#### WithLogConsumers
Expand Down
12 changes: 6 additions & 6 deletions modules/neo4j/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ func formatNeo4jConfig(name string) string {
// the commercial licence agreement of Neo4j Enterprise Edition. The license
// agreement is available at https://neo4j.com/terms/licensing/.
func WithAcceptCommercialLicenseAgreement() testcontainers.CustomizeRequestOption {
return func(req *testcontainers.GenericContainerRequest) {
req.Env["NEO4J_ACCEPT_LICENSE_AGREEMENT"] = "yes"
}
return testcontainers.WithEnv(map[string]string{
"NEO4J_ACCEPT_LICENSE_AGREEMENT": "yes",
})
}

// WithAcceptEvaluationLicenseAgreement sets the environment variable
Expand All @@ -134,7 +134,7 @@ func WithAcceptCommercialLicenseAgreement() testcontainers.CustomizeRequestOptio
// agreement is available at https://neo4j.com/terms/enterprise_us/. Please
// read the terms of the evaluation agreement before you accept.
func WithAcceptEvaluationLicenseAgreement() testcontainers.CustomizeRequestOption {
return func(req *testcontainers.GenericContainerRequest) {
req.Env["NEO4J_ACCEPT_LICENSE_AGREEMENT"] = "eval"
}
return testcontainers.WithEnv(map[string]string{
"NEO4J_ACCEPT_LICENSE_AGREEMENT": "eval",
})
}
Loading