refactor(cockroachdb): to use request driven options #2883

stevenh · 2024-11-08T01:55:30Z

Refactor cockroachdb module to to use request driven options simplifying the flow.

Clean up tests eliminating the use of suite which significantly speeds up test runs.

netlify · 2024-11-08T01:55:48Z

✅ Deploy Preview for testcontainers-go ready!

Name	Link
🔨 Latest commit	`51f572d`
🔍 Latest deploy log	https://app.netlify.com/sites/testcontainers-go/deploys/674d9817dac141000812e5f8
😎 Deploy Preview	https://deploy-preview-2883--testcontainers-go.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

modules/cockroachdb/options.go

stevenh · 2024-11-08T23:22:00Z

This should be split out into components if we want to go down this route.

mdelapenya

I did an initial pass and the overall feedback is positive. I detected the following possible chunks of separate PRs, please tell me what you think:

wait.walk for traversing multi strategies
wait for TLS
cockroachdb refactor

I think it would be much clearer for the review, but also for the release notes, as consumers would discover the new wait strategies as part of it.

modules/cockroachdb/data/cluster_defaults.sql

modules/cockroachdb/options.go

wait/tls.go

wait/tls_test.go

wait/walk_test.go

wait/walk.go

wait/walk_test.go

stevenh · 2024-11-22T17:50:15Z

I did an initial pass and the overall feedback is positive. I detected the following possible chunks of separate PRs, please tell me what you think:

wait.walk for traversing multi strategies

wait for TLS

cockroachdb refactor

I think it would be much clearer for the review, but also for the release notes, as consumers would discover the new wait strategies as part of it.

That's pretty much my thought's too, which is why I've left in draft.

mdelapenya

LGTM, thanks! Just a few comments, minor ones.

modules/cockroachdb/cockroachdb.go

modules/cockroachdb/data/cluster_defaults.sql

stevenh · 2024-12-02T11:20:15Z

@mdelapenya I've added clarification to the Run method about what version is supported. I tested all the way back to v22.2.0, which was the first version which introduced the init_success file creation once the cluster init has completed.

…list of statements

Co-authored-by: Steven Hartland <[email protected]>

… in defaultOptions

Co-authored-by: Manuel de la Peña <[email protected]>

… to DefaultStatements

Simplify the connection handling in cockroachdb so that ConnectionString can be used without the user doing extra work to handle TLS if enabled. Deprecate TLSConfig which is no longer needed separately. BREAKING_CHANGE: This now returns a registered connection string so is no longer compatible with pgx.ParseConfig, use ConnectionConfig for this use case instead.

Refactor cockroachdb module to to use request driven options, simplifying the flow.

Various fixes and remove the ability to configure certs using the default generated ones instead.

Add the missing data file and remove unused constants.

Extract TLS certificate wait strategy into a dedicated wait type so it can be reused. Implement walk method which can be used to identify wait strategies in a request chain. Use embed to simplify wait test loading of certs.

Remove the now unused customizer.

Fix lint style issue for blank line.

Clarified the impact of run defaults.

mdelapenya

LGTM, thanks!

* main: fix: container binds syntax (testcontainers#2899) refactor(cockroachdb): to use request driven options (testcontainers#2883) chore(deps): bump actions/setup-go from 5.0.0 to 5.1.0 (testcontainers#2904) chore(deps): bump ossf/scorecard-action from 2.3.1 to 2.4.0 (testcontainers#2903) chore(deps): bump test-summary/action from 2.3 to 2.4 (testcontainers#2902) feat(wait): strategy walk (testcontainers#2895) feat(wait): tls strategy (testcontainers#2896)

* main: (234 commits) chore(ci): add Github labels based on PR title (testcontainers#2914) chore(gha): Use official setup-docker-action (testcontainers#2913) chore(ci): enforce conventional commits syntax in PR titles (testcontainers#2911) feat(nats): WithConfigFile - pass a configuration file to nats server (testcontainers#2905) chore: enable implicit default logger only in testing with -v (testcontainers#2877) fix: container binds syntax (testcontainers#2899) refactor(cockroachdb): to use request driven options (testcontainers#2883) chore(deps): bump actions/setup-go from 5.0.0 to 5.1.0 (testcontainers#2904) chore(deps): bump ossf/scorecard-action from 2.3.1 to 2.4.0 (testcontainers#2903) chore(deps): bump test-summary/action from 2.3 to 2.4 (testcontainers#2902) feat(wait): strategy walk (testcontainers#2895) feat(wait): tls strategy (testcontainers#2896) docs: better contribution guidelines (testcontainers#2893) fix(influxdb): Respect custom waitStrategy (testcontainers#2845) fix: only upload to sonar on ubuntu-latest (testcontainers#2891) fix: build artifact name properly (testcontainers#2890) fix: do not run sonar upload when ryuk is disabled (testcontainers#2889) fix: update GH actions for uploading/downloading artifacts (testcontainers#2888) feat(ci): Enable master moby with rootless (testcontainers#2880) fix(redpanda): temporary file use ...

* main: feat(gcloud)!: add support to seed data when using RunBigQueryContainer (testcontainers#2523) security(deps): bump golang.org/x/crypto from 0.28.0 to 0.31.0 (testcontainers#2916) chore(ci): add Github labels based on PR title (testcontainers#2914) chore(gha): Use official setup-docker-action (testcontainers#2913) chore(ci): enforce conventional commits syntax in PR titles (testcontainers#2911) feat(nats): WithConfigFile - pass a configuration file to nats server (testcontainers#2905) chore: enable implicit default logger only in testing with -v (testcontainers#2877) fix: container binds syntax (testcontainers#2899) refactor(cockroachdb): to use request driven options (testcontainers#2883)

stevenh force-pushed the refactor/cockroachdb branch 4 times, most recently from fbfb05c to 6dc9c5c Compare November 8, 2024 02:29

stevenh mentioned this pull request Nov 8, 2024

feat!(cockroachdb): use recommended cluster settings #2869

Closed

mdelapenya reviewed Nov 8, 2024

View reviewed changes

modules/cockroachdb/options.go Show resolved Hide resolved

stevenh mentioned this pull request Nov 22, 2024

fix(kafka): Fix internal docker connection #2894

Open

stevenh marked this pull request as ready for review November 22, 2024 15:54

stevenh requested a review from a team as a code owner November 22, 2024 15:54

stevenh marked this pull request as draft November 22, 2024 15:54

mdelapenya reviewed Nov 22, 2024

View reviewed changes

stevenh force-pushed the refactor/cockroachdb branch from 158644d to 83a7838 Compare November 22, 2024 18:39

stevenh mentioned this pull request Nov 26, 2024

feat(wait): tls strategy #2896

Merged

stevenh force-pushed the refactor/cockroachdb branch 2 times, most recently from df5766a to 81290cb Compare November 27, 2024 14:54

stevenh marked this pull request as ready for review November 27, 2024 17:07

stevenh requested a review from mdelapenya November 28, 2024 23:19

mdelapenya previously approved these changes Dec 2, 2024

View reviewed changes

modules/cockroachdb/cockroachdb.go Show resolved Hide resolved

modules/cockroachdb/data/cluster_defaults.sql Show resolved Hide resolved

stevenh dismissed mdelapenya’s stale review via 0a185ed December 2, 2024 11:18

martskins and others added 7 commits December 2, 2024 11:20

feat: use recommended cluster settings for cockroachdb

6f82f93

fix: wrap errors

3e60856

feat: add WithStatements option and expose recommended settings as a …

9944ec2

…list of statements

Update modules/cockroachdb/options.go

276378c

Co-authored-by: Steven Hartland <[email protected]>

Update modules/cockroachdb/cockroachdb.go

8dda144

Co-authored-by: Steven Hartland <[email protected]>

fix: return close error on defer

400956f

chore: improvement documentation and set default value for statements…

19bc4c3

… in defaultOptions

martskins and others added 15 commits December 2, 2024 11:20

Update modules/cockroachdb/cockroachdb.go

24d6d77

Co-authored-by: Manuel de la Peña <[email protected]>

chore: remove unnecessary nolint directive and rename ClusterDefaults…

3919015

… to DefaultStatements

fix: only use recommended settings in root user tests

6454cd4

refactor(cockroachdb): to use request driven options

7d0ed1c

Refactor cockroachdb module to to use request driven options, simplifying the flow.

fix: various fixes and remove certs

93f4179

Various fixes and remove the ability to configure certs using the default generated ones instead.

fix: add missing data files

dc577f0

Add the missing data file and remove unused constants.

chore: add reference to ErrTLSNotEnabled

fff6d3b

fix: lint failure for missing test helper

9dd49ae

feat: tls strategy and strategy walk

aefc89f

Extract TLS certificate wait strategy into a dedicated wait type so it can be reused. Implement walk method which can be used to identify wait strategies in a request chain. Use embed to simplify wait test loading of certs.

chore(cockroachdb): remove customizer

2fccdd1

Remove the now unused customizer.

fix: check setOptions error return

2259626

fix: lint style

6f70e78

Fix lint style issue for blank line.

chore: various clean ups

895f486

docs(cockroachdb): clarified run defaults

51f572d

Clarified the impact of run defaults.

stevenh force-pushed the refactor/cockroachdb branch from 0a185ed to 51f572d Compare December 2, 2024 11:20

mdelapenya approved these changes Dec 2, 2024

View reviewed changes

mdelapenya self-assigned this Dec 2, 2024

mdelapenya added the chore Changes that do not impact the existing functionality label Dec 2, 2024

mdelapenya merged commit c28f0f8 into main Dec 2, 2024
122 checks passed

mdelapenya deleted the refactor/cockroachdb branch December 2, 2024 13:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(cockroachdb): to use request driven options #2883

refactor(cockroachdb): to use request driven options #2883

stevenh commented Nov 8, 2024

netlify bot commented Nov 8, 2024 •

edited

Loading

stevenh commented Nov 8, 2024

mdelapenya left a comment

stevenh commented Nov 22, 2024

mdelapenya left a comment

stevenh commented Dec 2, 2024

mdelapenya left a comment

refactor(cockroachdb): to use request driven options #2883

refactor(cockroachdb): to use request driven options #2883

Conversation

stevenh commented Nov 8, 2024

netlify bot commented Nov 8, 2024 • edited Loading

✅ Deploy Preview for testcontainers-go ready!

stevenh commented Nov 8, 2024

mdelapenya left a comment

Choose a reason for hiding this comment

stevenh commented Nov 22, 2024

mdelapenya left a comment

Choose a reason for hiding this comment

stevenh commented Dec 2, 2024

mdelapenya left a comment

Choose a reason for hiding this comment

netlify bot commented Nov 8, 2024 •

edited

Loading