Merge branch 'dakerfp-patch-3'

pkg/util/strings.go

@@ -1,18 +1,18 @@
 package util
 
 func StringsFallback2(val1 string, val2 string) string {
-	if val1 != "" {
-		return val1
-	}
-	return val2
+	return stringsFallback(val1, val2)
 }
 
 func StringsFallback3(val1 string, val2 string, val3 string) string {
-	if val1 != "" {
-		return val1
-	}
-	if val2 != "" {
-		return val2
+	return stringsFallback(val1, val2, val3)
+}
+
+func stringsFallback(vals ...string) string {
+	for _, v := range vals {
+		if v != "" {
+			return v
+		}
 	}
-	return val3
+	return ""
 }

pkg/util/strings_test.go

@@ -0,0 +1,15 @@
+package util
+
+import (
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func TestStringsUtil(t *testing.T) {
+	Convey("Falling back until none empty string", t, func() {
+		So(StringsFallback2("1", "2"), ShouldEqual, "1")
+		So(StringsFallback2("", "2"), ShouldEqual, "2")
+		So(StringsFallback3("", "", "3"), ShouldEqual, "3")
+	})
+}