Skip to content

Commit 4127a5a

Browse files
committed
Auth methods names fixed
1 parent 384414f commit 4127a5a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/KibanaContainer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,20 +132,20 @@ public KibanaContainer withElasticsearchUrl(String elasticsearchUrl) {
132132
* @param password the password for the kibana_system user
133133
* @return this container instance
134134
*/
135-
public KibanaContainer withElasticsearchKibanaSystemPassword(String password) {
136-
return withElasticsearchCredentials(KIBANA_SYSTEM_USER, password);
135+
public KibanaContainer withKibanaSystemPassword(String password) {
136+
return withKibanaUsernameAndPassword(KIBANA_SYSTEM_USER, password);
137137
}
138138

139139
/**
140-
* Configures Elasticsearch credentials for authentication.
140+
* Configures credentials Kibana will use for authentication.
141141
*
142142
* @param username the Elasticsearch username (cannot be 'elastic')
143143
* @param password the password
144144
* @return this container instance
145145
* @throws IllegalStateException if a service account token is already configured
146146
* @throws IllegalArgumentException if credentials are invalid
147147
*/
148-
public KibanaContainer withElasticsearchCredentials(String username, String password) {
148+
public KibanaContainer withKibanaUsernameAndPassword(String username, String password) {
149149
if (elasticsearchServiceAccountToken != null) {
150150
throw new IllegalStateException(
151151
"Conflicting Elasticsearch credentials: provide either a service account token " +

modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/KibanaContainerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void externalModeFailsWithConflictingCredentials() {
164164
Assertions
165165
.assertThatThrownBy(() -> {
166166
new KibanaContainer("docker.elastic.co/kibana/kibana:8.0.0")
167-
.withElasticsearchCredentials("user", "pass")
167+
.withKibanaUsernameAndPassword("user", "pass")
168168
.withElasticsearchServiceAccountToken("token");
169169
})
170170
.isInstanceOf(IllegalStateException.class)
@@ -216,7 +216,7 @@ void externalModeCanWorkWithUsernamePassword() throws IOException, InterruptedEx
216216
KibanaContainer kibana = new KibanaContainer("docker.elastic.co/kibana/kibana:9.2.2") //this minor version is intentionally below ES version
217217
.withNetwork(network)
218218
.withElasticsearchUrl("http://" + esHostname + ":9200")
219-
.withElasticsearchKibanaSystemPassword(kibanaSystemPassword)
219+
.withKibanaSystemPassword(kibanaSystemPassword)
220220
) {
221221
kibana.start();
222222
String status = getKibanaStatus(kibana);

0 commit comments

Comments
 (0)