Use Terminal.readSecret in add string keystore command #126966
Merged
Conversation
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
As a followon to elastic#126729, the add string keystore command doesn't need to use a reader at all (and it was incorrect for it to close the reader from the terminal). Instead, the Terminal abstraction already handles how to get at line by line secrets. This commit removes that usage of reader and uses readSecret calls instead. closes elastic#126882
rjernst
added
>refactoring
:Core/Infra/CLI
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
prdoyle
approved these changes
Apr 17, 2025
Comment on lines
54
to
57
| String prompt = ""; | ||
| if (options.has(stdinOption) == false) { | ||
| prompt = "Enter value for " + s + ": "; | ||
| } |
There was a problem hiding this comment.
This style of supplying a default that is sometimes overridden later defeats Java's error detection for paths where the value is not set.
Suggested change
| String prompt = ""; | |
| if (options.has(stdinOption) == false) { | |
| prompt = "Enter value for " + s + ": "; | |
| } | |
| String prompt; | |
| if (options.has(stdinOption)) { | |
| prompt = ""; | |
| } else { | |
| prompt = "Enter value for " + s + ": "; | |
| } |
There was a problem hiding this comment.
I applied your suggestion.
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Apr 18, 2025
As a followon to elastic#126729, the add string keystore command doesn't need to use a reader at all (and it was incorrect for it to close the reader from the terminal). Instead, the Terminal abstraction already handles how to get at line by line secrets. This commit removes that usage of reader and uses readSecret calls instead. closes elastic#126882
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Apr 18, 2025
As a followon to elastic#126729, the add string keystore command doesn't need to use a reader at all (and it was incorrect for it to close the reader from the terminal). Instead, the Terminal abstraction already handles how to get at line by line secrets. This commit removes that usage of reader and uses readSecret calls instead. closes elastic#126882
This was referenced Apr 18, 2025
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Apr 18, 2025
As a followon to elastic#126729, the add string keystore command doesn't need to use a reader at all (and it was incorrect for it to close the reader from the terminal). Instead, the Terminal abstraction already handles how to get at line by line secrets. This commit removes that usage of reader and uses readSecret calls instead. closes elastic#126882
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 18, 2025
…7069) As a followon to #126729, the add string keystore command doesn't need to use a reader at all (and it was incorrect for it to close the reader from the terminal). Instead, the Terminal abstraction already handles how to get at line by line secrets. This commit removes that usage of reader and uses readSecret calls instead. closes #126882
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 18, 2025
…7070) As a followon to #126729, the add string keystore command doesn't need to use a reader at all (and it was incorrect for it to close the reader from the terminal). Instead, the Terminal abstraction already handles how to get at line by line secrets. This commit removes that usage of reader and uses readSecret calls instead. closes #126882
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 18, 2025
…7068) As a followon to #126729, the add string keystore command doesn't need to use a reader at all (and it was incorrect for it to close the reader from the terminal). Instead, the Terminal abstraction already handles how to get at line by line secrets. This commit removes that usage of reader and uses readSecret calls instead. closes #126882
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
As a followon to #126729, the add string keystore command doesn't need to use a reader at all (and it was incorrect for it to close the reader from the terminal). Instead, the Terminal abstraction already handles how to get at line by line secrets. This commit removes that usage of reader and uses readSecret calls instead.
closes #126882