From 14604e0cba695da39c1d4f2f5c3a74209b04a633 Mon Sep 17 00:00:00 2001
From: Harshavardhana <harsha@minio.io>
Date: Fri, 18 Jun 2021 15:40:25 -0700
Subject: [PATCH] fix: lazily interpret environment values (#826)

using `init()` to initialize environment values
can cause problems when console is imported
into dependent projects.
---
 restapi/config.go            | 24 +++++-------------------
 restapi/configure_console.go | 11 +++++------
 restapi/user_log_search.go   |  4 ----
 3 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/restapi/config.go b/restapi/config.go
index ca35f1fe1..94f72ec5a 100644
--- a/restapi/config.go
+++ b/restapi/config.go
@@ -51,19 +51,9 @@ var (
 	LicenseKey = ""
 )
 
-var (
-	logSearchAPI    string
-	logSearchURL    string
-	prometheusURL   string
-	prometheusJobID string
-	consoleImage    string
-)
+var consoleImage string
 
 func init() {
-	logSearchAPI = env.Get(LogSearchQueryAuthToken, "")
-	logSearchURL = env.Get(LogSearchURL, "http://localhost:8080")
-	prometheusURL = env.Get(PrometheusURL, "")
-	prometheusJobID = env.Get(PrometheusJobID, "minio-job")
 	consoleImage = env.Get(ConsoleOperatorConsoleImage, ConsoleImageDefaultVersion)
 }
 
@@ -99,10 +89,6 @@ func getMinIOEndpointIsSecure() bool {
 	return false
 }
 
-func getProductionMode() bool {
-	return strings.ToLower(env.Get(ConsoleProductionMode, "on")) == "on"
-}
-
 // GetHostname gets console hostname set on env variable,
 // default one or defined on run command
 func GetHostname() string {
@@ -244,19 +230,19 @@ func getSecureExpectCTHeader() string {
 }
 
 func getLogSearchAPIToken() string {
-	return logSearchAPI
+	return env.Get(LogSearchQueryAuthToken, "")
 }
 
 func getLogSearchURL() string {
-	return logSearchURL
+	return env.Get(LogSearchURL, "http://localhost:8080")
 }
 
 func getPrometheusURL() string {
-	return prometheusURL
+	return env.Get(PrometheusURL, "")
 }
 
 func getPrometheusJobID() string {
-	return prometheusJobID
+	return env.Get(PrometheusJobID, "minio-job")
 }
 
 // GetSubnetLicense returns the current subnet jwt license
diff --git a/restapi/configure_console.go b/restapi/configure_console.go
index 7c04ba37f..b28d9e691 100644
--- a/restapi/configure_console.go
+++ b/restapi/configure_console.go
@@ -192,7 +192,7 @@ func setupGlobalMiddleware(handler http.Handler) http.Handler {
 		ReferrerPolicy:                  getSecureReferrerPolicy(),
 		FeaturePolicy:                   getSecureFeaturePolicy(),
 		ExpectCTHeader:                  getSecureExpectCTHeader(),
-		IsDevelopment:                   !getProductionMode(),
+		IsDevelopment:                   false,
 	}
 	secureMiddleware := secure.New(secureOptions)
 	return secureMiddleware.Handler(next)
@@ -268,10 +268,9 @@ func wrapHandlerSinglePageApplication(h http.Handler) http.HandlerFunc {
 	}
 }
 
-type logWriter struct{}
+type nullWriter struct{}
 
-func (lw logWriter) Write(b []byte) (int, error) {
-	LogError(string(bytes.TrimSuffix(b, []byte("\n"))))
+func (lw nullWriter) Write(b []byte) (int, error) {
 	return len(b), nil
 }
 
@@ -280,6 +279,6 @@ func (lw logWriter) Write(b []byte) (int, error) {
 // This function can be called multiple times, depending on the number of serving schemes.
 // scheme value will be set accordingly: "http", "https" or "unix"
 func configureServer(s *http.Server, _, _ string) {
-	// Turn-off random logging by Go internall
-	s.ErrorLog = log.New(&logWriter{}, "", 0)
+	// Turn-off random logging by Go net/http
+	s.ErrorLog = log.New(&nullWriter{}, "", 0)
 }
diff --git a/restapi/user_log_search.go b/restapi/user_log_search.go
index 6f0e79235..ffad69a12 100644
--- a/restapi/user_log_search.go
+++ b/restapi/user_log_search.go
@@ -20,7 +20,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"net/http"
 
 	"github.com/go-openapi/swag"
@@ -42,9 +41,6 @@ func registerLogSearchHandlers(api *operations.ConsoleAPI) {
 		return user_api.NewLogSearchOK().WithPayload(searchResp)
 	})
 }
-func init() {
-	log.SetFlags(log.LstdFlags | log.Lshortfile)
-}
 
 // getLogSearchResponse performs a query to Log Search if Enabled
 func getLogSearchResponse(params user_api.LogSearchParams) (*models.LogSearchResponse, *models.Error) {