From b224e0336a3caf307d670eb86c83b898a3ff88c2 Mon Sep 17 00:00:00 2001 From: Yoann Dubreuil Date: Thu, 12 Dec 2024 09:06:05 +0100 Subject: [PATCH 1/2] Accept API keys for running acceptance tests --- internal/acctest/acctest.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index d1fd4808c..0697744be 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -29,8 +29,10 @@ func PreCheck(t *testing.T) { _, kibanaEndpointOk := os.LookupEnv("KIBANA_ENDPOINT") _, userOk := os.LookupEnv("ELASTICSEARCH_USERNAME") _, passOk := os.LookupEnv("ELASTICSEARCH_PASSWORD") + _, apiKeyOk := os.LookupEnv("ELASTICSEARCH_API_KEY") _, kbUserOk := os.LookupEnv("KIBANA_USERNAME") _, kbPassOk := os.LookupEnv("KIBANA_PASSWORD") + _, kbApiKeyOk := os.LookupEnv("KIBANA_API_KEY") if !elasticsearchEndpointsOk { t.Fatal("ELASTICSEARCH_ENDPOINTS must be set for acceptance tests to run") @@ -40,8 +42,7 @@ func PreCheck(t *testing.T) { t.Fatal("KIBANA_ENDPOINT must be set for acceptance tests to run") } - // Technically ES tests can use the API Key, however username/password is required for Kibana tests. - usernamePasswordOk := (userOk && passOk) || (kbUserOk && kbPassOk) + usernamePasswordOk := (userOk && passOk) || (kbUserOk && kbPassOk) || apiKeyOk || kbApiKeyOk if !usernamePasswordOk { t.Fatal("ELASTICSEARCH_USERNAME and ELASTICSEARCH_PASSWORD or KIBANA_USERNAME and KIBANA_PASSWORD must be set for acceptance tests to run") } From 8a0a7fa63122d7e8a2483a2df4de8ff5f7d777dc Mon Sep 17 00:00:00 2001 From: Toby Brain Date: Fri, 10 Jan 2025 16:55:51 +1100 Subject: [PATCH 2/2] Update message --- internal/acctest/acctest.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index 0697744be..494d600b8 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -42,8 +42,8 @@ func PreCheck(t *testing.T) { t.Fatal("KIBANA_ENDPOINT must be set for acceptance tests to run") } - usernamePasswordOk := (userOk && passOk) || (kbUserOk && kbPassOk) || apiKeyOk || kbApiKeyOk - if !usernamePasswordOk { - t.Fatal("ELASTICSEARCH_USERNAME and ELASTICSEARCH_PASSWORD or KIBANA_USERNAME and KIBANA_PASSWORD must be set for acceptance tests to run") + authOk := (userOk && passOk) || (kbUserOk && kbPassOk) || apiKeyOk || kbApiKeyOk + if !authOk { + 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") } }