refactor go build tags

3 files changed, 28 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index d764051..717d701 100644
--- a/Makefile
+++ b/Makefile
@@ -1,33 +1,31 @@
 GO ?= go
+ifdef DTAIL_USE_ACL
+GO_TAGS=linuxacl
+endif
+ifdef DTAIL_USE_PROPRIETARY
+GO_TAGS+=proprietary
+endif
 all: build
 build: dserver dcat dgrep dmap dtail dtailhealth
 dserver:
-ifndef DTAIL_USE_ACL
-	${GO} build ${GO_FLAGS} -o dserver ./cmd/dserver/main.go
-else
-	${GO} build ${GO_FLAGS} -tags linuxacl -o dserver ./cmd/dserver/main.go
-endif
+	${GO} build ${GO_FLAGS} -tags '${GO_TAGS}' -o dserver ./cmd/dserver/main.go
 dcat:
-	${GO} build ${GO_FLAGS} -o dcat ./cmd/dcat/main.go
+	${GO} build ${GO_FLAGS} -tags '${GO_TAGS}' -o dcat ./cmd/dcat/main.go
 dgrep:
-	${GO} build ${GO_FLAGS} -o dgrep ./cmd/dgrep/main.go
+	${GO} build ${GO_FLAGS} -tags '${GO_TAGS}' -o dgrep ./cmd/dgrep/main.go
 dmap:
-	${GO} build ${GO_FLAGS} -o dmap ./cmd/dmap/main.go
+	${GO} build ${GO_FLAGS} -tags '${GO_TAGS}' -o dmap ./cmd/dmap/main.go
 dtail:
-	${GO} build ${GO_FLAGS} -o dtail ./cmd/dtail/main.go
+	${GO} build ${GO_FLAGS} -tags '${GO_TAGS}' -o dtail ./cmd/dtail/main.go
 dtailhealth:
-	${GO} build ${GO_FLAGS} -o dtailhealth ./cmd/dtailhealth/main.go
+	${GO} build ${GO_FLAGS} -tags '${GO_TAGS}' -o dtailhealth ./cmd/dtailhealth/main.go
 install:
-ifndef DTAIL_USE_ACL
-	${GO} install ./cmd/dserver/main.go
-else
-	${GO} install -tags linuxacl ./cmd/dserver/main.go
-endif
-	${GO} install ./cmd/dcat/main.go
-	${GO} install ./cmd/dgrep/main.go
-	${GO} install ./cmd/dmap/main.go
-	${GO} install ./cmd/dtail/main.go
-	${GO} install ./cmd/dtailhealth/main.go
+	${GO} install -tags '${GO_TAGS}' ./cmd/dserver/main.go
+	${GO} install -tags '${GO_TAGS}' ./cmd/dcat/main.go
+	${GO} install -tags '${GO_TAGS}' ./cmd/dgrep/main.go
+	${GO} install -tags '${GO_TAGS}' ./cmd/dmap/main.go
+	${GO} install -tags '${GO_TAGS}' ./cmd/dtail/main.go
+	${GO} install -tags '${GO_TAGS}' ./cmd/dtailhealth/main.go
 clean:
 	ls ./cmd/ | while read cmd; do \
 	  test -f $$cmd && rm $$cmd; \
@@ -47,10 +45,5 @@ lint:
 	done | grep -F .go:
 test:
 	${GO} clean -testcache
-ifndef DTAIL_USE_ACL
 	set -e; find . -name '*_test.go' | while read file; do dirname $$file; done | \
-		sort -u | while read dir; do ${GO} test --race -v $$dir || exit 2; done
-else
-	set -e;find . -name '*_test.go' | while read file; do dirname $$file; done | \
-		sort -u | while read dir; do ${GO} test --tags linuxacl --race -v $$dir || exit 2; done
-endif
+		sort -u | while read dir; do ${GO} test -tags '${GO_TAGS}' --race -v $$dir || exit 2; done
diff --git a/internal/mapr/logformat/mimecast.go b/internal/mapr/logformat/mimecast.go
index bc6e30a..cf6b333 100644
--- a/internal/mapr/logformat/mimecast.go
+++ b/internal/mapr/logformat/mimecast.go
@@ -1,3 +1,6 @@
+//go:build !proprietary
+// +build !proprietary
+
 package logformat
 
 import "errors"
@@ -11,6 +14,10 @@ func newMimecastParser(hostname, timeZoneName string, timeZoneOffset int) (*mime
 	return &mimecastParser{}, ErrMimecastNotAvailable
 }
 
+func newMimecastGenericParser(hostname, timeZoneName string, timeZoneOffset int) (*mimecastParser, error) {
+	return &mimecastParser{}, ErrMimecastNotAvailable
+}
+
 func (p *mimecastParser) MakeFields(maprLine string) (map[string]string, error) {
 	return nil, ErrMimecastNotAvailable
 }
diff --git a/internal/mapr/logformat/parser.go b/internal/mapr/logformat/parser.go
index 9888932..37d7a63 100644
--- a/internal/mapr/logformat/parser.go
+++ b/internal/mapr/logformat/parser.go
@@ -37,6 +37,8 @@ func NewParser(logFormatName string, query *mapr.Query) (Parser, error) {
 		return newCSVParser(hostname, timeZoneName, timeZoneOffset)
 	case "mimecast":
 		return newMimecastParser(hostname, timeZoneName, timeZoneOffset)
+	case "mimecastgeneric":
+		return newMimecastGenericParser(hostname, timeZoneName, timeZoneOffset)
 	case "default":
 		return newDefaultParser(hostname, timeZoneName, timeZoneOffset)
 	case "custom1":