Move log source type parsing into common function

Author: jorbaum

src/pkg/egress/syslog/log_source.go

@@ -43,6 +43,25 @@ func ParseSourceType(s string) (LogSourceType, bool) {
 	return lt, lt.IsValid()
 }
 
+// ParseSourceTypeList parses a comma-separated list of source types and returns
+// the valid types as a set and any unknown types as a slice.
+func ParseSourceTypeList(sourceTypeList string) (LogSourceTypeSet, []string) {
+	sourceTypes := strings.Split(sourceTypeList, ",")
+	set := make(LogSourceTypeSet, len(sourceTypes))
+	var unknownTypes []string
+
+	for _, sourceType := range sourceTypes {
+		t, ok := ParseSourceType(sourceType)
+		if !ok {
+			unknownTypes = append(unknownTypes, sourceType)
+			continue
+		}
+		set.Add(t)
+	}
+
+	return set, unknownTypes
+}
+
 // ExtractPrefix extracts the prefix from a source_type tag (e.g., "APP/PROC/WEB/0" -> "APP")
 func ExtractPrefix(sourceTypeTag string) string {
 	if idx := strings.IndexByte(sourceTypeTag, '/'); idx != -1 {

src/pkg/ingress/bindings/binding_config.go

@@ -2,7 +2,6 @@ package bindings
 
 import (
 	"net/url"
-	"strings"
 
 	"code.cloudfoundry.org/loggregator-agent-release/src/pkg/binding"
 	"code.cloudfoundry.org/loggregator-agent-release/src/pkg/egress/syslog"
@@ -105,14 +104,7 @@ func (d *DrainParamParser) newLogFilter(sourceTypeList string, mode syslog.LogFi
 		return nil
 	}
 
-	sourceTypes := strings.Split(sourceTypeList, ",")
-	set := make(syslog.LogSourceTypeSet, len(sourceTypes))
-
-	for _, sourceType := range sourceTypes {
-		t, _ := syslog.ParseSourceType(sourceType)
-		set.Add(t)
-	}
-
+	set, _ := syslog.ParseSourceTypeList(sourceTypeList)
 	return syslog.NewLogFilter(set, mode)
 }
 

src/pkg/ingress/bindings/filtered_binding_fetcher.go

@@ -164,17 +164,7 @@ func getUnknownSourceTypes(u url.Values) []string {
 		return nil
 	}
 
-	sourceTypes := strings.Split(sourceTypeList, ",")
-	var unknownTypes []string
-
-	for _, sourceType := range sourceTypes {
-		_, ok := syslog.ParseSourceType(sourceType)
-		if !ok {
-			unknownTypes = append(unknownTypes, sourceType)
-			continue
-		}
-	}
-
+	_, unknownTypes := syslog.ParseSourceTypeList(sourceTypeList)
 	return unknownTypes
 }