Fix bug reading default value for combine_output

The default should be set to true so we maintain backwards.
compatibility.
readconfig.go was altered due to bug reading default value. This was
tested by adding unit tests to readconfig_test.go for positive and
negative scenarios.

Signed-off-by: Alex Ellis (VMware) <alexellis2@gmail.com>

watchdog/readconfig_test.go

@@ -0,0 +1,245 @@
+// Copyright (c) Alex Ellis 2017. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+package main
+
+import (
+	"testing"
+	"time"
+)
+
+type EnvBucket struct {
+	Items map[string]string
+}
+
+func NewEnvBucket() EnvBucket {
+	return EnvBucket{
+		Items: make(map[string]string),
+	}
+}
+
+func (e EnvBucket) Getenv(key string) string {
+	return e.Items[key]
+}
+
+func (e EnvBucket) Setenv(key string, value string) {
+	e.Items[key] = value
+}
+
+func TestRead_CombineOutput_DefaultTrue(t *testing.T) {
+	defaults := NewEnvBucket()
+	readConfig := ReadConfig{}
+
+	config := readConfig.Read(defaults)
+	want := true
+	if config.combineOutput != want {
+		t.Logf("combineOutput error, want: %v, got: %v", want, config.combineOutput)
+		t.Fail()
+	}
+}
+
+func TestRead_CombineOutput_OverrideFalse(t *testing.T) {
+	defaults := NewEnvBucket()
+	readConfig := ReadConfig{}
+	defaults.Setenv("combine_output", "false")
+
+	config := readConfig.Read(defaults)
+	want := false
+	if config.combineOutput != want {
+		t.Logf("combineOutput error, want: %v, got: %v", want, config.combineOutput)
+		t.Fail()
+	}
+}
+
+func TestRead_CgiHeaders_OverrideFalse(t *testing.T) {
+	defaults := NewEnvBucket()
+	readConfig := ReadConfig{}
+	defaults.Setenv("cgi_headers", "false")
+
+	config := readConfig.Read(defaults)
+
+	if config.cgiHeaders != false {
+		t.Logf("cgiHeaders should have been false (via env)")
+		t.Fail()
+	}
+}
+
+func TestRead_CgiHeaders_DefaultIsTrueConfig(t *testing.T) {
+	defaults := NewEnvBucket()
+	readConfig := ReadConfig{}
+
+	config := readConfig.Read(defaults)
+
+	if config.cgiHeaders != true {
+		t.Logf("cgiHeaders should have been true (unspecified)")
+		t.Fail()
+	}
+}
+
+func TestRead_WriteDebug_DefaultIsFalseConfig(t *testing.T) {
+	defaults := NewEnvBucket()
+	readConfig := ReadConfig{}
+
+	config := readConfig.Read(defaults)
+
+	if config.writeDebug != false {
+		t.Logf("writeDebug should have been false (unspecified)")
+		t.Fail()
+	}
+}
+
+func TestRead_WriteDebug_TrueOverrideConfig(t *testing.T) {
+	defaults := NewEnvBucket()
+	readConfig := ReadConfig{}
+	defaults.Setenv("write_debug", "true")
+
+	config := readConfig.Read(defaults)
+
+	if config.writeDebug != true {
+		t.Logf("writeDebug should have been true (specified)")
+		t.Fail()
+	}
+}
+
+func TestRead_WriteDebug_FlaseConfig(t *testing.T) {
+	defaults := NewEnvBucket()
+	readConfig := ReadConfig{}
+	defaults.Setenv("write_debug", "false")
+
+	config := readConfig.Read(defaults)
+
+	if config.writeDebug != false {
+		t.Logf("writeDebug should have been false (specified)")
+		t.Fail()
+	}
+}
+
+func TestRead_SuppressLockConfig(t *testing.T) {
+	defaults := NewEnvBucket()
+	readConfig := ReadConfig{}
+	defaults.Setenv("suppress_lock", "true")
+
+	config := readConfig.Read(defaults)
+
+	if config.suppressLock != true {
+		t.Logf("suppress_lock envVariable incorrect, got: %s.\n", config.faasProcess)
+		t.Fail()
+	}
+}
+
+func TestRead_ContentTypeConfig(t *testing.T) {
+	defaults := NewEnvBucket()
+	readConfig := ReadConfig{}
+	defaults.Setenv("content_type", "application/json")
+
+	config := readConfig.Read(defaults)
+
+	if config.contentType != "application/json" {
+		t.Logf("content_type envVariable incorrect, got: %s.\n", config.contentType)
+		t.Fail()
+	}
+}
+
+func TestRead_FprocessConfig(t *testing.T) {
+	defaults := NewEnvBucket()
+	readConfig := ReadConfig{}
+	defaults.Setenv("fprocess", "cat")
+
+	config := readConfig.Read(defaults)
+
+	if config.faasProcess != "cat" {
+		t.Logf("fprocess envVariable incorrect, got: %s.\n", config.faasProcess)
+		t.Fail()
+	}
+}
+
+func TestRead_EmptyTimeoutConfig(t *testing.T) {
+	defaults := NewEnvBucket()
+	readConfig := ReadConfig{}
+
+	config := readConfig.Read(defaults)
+
+	if (config.readTimeout) != time.Duration(5)*time.Second {
+		t.Log("readTimeout incorrect")
+		t.Fail()
+	}
+	if (config.writeTimeout) != time.Duration(5)*time.Second {
+		t.Log("writeTimeout incorrect")
+		t.Fail()
+	}
+}
+
+func TestRead_DefaultPortConfig(t *testing.T) {
+	defaults := NewEnvBucket()
+
+	readConfig := ReadConfig{}
+	config := readConfig.Read(defaults)
+	want := 8080
+	if config.port != want {
+		t.Logf("port got: %d, want: %d\n", config.port, want)
+		t.Fail()
+	}
+}
+
+func TestRead_PortConfig(t *testing.T) {
+	defaults := NewEnvBucket()
+	defaults.Setenv("port", "8081")
+
+	readConfig := ReadConfig{}
+	config := readConfig.Read(defaults)
+	want := 8081
+	if config.port != want {
+		t.Logf("port got: %d, want: %d\n", config.port, want)
+		t.Fail()
+	}
+}
+
+func TestRead_ReadAndWriteTimeoutConfig(t *testing.T) {
+	defaults := NewEnvBucket()
+	defaults.Setenv("read_timeout", "10")
+	defaults.Setenv("write_timeout", "60")
+
+	readConfig := ReadConfig{}
+	config := readConfig.Read(defaults)
+
+	if (config.readTimeout) != time.Duration(10)*time.Second {
+		t.Logf("readTimeout incorrect, got: %d\n", config.readTimeout)
+		t.Fail()
+	}
+	if (config.writeTimeout) != time.Duration(60)*time.Second {
+		t.Logf("writeTimeout incorrect, got: %d\n", config.writeTimeout)
+		t.Fail()
+	}
+}
+
+func TestRead_ReadAndWriteTimeoutDurationConfig(t *testing.T) {
+	defaults := NewEnvBucket()
+	defaults.Setenv("read_timeout", "20s")
+	defaults.Setenv("write_timeout", "1m30s")
+
+	readConfig := ReadConfig{}
+	config := readConfig.Read(defaults)
+
+	if (config.readTimeout) != time.Duration(20)*time.Second {
+		t.Logf("readTimeout incorrect, got: %d\n", config.readTimeout)
+		t.Fail()
+	}
+	if (config.writeTimeout) != time.Duration(90)*time.Second {
+		t.Logf("writeTimeout incorrect, got: %d\n", config.writeTimeout)
+		t.Fail()
+	}
+}
+
+func TestRead_ExecTimeoutConfig(t *testing.T) {
+	defaults := NewEnvBucket()
+	defaults.Setenv("exec_timeout", "3s")
+
+	readConfig := ReadConfig{}
+	config := readConfig.Read(defaults)
+
+	want := time.Duration(3) * time.Second
+	if (config.execTimeout) != want {
+		t.Logf("execTimeout incorrect, got: %d - want: %s\n", config.execTimeout, want)
+		t.Fail()
+	}
+}