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

Jump to bottom

democluster: ensure sslrootcert is populated #82358

Merged
merged 1 commit into from
Jun 6, 2022
Merged

democluster: ensure sslrootcert is populated #82358

merged 1 commit into from
Jun 6, 2022

Conversation

knz
Copy link
Contributor

@knz knz commented Jun 2, 2022

The pgx driver defaults the root CA cert to ~/.postgresql/root.crt
if not provided in the connection URL. For demo clusters, that can
never work.

This commit changes the generated demo URLs to include sslrootcert
explicitly and point it to the demo-generate root CA cert.

Release note: None

@knz knz requested a review from rafiss June 2, 2022 16:49
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@knz
Copy link
Contributor Author

knz commented Jun 2, 2022

also needs a test before it's ready to merge.

rafiss
rafiss approved these changes Jun 3, 2022
View reviewed changes
Copy link
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

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

i think the test could be in one of the test_demo*.tcl tests. it can make sure the sslrootcert appears in the URL during the demo initialization message

@knz knz force-pushed the 20220602-demo-pgx branch from f989f69 to 2eddb52 Compare June 6, 2022 16:15
@knz
democluster: ensure sslrootcert is populated
2eddb52 
The `pgx` driver defaults the root CA cert to ~/.postgresql/root.crt
if not provided in the connection URL. For demo clusters, that can
never work.

This commit changes the generated demo URLs to include `sslrootcert`
explicitly and point it to the demo-generate root CA cert.

Release note: None
knz
knz commented Jun 6, 2022
View reviewed changes
Copy link
Contributor Author

@knz knz left a comment

Choose a reason for hiding this comment

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

Cool, done.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained

@knz knz marked this pull request as ready for review June 6, 2022 16:15
@knz knz requested a review from a team as a code owner June 6, 2022 16:15
@knz
Copy link
Contributor Author

knz commented Jun 6, 2022

TFYR

bors r=rafiss

@craig
Copy link
Contributor

craig bot commented Jun 6, 2022

Build succeeded:

@craig craig bot merged commit 443f1dc into cockroachdb:master Jun 6, 2022
@knz knz deleted the 20220602-demo-pgx branch June 7, 2022 10:03
@florence-crl florence-crl mentioned this pull request Jul 22, 2022
Open
@rafiss rafiss mentioned this pull request Jul 26, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rafiss rafiss rafiss approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@knz @cockroach-teamcity @rafiss