Error when using both include and exclude types

Author: jorbaum

src/pkg/ingress/bindings/binding_config.go

@@ -1,6 +1,7 @@
 package bindings
 
 import (
+	"errors"
 	"net/url"
 	"strings"
 
@@ -36,7 +37,10 @@ func (d *DrainParamParser) FetchBindings() ([]syslog.Binding, error) {
 		b.OmitMetadata = getOmitMetadata(urlParsed, d.defaultDrainMetadata)
 		b.InternalTls = getInternalTLS(urlParsed)
 		b.DrainData = getBindingType(urlParsed)
-		b.LogFilter = getLogFilter(urlParsed)
+		b.LogFilter, err = getLogFilter(urlParsed)
+		if err != nil {
+			return nil, err
+		}
 
 		processed = append(processed, b)
 	}
@@ -138,18 +142,18 @@ func NewLogTypeSet(logTypeList string, isExclude bool) *syslog.LogTypeSet {
 	return &set
 }
 
-func getLogFilter(u *url.URL) *syslog.LogTypeSet {
+func getLogFilter(u *url.URL) (*syslog.LogTypeSet, error) {
 	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")
+		return nil, errors.New("include-log-types and exclude-log-types can not be used at the same time")
 	} else if excludeLogTypes != "" {
-		return NewLogTypeSet(excludeLogTypes, true)
+		return NewLogTypeSet(excludeLogTypes, true), nil
 	} else if includeLogTypes != "" {
-		return NewLogTypeSet(includeLogTypes, false)
+		return NewLogTypeSet(includeLogTypes, false), nil
 	}
-	return NewLogTypeSet("", false)
+	return NewLogTypeSet("", false), nil
 }
 
 func getRemoveMetadataQuery(u *url.URL) string {

src/pkg/ingress/bindings/binding_config_test.go

@@ -107,6 +107,18 @@ var _ = Describe("Drain Param Config", func() {
 		Expect(configedBindings[4].LogFilter).To(Equal(NewLogTypeSet(syslog.API, syslog.STG, syslog.LGR, syslog.APP, syslog.SSH, syslog.CELL)))
 	})
 
+	It("returns an error when both include-log-types and exclude-log-types are specified", func() {
+		bs := []syslog.Binding{
+			{Drain: syslog.Drain{Url: "https://test.org/drain?include-log-types=app&exclude-log-types=rtr"}},
+		}
+		f := newStubFetcher(bs, nil)
+		wf := bindings.NewDrainParamParser(f, true)
+
+		configedBindings, err := wf.FetchBindings()
+		Expect(err).To(HaveOccurred())
+		Expect(configedBindings).To(HaveLen(0))
+	})
+
 	It("sets drain data for old parameter appropriately'", func() {
 		bs := []syslog.Binding{
 			{Drain: syslog.Drain{Url: "https://test.org/drain?drain-type=metrics"}},