Setup keystore during integration tests#22966
Merged
Tim-Brooks merged 12 commits intoelastic:masterfrom Mar 20, 2017
Merged
Conversation
Contributor
|
this LGTM in general but I'd like to see a test using it even if it's just for the f*** of it. |
rjernst
approved these changes
Feb 13, 2017
Member
rjernst
left a comment
There was a problem hiding this comment.
This looks good, I left some suggestions on naming.
| } | ||
|
|
||
| /** Adds a task to create keystore */ | ||
| static Task configureCreateKeyStoreTask(String name, Project project, Task setup, NodeInfo node) { |
Member
There was a problem hiding this comment.
Can you make this a no-op when the keystoreSettings are empty?
|
|
||
| Map<String, Object> settings = new HashMap<>() | ||
|
|
||
| Map<String, String> keyStoreSetting = new HashMap<>() |
Member
There was a problem hiding this comment.
plural please? Also, just for consistency with the code in ES, can we use all lower case for keystore, so keystoreSettings?
| } | ||
| } | ||
|
|
||
| /** Adds tasks to add to keystore */ |
Member
There was a problem hiding this comment.
"to add settings to the keystore"
| } | ||
|
|
||
| /** Adds tasks to add to keystore */ | ||
| static Task configureAddKeyStoreTasks(Task parent, Project project, Task setup, NodeInfo node) { |
Member
There was a problem hiding this comment.
Maybe call this configureAddKeystoreSettingTasks
rjernst
reviewed
Feb 13, 2017
| /** Adds a task to create keystore */ | ||
| static Task configureCreateKeyStoreTask(String name, Project project, Task setup, NodeInfo node) { | ||
| File esKeyStoreUtil = Paths.get(node.homeDir.toString(), "bin/" + "elasticsearch-keystore").toFile() | ||
| Task createKeyStore = project.tasks.create(name: name, type: LoggedExec, dependsOn: setup) { |
Member
There was a problem hiding this comment.
One more thing: you should use configureExecTask so this will work correctly on windows.
Contributor
Author
|
Thanks. I had been waiting for CI to be up and to test it again. And it just passed, so I am merging this. |
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Mar 22, 2017
* master: Fix typo in allocation explain API docs Add unit tests for ReverseNestedAggregator (elastic#23651) Revert "Revert "Build: Upgrade min gradle to 3.3 (elastic#23544)"" Revert "Build: Upgrade min gradle to 3.3 (elastic#23544)" Build: Upgrade min gradle to 3.3 (elastic#23544) Fix took assertion in response filter test Search took time should use a relative clock Adds toString() to snapshot operations in progress Docs: fix a typo in transport client's put-mapping.asciidoc (elastic#23607) Use include-tagged macro for high level client docs (elastic#23438) Update fill-column in .dir-locals.el to 100 characters Setup keystore during integration tests (elastic#22966) Fix typo 'Elastisearch' -> 'Elasticsearch' (elastic#23633) Comment and blank line cleanups (elastic#23647) docs: guidelines for students and teachers (elastic#23648) Fix MapperService StackOverflowError (elastic#23605)
rjernst
pushed a commit
that referenced
this pull request
Apr 12, 2017
This commit creates a keystore and adds settings to it during the cluster formation for integration tests. Users can define a `keyStoreSetting` in build files for settings that need to be placed in the keystore.
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
4 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 creates a keystore and adds settings to it during the
cluster formation for integration tests. Users can define a
keyStoreSettingin build files for settings that need to be placed inthe keystore.