-
-
Notifications
You must be signed in to change notification settings - Fork 644
feat(cassandra): add ssl option cassandra #3151
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.
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
Changes from 19 commits
ba9ac99
a87e16b
d7c7be5
22c2887
dfe89e6
59a1733
4e7b372
875e63f
8e1b349
26a38e1
7d76d50
cc1dd06
71100a9
f07aea2
ac19eb4
5b636f7
2ad9f7b
7409635
4c2e3dc
6da1e1e
9a4f4f2
5242c32
18214a0
8ba3319
60622d4
38320ac
d1724a5
b05ef84
86f661b
879e285
fd5772d
545a00e
19f4879
50579f9
42f32ec
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,10 +2,14 @@ package cassandra | |
|
|
||
| import ( | ||
| "context" | ||
| "crypto/tls" | ||
| "crypto/x509" | ||
| "fmt" | ||
| "io" | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/docker/go-connections/nat" | ||
|
|
||
|
|
@@ -14,28 +18,35 @@ import ( | |
| ) | ||
|
|
||
| const ( | ||
| port = nat.Port("9042/tcp") | ||
| port = nat.Port("9042/tcp") | ||
| securePort = nat.Port("9142/tcp") // Common port for SSL/TLS connections | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. question: do we need to two ports or can it just be one which is either SSL or not? |
||
| ) | ||
|
|
||
| // CassandraContainer represents the Cassandra container type used in the module | ||
| type CassandraContainer struct { | ||
| testcontainers.Container | ||
| settings Options | ||
| } | ||
|
|
||
| // ConnectionHost returns the host and port of the cassandra container, using the default, native 9000 port, and | ||
| // ConnectionHost returns the host and port of the cassandra container, using the default, native port, | ||
| // obtaining the host and exposed port from the container | ||
| func (c *CassandraContainer) ConnectionHost(ctx context.Context) (string, error) { | ||
| host, err := c.Host(ctx) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| port, err := c.MappedPort(ctx, port) | ||
| // Use the secure port if TLS is enabled | ||
| portToUse := port | ||
| if c.settings.IsTLSEnabled { | ||
| portToUse = securePort | ||
| } | ||
|
|
||
| mappedPort, err := c.MappedPort(ctx, portToUse) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| return host + ":" + port.Port(), nil | ||
| return host + ":" + mappedPort.Port(), nil | ||
| } | ||
|
|
||
| // WithConfigFile sets the YAML config file to be used for the cassandra container | ||
|
|
@@ -49,7 +60,6 @@ func WithConfigFile(configFile string) testcontainers.CustomizeRequestOption { | |
| FileMode: 0o755, | ||
| } | ||
| req.Files = append(req.Files, cf) | ||
|
|
||
| return nil | ||
| } | ||
| } | ||
|
|
@@ -66,10 +76,8 @@ func WithInitScripts(scripts ...string) testcontainers.CustomizeRequestOption { | |
| FileMode: 0o755, | ||
| } | ||
| initScripts = append(initScripts, cf) | ||
|
|
||
| execs = append(execs, initScript{File: cf.ContainerFilePath}) | ||
| } | ||
|
|
||
| req.Files = append(req.Files, initScripts...) | ||
| return testcontainers.WithAfterReadyCommand(execs...)(req) | ||
| } | ||
|
|
@@ -81,11 +89,62 @@ func RunContainer(ctx context.Context, opts ...testcontainers.ContainerCustomize | |
| return Run(ctx, "cassandra:4.1.3", opts...) | ||
| } | ||
|
|
||
| // setupTLS configures TLS settings for the Cassandra container. | ||
| func setupTLS(settings *Options) ([]string, []wait.Strategy, []testcontainers.ContainerCustomizer, error) { | ||
| exposePort := []string{string(port)} | ||
| waitStrategies := []wait.Strategy{ | ||
| wait.ForListeningPort(port), | ||
| wait.ForExec([]string{"cqlsh", "-e", "SELECT bootstrapped FROM system.local"}).WithResponseMatcher(func(body io.Reader) bool { | ||
| data, _ := io.ReadAll(body) | ||
| return strings.Contains(string(data), "COMPLETED") | ||
| }).WithStartupTimeout(1 * time.Minute), | ||
| } | ||
| var tcOpts []testcontainers.ContainerCustomizer | ||
|
|
||
| if settings.IsTLSEnabled { | ||
| exposePort = append(exposePort, string(securePort)) | ||
| waitStrategies = append(waitStrategies, wait.ForListeningPort(securePort).WithStartupTimeout(1*time.Minute)) | ||
|
|
||
| keystorePath, certPath, err := GenerateJKSKeystore() | ||
| if err != nil { | ||
| return nil, nil, nil, fmt.Errorf("create SSL certs: %w", err) | ||
| } | ||
|
|
||
| tcOpts = append(tcOpts, testcontainers.WithFiles( | ||
| testcontainers.ContainerFile{ | ||
| HostFilePath: keystorePath, | ||
| ContainerFilePath: "/etc/cassandra/conf/keystore.jks", | ||
| FileMode: 0o644, | ||
| }, | ||
| testcontainers.ContainerFile{ | ||
| HostFilePath: certPath, | ||
| ContainerFilePath: "/etc/cassandra/conf/cassandra.crt", | ||
| FileMode: 0o644, | ||
| })) | ||
|
|
||
| certPEM, err := os.ReadFile(certPath) | ||
| if err != nil { | ||
| return nil, nil, nil, fmt.Errorf("error while read certificate: %w", err) | ||
| } | ||
|
|
||
| certPool := x509.NewCertPool() | ||
| certPool.AppendCertsFromPEM(certPEM) | ||
|
|
||
| settings.TLSConfig = &tls.Config{ | ||
| RootCAs: certPool, | ||
| InsecureSkipVerify: true, | ||
| ServerName: "localhost", | ||
| MinVersion: tls.VersionTLS12, | ||
| } | ||
| } | ||
|
|
||
| return exposePort, waitStrategies, tcOpts, nil | ||
| } | ||
|
|
||
| // Run creates an instance of the Cassandra container type | ||
| func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*CassandraContainer, error) { | ||
| req := testcontainers.ContainerRequest{ | ||
| Image: img, | ||
| ExposedPorts: []string{string(port)}, | ||
| Image: img, | ||
| Env: map[string]string{ | ||
| "CASSANDRA_SNITCH": "GossipingPropertyFileSnitch", | ||
| "JVM_OPTS": "-Dcassandra.skip_wait_for_gossip_to_settle=0 -Dcassandra.initial_token=0", | ||
|
|
@@ -94,21 +153,35 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom | |
| "CASSANDRA_ENDPOINT_SNITCH": "GossipingPropertyFileSnitch", | ||
| "CASSANDRA_DC": "datacenter1", | ||
| }, | ||
| WaitingFor: wait.ForAll( | ||
| wait.ForListeningPort(port), | ||
| wait.ForExec([]string{"cqlsh", "-e", "SELECT bootstrapped FROM system.local"}).WithResponseMatcher(func(body io.Reader) bool { | ||
| data, _ := io.ReadAll(body) | ||
| return strings.Contains(string(data), "COMPLETED") | ||
| }), | ||
| ), | ||
| } | ||
|
|
||
| genericContainerReq := testcontainers.GenericContainerRequest{ | ||
| ContainerRequest: req, | ||
| Started: true, | ||
| } | ||
|
|
||
| var settings Options | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. bug: settings is never set, you still need to check if you have an Option in the for loop and process it to ensure it set correctly. If your tests are passing they shouldn't so might need a fix there too. |
||
| for _, opt := range opts { | ||
| if opt, ok := opt.(Option); ok { | ||
| if err := opt(&settings); err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| exposePort, waitStrategies, tcOpts, err := setupTLS(&settings) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| tcOpts = append(tcOpts, testcontainers.WithExposedPorts(exposePort...)) | ||
| tcOpts = append(tcOpts, testcontainers.WithWaitStrategy(waitStrategies...)) | ||
|
|
||
| // Append the customizers passed to the Run function. | ||
| tcOpts = append(tcOpts, opts...) | ||
|
|
||
| // Apply the testcontainers customizers. | ||
| for _, opt := range tcOpts { | ||
|
stevenh marked this conversation as resolved.
Outdated
|
||
| if err := opt.Customize(&genericContainerReq); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
@@ -117,7 +190,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom | |
| container, err := testcontainers.GenericContainer(ctx, genericContainerReq) | ||
| var c *CassandraContainer | ||
| if container != nil { | ||
| c = &CassandraContainer{Container: container} | ||
| c = &CassandraContainer{Container: container, settings: settings} | ||
| } | ||
|
|
||
| if err != nil { | ||
|
|
@@ -126,3 +199,8 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom | |
|
|
||
| return c, nil | ||
| } | ||
|
|
||
| // TLSConfig returns the TLS configuration for the Redis container, nil if TLS is not enabled. | ||
| func (c *CassandraContainer) TLSConfig() *tls.Config { | ||
| return c.settings.TLSConfig | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.