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.

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

Jump to bottom

Fix Bug with Install demo configuration running in cluster mode with -y #3935

Merged
merged 10 commits into from
Jan 10, 2024
Merged

Fix Bug with Install demo configuration running in cluster mode with -y #3935

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1b5ae65
Improve messaging so that users know how to set their initial admin p…
derek-ho Dec 20, 2023
fc2932c
Modify test for new statement
derek-ho Dec 20, 2023
91918a3
Spotless apply
derek-ho Jan 2, 2024
163bf49
Use the variable name from the constants
derek-ho Jan 2, 2024
0afaa5d
Remove else block
derek-ho Jan 10, 2024
61ae9f5
Merge branch 'main' of github.com:opensearch-project/security into fi…
derek-ho Jan 10, 2024
4372cb9
Update test
derek-ho Jan 10, 2024
447740d
Adds tests to verify -c and -i behvarior when only -y is passed
derek-ho Jan 10, 2024
60769b3
Apply code suggestion
derek-ho Jan 10, 2024
3b5d54e
Change variable name
derek-ho Jan 10, 2024
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
3 changes: 0 additions & 3 deletions src/main/java/org/opensearch/security/tools/democonfig/Installer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,6 @@ void gatherUserInputs() {
cluster_mode = confirmAction(scanner, "Enable cluster mode?");
}
}
} else {
initsecurity = true;
cluster_mode = true;
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/opensearch/security/tools/democonfig/InstallerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ public void testGatherInputs_withAssumeYes() {

installer.gatherUserInputs();

assertThat(installer.initsecurity, is(true));
assertThat(installer.cluster_mode, is(true));
assertThat(installer.initsecurity, is(false));
assertThat(installer.cluster_mode, is(false));
}

@Test
Expand Down
12 changes: 12 additions & 0 deletions src/test/java/org/opensearch/security/tools/democonfig/SecuritySettingsConfigurerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,18 @@ public void testIsStringAlreadyPresentInFile_isPresent() throws IOException {
assertThat(isKeyPresentInYMLFile(installer.OPENSEARCH_CONF_FILE, str2), is(equalTo(false)));
}

@Test
public void testAssumeYesDoesNotInitializeClusterMode() throws IOException {
String str1 = "node.name"; // cluster_mode
derek-ho marked this conversation as resolved.
Show resolved Hide resolved
String str2 = "plugins.security.allow_default_init_securityindex"; // init_security

installer.assumeyes = true;
securitySettingsConfigurer.writeSecurityConfigToOpenSearchYML();

assertThat(isKeyPresentInYMLFile(installer.OPENSEARCH_CONF_FILE, str1), is(equalTo(false)));
assertThat(isKeyPresentInYMLFile(installer.OPENSEARCH_CONF_FILE, str2), is(equalTo(false)));
derek-ho marked this conversation as resolved.
Show resolved Hide resolved
}

@Test
public void testCreateSecurityAdminDemoScriptAndGetSecurityAdminCommands() throws IOException {
String demoPath = installer.OPENSEARCH_CONF_DIR + "securityadmin_demo" + installer.FILE_EXTENSION;
Expand Down
Loading