Skip to content

Remove config prompting for secrets and text #27216

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.

Sign up for GitHub

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 10 commits into from
Nov 20, 2017
Merged

Remove config prompting for secrets and text #27216

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9a65728
Remove terminal prompt
hub-cap Oct 27, 2017
366d61d
Removed unused Terminal param
hub-cap Oct 27, 2017
9dcde16
Merge remote-tracking branch 'upstream/master' into plugins/separate_…
hub-cap Oct 28, 2017
4ff7d88
Merge remote-tracking branch 'upstream/master' into plugins/separate_…
hub-cap Nov 1, 2017
d7ccdba
Add 8.0 check
hub-cap Nov 2, 2017
8d6452a
Fix the assert
hub-cap Nov 2, 2017
b0a35c9
Merge remote-tracking branch 'upstream/master' into plugins/separate_…
hub-cap Nov 2, 2017
56ff056
Merge remote-tracking branch 'upstream/master' into plugins/separate_…
hub-cap Nov 6, 2017
0baf6da
Clean up unused bits
hub-cap Nov 20, 2017
b8e072b
Merge remote-tracking branch 'upstream/master' into plugins/separate_…
hub-cap Nov 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions core/src/main/java/org/elasticsearch/node/InternalSettingsPreparer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.Map;
import java.util.function.Function;

import org.elasticsearch.Version;
import org.elasticsearch.cli.Terminal;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.common.Strings;
Expand Down Expand Up @@ -123,8 +124,13 @@ static void initializeSettings(final Settings.Builder output, final Settings inp

/**
* Checks all settings values to make sure they do not have the old prompt settings. These were deprecated in 6.0.0.
* This check should be removed in 8.0.0.
*/
private static void checkSettingsForTerminalDeprecation(final Settings.Builder output) throws SettingsException {
// This method to be removed in 8.0.0, as it was deprecated in 6.0 and removed in 7.0
if (Version.CURRENT.toString().startsWith("8")) {
Copy link
Member

Choose a reason for hiding this comment

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

How about Version.CURRENT.major == 8? And I think maybe we should only make this an assertion?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thx, i wasnt aware exactly how to do it

throw new SettingsException("Logic pertaining to config driven prompting should be removed in 8.0.0.");
}
for (String setting : output.keys()) {
Copy link
Member

Choose a reason for hiding this comment

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

Let's add an assertion here the major property of the current version is not 8; then, when we bump the version to 8.0.0 on master we know that we can remove this code.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

dude, nice. Thats smart. Will do.

switch (output.get(setting)) {
case SECRET_PROMPT_VALUE:
Expand Down