Skip to content

Fixed yaml model (insecureSkipTlsVerify) #177

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

Merged
merged 1 commit into from
Dec 1, 2022

Conversation

wprzytula
Copy link

Field insecureSkipTlsVerify was incorrectly put in AuthInfo instead of Datacenter.

@wprzytula
Copy link
Author

@avelanarius

Comment on lines 1410 to 1413
.withSSL(
(config.getCurrentAuthInfo().isInsecureSkipTlsVerify()
(config.getCurrentDatacenter().isInsecureSkipTlsVerify()
? config.createBundle().getInsecureSSLOptions()
: config.createBundle().getSSLOptions()))

Choose a reason for hiding this comment

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

A potential problem I see (and I didn't expect at the beginning): Previously, there was only a single insecureSkipTlsVerify, so we could set it here with withSSL on a session. But now, you could have different configurations of insecureSkipTlsVerify per each datacenter - but here currentDatacenter determines the configuration for all SSL connections.

@avelanarius
Copy link

avelanarius commented Nov 30, 2022

@wprzytula Could you rebase on top of latest scylla-3.x?

I think that we will merge the current version (since Python version with the same problem was already merged and CCM was changed) and just put an issue to fix this in the future - the first iteration of serverless is a single-DC serverless.

@wprzytula wprzytula force-pushed the cloud_yaml_model_fix branch from a62e7ef to 16c655c Compare November 30, 2022 14:23
@avelanarius
Copy link

avelanarius commented Nov 30, 2022

@wprzytula Sorry to ask again for rebasing - the test failed due to unrelated reasons to this PR. The scylla-3.x now contains the fix that should fix it (just committed it: b49aa5d).

@wprzytula wprzytula force-pushed the cloud_yaml_model_fix branch from 16c655c to d6a1726 Compare November 30, 2022 15:23
Field insecureSkipTlsVerify was incorrectly put in AuthInfo instead of
Datacenter.
@avelanarius avelanarius merged commit 22e3ad5 into scylladb:scylla-3.x Dec 1, 2022
@avelanarius
Copy link

@wprzytula Merged the commit. The commit message should be more descriptive of the change (not generic "fixed yaml model"). I fixed it myself - 22e3ad5

avelanarius added a commit to avelanarius/scylla-tools-java that referenced this pull request Dec 2, 2022
Update the version of Java Driver from 3.11.2.1 to 3.11.2.4. The 
differences between the versions are fixes to serverless support:
1. Driver connecting to address in "Server" field of the bundle instead 
   of "NodeDomain" (scylladb/java-driver#173)
2. Moving parsing of "insecureSkipTlsVerify" from "AuthInfo" field
   in serverless bundle file to "Datacenter" fields 
   (scylladb/java-driver#177)

Without this change, cassandra-stress could not connect correctly to
a local serverless cluster created with Scylla Operator or CCM (see
scylladb/java-driver#164).
nyh pushed a commit to scylladb/scylla-tools-java that referenced this pull request Dec 5, 2022
Update the version of Java Driver from 3.11.2.1 to 3.11.2.4. The
differences between the versions are fixes to serverless support:
1. Driver connecting to address in "Server" field of the bundle instead
   of "NodeDomain" (scylladb/java-driver#173)
2. Moving parsing of "insecureSkipTlsVerify" from "AuthInfo" field
   in serverless bundle file to "Datacenter" fields
   (scylladb/java-driver#177)

Without this change, cassandra-stress could not connect correctly to
a local serverless cluster created with Scylla Operator or CCM (see
scylladb/java-driver#164).

Closes #321
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants