Skip to content

Commit 4cec5ba

Browse files
ydubreuiltobio
andauthored
Accept API keys for running acceptance tests (#951)
* Accept API keys for running acceptance tests * Update message --------- Co-authored-by: Toby Brain <tobio85@gmail.com>
1 parent c094597 commit 4cec5ba

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

internal/acctest/acctest.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ func PreCheck(t *testing.T) {
2929
_, kibanaEndpointOk := os.LookupEnv("KIBANA_ENDPOINT")
3030
_, userOk := os.LookupEnv("ELASTICSEARCH_USERNAME")
3131
_, passOk := os.LookupEnv("ELASTICSEARCH_PASSWORD")
32+
_, apiKeyOk := os.LookupEnv("ELASTICSEARCH_API_KEY")
3233
_, kbUserOk := os.LookupEnv("KIBANA_USERNAME")
3334
_, kbPassOk := os.LookupEnv("KIBANA_PASSWORD")
35+
_, kbApiKeyOk := os.LookupEnv("KIBANA_API_KEY")
3436

3537
if !elasticsearchEndpointsOk {
3638
t.Fatal("ELASTICSEARCH_ENDPOINTS must be set for acceptance tests to run")
@@ -40,9 +42,8 @@ func PreCheck(t *testing.T) {
4042
t.Fatal("KIBANA_ENDPOINT must be set for acceptance tests to run")
4143
}
4244

43-
// Technically ES tests can use the API Key, however username/password is required for Kibana tests.
44-
usernamePasswordOk := (userOk && passOk) || (kbUserOk && kbPassOk)
45-
if !usernamePasswordOk {
46-
t.Fatal("ELASTICSEARCH_USERNAME and ELASTICSEARCH_PASSWORD or KIBANA_USERNAME and KIBANA_PASSWORD must be set for acceptance tests to run")
45+
authOk := (userOk && passOk) || (kbUserOk && kbPassOk) || apiKeyOk || kbApiKeyOk
46+
if !authOk {
47+
t.Fatal("ELASTICSEARCH_USERNAME and ELASTICSEARCH_PASSWORD, or KIBANA_USERNAME and KIBANA_PASSWORD, or ELASTICSEARCH_API_KEY, or KIBANA_API_KEY must be set for acceptance tests to run")
4748
}
4849
}

0 commit comments

Comments
 (0)