Build: introduce keystoreFile for cluster config#29491
Merged
jaymode merged 2 commits intoelastic:masterfrom Apr 12, 2018
Merged
Build: introduce keystoreFile for cluster config#29491jaymode merged 2 commits intoelastic:masterfrom
jaymode merged 2 commits intoelastic:masterfrom
Conversation
This commit introduces built in support for adding files to the keystore when configuring the integration test cluster for a project. In order to use this support, simply add `keystoreFile` followed by the secure setting name and the path to the source file inside the integTestCluster closure for a project. The built in support will handle the creation of the keystore and the addition of the file to the keystore.
Collaborator
|
Pinging @elastic/es-core-infra |
rjernst
approved these changes
Apr 12, 2018
| String srcFileName = entry.getValue() | ||
| Task t = configureExecTask(name, project, parentTask, node, esKeystoreUtil, 'add-file', key, srcFileName) | ||
| t.doFirst { | ||
| File srcFile = project.file(entry.getValue()) |
Member
There was a problem hiding this comment.
Use srcFileName here. Groovy has weird behavior with closures inside loops.
Member
Author
There was a problem hiding this comment.
Good catch. That was the whole point of creating srcFileName variable, just forgot to actually use it there
jaymode
added a commit
that referenced
this pull request
Apr 12, 2018
This commit introduces built in support for adding files to the keystore when configuring the integration test cluster for a project. In order to use this support, simply add `keystoreFile` followed by the secure setting name and the path to the source file inside the integTestCluster closure for a project. The built in support will handle the creation of the keystore and the addition of the file to the keystore.
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Apr 12, 2018
* master: Fix NPE in InternalGeoCentroidTests#testReduceRandom (elastic#29481) Build: introduce keystoreFile for cluster config (elastic#29491) test: Index more docs, so that it is less likely the search request does not time out.
martijnvg
added a commit
that referenced
this pull request
Apr 13, 2018
* es/master: Add remote cluster client (#29495) Ensure flush happens on shard idle Adds SpanGapQueryBuilder in the query DSL (#28636) Control max size and count of warning headers (#28427) Make index APIs work without types. (#29479) Deprecate filtering on `_type`. (#29468) Fix auto-generated ID example format (#29461) Fix typo in max number of threads check docs (#29469) Add primary term to translog header (#29227) Add a helper method to get a random java.util.TimeZone (#29487) Move TimeValue into elasticsearch-core project (#29486) Fix NPE in InternalGeoCentroidTests#testReduceRandom (#29481) Build: introduce keystoreFile for cluster config (#29491) test: Index more docs, so that it is less likely the search request does not time out.
martijnvg
added a commit
that referenced
this pull request
Apr 13, 2018
* es/6.x: Enable skipping fetching latest for BWC builds (#29497) Add remote cluster client (#29495) Ensure flush happens on shard idle Adds SpanGapQueryBuilder in the query DSL (#28636) Fix auto-generated ID example format (#29461) Fix typo in max number of threads check docs (#29469) Add primary term to translog header (#29227) Add a helper method to get a random java.util.TimeZone (#29487) Move TimeValue into elasticsearch-core project (#29486) Fix NPE in InternalGeoCentroidTests#testReduceRandom (#29481) Build: introduce keystoreFile for cluster config (#29491) test: Index more docs, so that it is less likely the search request does not time out.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit introduces built in support for adding files to the
keystore when configuring the integration test cluster for a project.
In order to use this support, simply add
keystoreFilefollowed by thesecure setting name and the path to the source file inside the
integTestCluster closure for a project. The built in support will
handle the creation of the keystore and the addition of the file to the
keystore.