Skip to content

Fix SetupPasswordToolIT #77413

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
jkakavas merged 3 commits into from
Sep 8, 2021
Merged

Fix SetupPasswordToolIT #77413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b601a9
Fix SetupPasswordToolIT
jkakavas Sep 8, 2021
0b35bde
wrong settings are wrong
jkakavas Sep 8, 2021
9442c3a
fix invocation(?)
jkakavas Sep 8, 2021
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
2 changes: 1 addition & 1 deletion x-pack/plugin/security/src/main/bin/elasticsearch-reset-elastic-password.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ setlocal enableextensions
set ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.esnative.tool.ResetBuiltinPasswordTool
set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
set ES_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/security-cli
call "%~dp0elasticsearch-cli.bat --elastic" ^
call "%~dp0elasticsearch-cli.bat" "--elastic" ^
%%* ^
|| goto exit

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/security/src/main/bin/elasticsearch-reset-kibana-system-password.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ setlocal enableextensions
set ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.esnative.tool.ResetBuiltinPasswordTool
set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
set ES_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/security-cli
call "%~dp0elasticsearch-cli.bat --kibana_system" ^
call "%~dp0elasticsearch-cli.bat" "--kibana_system" ^
%%* ^
|| goto exit

Expand Down
2 changes: 2 additions & 0 deletions x-pack/qa/security-setup-password-tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ testClusters.matching { it.name == "integTest" }.configureEach {
testDistribution = 'DEFAULT'
setting 'xpack.security.enabled', 'true'
setting 'xpack.license.self_generated.type', 'trial'
// Setup passwords doesn't work when there is a password auto-configured on first start
setting 'xpack.security.autoconfiguration.enabled', 'false'

user username: "test_admin", password: "x-pack-test-password"
}
1 change: 0 additions & 1 deletion ...c/test/java/org/elasticsearch/xpack/security/authc/esnative/tool/SetupPasswordToolIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

public class SetupPasswordToolIT extends AbstractPasswordToolTestCase {

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/77408")
public void testSetupPasswordToolAutoSetup() throws Exception {

MockTerminal mockTerminal = new MockTerminal();
Expand Down