Support exclude and include

Author: jorbaum

src/pkg/ingress/bindings/binding_config.go

@@ -87,7 +87,7 @@ func getBindingType(u *url.URL) syslog.DrainData {
 }
 
 // Parse HTML query parameter into a Set of LogTypes
-func NewLogTypeSet(logTypeList string) *syslog.LogTypeSet {
+func NewLogTypeSet(logTypeList string, isExclude bool) *syslog.LogTypeSet {
 	if logTypeList == "" {
 		set := make(syslog.LogTypeSet)
 		return &set
@@ -116,15 +116,40 @@ func NewLogTypeSet(logTypeList string) *syslog.LogTypeSet {
 			t = syslog.CELL
 		default:
 			// TODO Log unknown log type
+			continue
 		}
 		set[t] = struct{}{}
 	}
 
+	if isExclude {
+		// Invert the set
+		fullSet := make(syslog.LogTypeSet)
+		allLogTypes := []syslog.LogType{syslog.API, syslog.STG, syslog.RTR, syslog.LGR, syslog.APP, syslog.SSH, syslog.CELL}
+		for _, t := range allLogTypes {
+			fullSet[t] = struct{}{}
+		}
+
+		for t := range set {
+			delete(fullSet, t)
+		}
+		return &fullSet
+	}
+
 	return &set
 }
 
 func getLogFilter(u *url.URL) *syslog.LogTypeSet {
-	return NewLogTypeSet(u.Query().Get("include-log-types"))
+	includeLogTypes := u.Query().Get("include-log-types")
+	excludeLogTypes := u.Query().Get("exclude-log-types")
+
+	if excludeLogTypes != "" && includeLogTypes != "" {
+		// TODO return errors.New("include-log-types and exclude-log-types can not be used at the same time")
+	} else if excludeLogTypes != "" {
+		return NewLogTypeSet(excludeLogTypes, true)
+	} else if includeLogTypes != "" {
+		return NewLogTypeSet(includeLogTypes, false)
+	}
+	return NewLogTypeSet("", false)
 }
 
 func getRemoveMetadataQuery(u *url.URL) string {

src/pkg/ingress/bindings/binding_config_test.go

@@ -93,18 +93,18 @@ var _ = Describe("Drain Param Config", func() {
 			{Drain: syslog.Drain{Url: "https://test.org/drain"}},
 			{Drain: syslog.Drain{Url: "https://test.org/drain?include-log-types=app"}},
 			{Drain: syslog.Drain{Url: "https://test.org/drain?include-log-types=app,stg,cell"}},
-			//			{Drain: syslog.Drain{Url: "https://test.org/drain?exclude-log-types=rtr,cell,stg"}},
-			//			{Drain: syslog.Drain{Url: "https://test.org/drain?exclude-log-types=rtr"}},
+			{Drain: syslog.Drain{Url: "https://test.org/drain?exclude-log-types=rtr,cell,stg"}},
+			{Drain: syslog.Drain{Url: "https://test.org/drain?exclude-log-types=rtr"}},
 		}
 		f := newStubFetcher(bs, nil)
 		wf := bindings.NewDrainParamParser(f, true)
 
 		configedBindings, _ := wf.FetchBindings()
-		Expect(configedBindings[0].LogFilter).To(Equal(bindings.NewLogTypeSet(""))) // Empty map defaults to all types
-		Expect(configedBindings[1].LogFilter).To(Equal(bindings.NewLogTypeSet("app")))
-		Expect(configedBindings[2].LogFilter).To(Equal(bindings.NewLogTypeSet("app,stg,cell")))
-		//		Expect(configedBindings[3].LogFilter).To(Equal(bindings.NewLogTypeSet("api,lgr,app,ssh")))
-		//		Expect(configedBindings[4].LogFilter).To(Equal(bindings.NewLogTypeSet("api,stg,lgr,app,ssh,cell")))
+		Expect(configedBindings[0].LogFilter).To(Equal(NewLogTypeSet())) // Empty map defaults to all types
+		Expect(configedBindings[1].LogFilter).To(Equal(NewLogTypeSet(syslog.APP)))
+		Expect(configedBindings[2].LogFilter).To(Equal(NewLogTypeSet(syslog.APP, syslog.STG, syslog.CELL)))
+		Expect(configedBindings[3].LogFilter).To(Equal(NewLogTypeSet(syslog.API, syslog.LGR, syslog.APP, syslog.SSH)))
+		Expect(configedBindings[4].LogFilter).To(Equal(NewLogTypeSet(syslog.API, syslog.STG, syslog.LGR, syslog.APP, syslog.SSH, syslog.CELL)))
 	})
 
 	It("sets drain data for old parameter appropriately'", func() {
@@ -170,3 +170,11 @@ func (f *stubFetcher) FetchBindings() ([]syslog.Binding, error) {
 func (f *stubFetcher) DrainLimit() int {
 	return -1
 }
+
+func NewLogTypeSet(logTypes ...syslog.LogType) *syslog.LogTypeSet {
+	set := make(syslog.LogTypeSet, len(logTypes))
+	for _, t := range logTypes {
+		set[t] = struct{}{}
+	}
+	return &set
+}