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.

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

SOLR-16635: Resolve crypto keys file path in MiniSolrCloudCluster #1312

Merged
merged 4 commits into from Jan 30, 2023

Conversation

tflobbe
Copy link
Member

@tflobbe tflobbe commented Jan 24, 2023

By resolving the full path of the pre-generated crypto keys in MiniSolrCloudCluster we make sure it also works for third party projects testing using Solr test framework

@tflobbe tflobbe requested a review from madrob January 24, 2023 23:57
Copy link
Contributor

@anshumg anshumg left a comment

Choose a reason for hiding this comment

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

Left a minor note, but overall LGTM.

@@ -89,6 +90,10 @@
public class MiniSolrCloudCluster {

private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final URL PRE_GENERATED_PRIVATE_K_URL =
Copy link
Contributor

Choose a reason for hiding this comment

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

nit-pick, but can we use KEY instead of K i.e. PRE_GENERATED_PRIVATE_KEY_URL

@@ -89,6 +90,10 @@
public class MiniSolrCloudCluster {

private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final URL PRE_GENERATED_PRIVATE_K_URL =
MiniSolrCloudCluster.class.getClassLoader().getResource("cryptokeys/priv_key512_pkcs8.pem");
private static final URL PRE_GENERATED_PUBLIC_K_URL =
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here

@tflobbe
Copy link
Member Author

tflobbe commented Jan 30, 2023

The failures I see in the test action are not reproducing and are common in Jenkins emails, so I assume they are unrelated to this change

@tflobbe tflobbe merged commit be5ad01 into apache:main Jan 30, 2023
@tflobbe tflobbe deleted the mini-cluster-keys branch January 30, 2023 23:16
tflobbe added a commit that referenced this pull request Jan 30, 2023
)

This eliminates the need to set the system properties `pkiHandlerPublicKeyPath` and `pkiHandlerPrivateKeyPath` before starting MiniSolrCloudCluster when using the Solr test framework.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants