From fcdd217057c251db58226b629786186e901e4074 Mon Sep 17 00:00:00 2001
From: Yu Cao <ycao@us.ibm.com>
Date: Thu, 31 May 2018 15:30:58 -0400
Subject: [PATCH] use env to override basic auth settings

---
 prog/app.go   |  1 -
 prog/main.go  | 19 +++++++++++++++++++
 prog/probe.go |  1 -
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/prog/app.go b/prog/app.go
index 564e04ef3..de2450771 100644
--- a/prog/app.go
+++ b/prog/app.go
@@ -300,7 +300,6 @@ func appMain(flags appFlags) {
 	}
 
 	if flags.basicAuth {
-		log.Infof("Basic authentication enabled")
 		handler = BasicAuthentication{
 			Realm:    "Restricted",
 			User:     flags.username,
diff --git a/prog/main.go b/prog/main.go
index ca68f3bb7..daca8cfad 100644
--- a/prog/main.go
+++ b/prog/main.go
@@ -459,6 +459,25 @@ func main() {
 		flags.probe.kubernetesNodeName = os.Getenv("KUBERNETES_NODENAME")
 	}
 
+	if strings.ToLower(os.Getenv("DISABLE_BASICAUTH")) == "true" {
+		log.Infof("Basic authentication disabled.")
+		flags.probe.basicAuth = false
+		flags.app.basicAuth = false
+
+	} else {
+		log.Infof("Basic authentication enabled.")
+		username := os.Getenv("BASICAUTH_USERNAME")
+		if username != "" {
+			flags.probe.username = username
+			flags.app.username = username
+		}
+		password := os.Getenv("BASICAUTH_PASSWORD")
+		if password != "" {
+			flags.probe.password = password
+			flags.app.password = password
+		}
+	}
+
 	if flags.dryRun {
 		return
 	}
diff --git a/prog/probe.go b/prog/probe.go
index 2281eaba1..7997da19d 100644
--- a/prog/probe.go
+++ b/prog/probe.go
@@ -129,7 +129,6 @@ func probeMain(flags probeFlags, targets []appclient.Target) {
 		}
 
 		if flags.basicAuth {
-			log.Infof("Basic authentication enabled")
 			token = base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("%s:%s", flags.username, flags.password)))
 		}