From b10c4f51b1ef224d215b898a88bf32f7f23a57b5 Mon Sep 17 00:00:00 2001 From: Minio Trusted Date: Fri, 18 Jun 2021 16:03:17 -0700 Subject: [PATCH] fix: log search URL, token environment variables --- restapi/config.go | 5 ++++- restapi/consts.go | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/restapi/config.go b/restapi/config.go index 94f72ec5a..f5f78c3f5 100644 --- a/restapi/config.go +++ b/restapi/config.go @@ -230,11 +230,14 @@ func getSecureExpectCTHeader() string { } func getLogSearchAPIToken() string { + if v := env.Get(ConsoleLogQueryAuthToken, ""); v != "" { + return v + } return env.Get(LogSearchQueryAuthToken, "") } func getLogSearchURL() string { - return env.Get(LogSearchURL, "http://localhost:8080") + return env.Get(ConsoleLogQueryURL, "http://localhost:8080") } func getPrometheusURL() string { diff --git a/restapi/consts.go b/restapi/consts.go index 10dfd34eb..5c08f7e80 100644 --- a/restapi/consts.go +++ b/restapi/consts.go @@ -50,9 +50,10 @@ const ( ConsoleSecureExpectCTHeader = "CONSOLE_SECURE_EXPECT_CT_HEADER" ConsoleOperatorSAToken = "CONSOLE_OPERATOR_SA_TOKEN" ConsoleOperatorConsoleImage = "CONSOLE_OPERATOR_CONSOLE_IMAGE" - LogSearchURL = "CONSOLE_LOG_QUERY_URL" PrometheusURL = "CONSOLE_PROMETHEUS_URL" PrometheusJobID = "CONSOLE_PROMETHEUS_JOB_ID" + ConsoleLogQueryURL = "CONSOLE_LOG_QUERY_URL" + ConsoleLogQueryAuthToken = "CONSOLE_LOG_QUERY_AUTH_TOKEN" LogSearchQueryAuthToken = "LOGSEARCH_QUERY_AUTH_TOKEN" // Constants for prometheus annotations