From e2f55b6d98c0149e238a8ae96cb28eb80546f0d1 Mon Sep 17 00:00:00 2001
From: Xavi Ramirez <xavi.ramirez@clever.com>
Date: Wed, 16 Aug 2017 20:58:30 +0000
Subject: [PATCH] Updated syslogparser library and added unit tests

---
 decode/decode_test.go | 22 ++++++++++++++++++++++
 glide.lock            |  8 ++++----
 glide.yaml            |  5 +++--
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/decode/decode_test.go b/decode/decode_test.go
index 22877a5..e136bbf 100644
--- a/decode/decode_test.go
+++ b/decode/decode_test.go
@@ -203,6 +203,12 @@ type ParseAndEnhanceSpec struct {
 }
 
 func TestParseAndEnhance(t *testing.T) {
+	logTime2, err := time.Parse(time.RFC3339, "2017-04-05T21:57:46+00:00")
+	if err != nil {
+		t.Fatal(err)
+	}
+	logTime2 = logTime2.UTC()
+
 	// timestamp in Rsyslog_FileFormat
 	logTime3, err := time.Parse(RFC3339Micro, "2017-04-05T21:57:46.794862+00:00")
 	if err != nil {
@@ -417,6 +423,22 @@ func TestParseAndEnhance(t *testing.T) {
 			},
 			ExpectedError: nil,
 		},
+		ParseAndEnhanceSpec{
+			Title: "Log with timestamp time.RFC3339 format",
+			Input: ParseAndEnhanceInput{
+				Line: `2017-04-05T21:57:46+00:00 mongo-docker-pipeline-r10-4 diamond[24099] ` +
+					`Signal Received: 15`,
+				RenameESReservedFields: true,
+				MinimumTimestamp:       time.Now().Add(-100 * time.Hour * 24 * 365), // year 2117
+			},
+			ExpectedOutput: map[string]interface{}{
+				"env":         "deploy-env",
+				"hostname":    "mongo-docker-pipeline-r10-4",
+				"programname": "diamond",
+				"rawlog":      "Signal Received: 15",
+				"timestamp":   logTime2,
+			},
+		},
 	}
 	for _, spec := range specs {
 		t.Run(fmt.Sprintf(spec.Title), func(t *testing.T) {
diff --git a/glide.lock b/glide.lock
index a8f507f..6a9f991 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,8 +1,8 @@
-hash: 6da9731518797a7e339144f126af589f72f860bee154b0f2a552f91d2bc01bab
-updated: 2017-07-18T02:00:59.747262097Z
+hash: 6cc2c955c4d70fea747e0056aa63e8fe6a0f8d8c9baca20cf3a5a34d0c55b1fb
+updated: 2017-08-16T20:57:02.3853046Z
 imports:
 - name: github.com/aws/aws-sdk-go
-  version: b73b028e599fa9176687c70b8f9cafbe57c27d20
+  version: 819b71cf8430e434c1eee7e7e8b0f2b8870be899
   subpackages:
   - aws
   - aws/session
@@ -12,7 +12,7 @@ imports:
   subpackages:
   - writer
 - name: github.com/Clever/syslogparser
-  version: 93ab95f7ff16c9ef1f2d09bc37c0a0c31bad98ea
+  version: fb28ad3e4340c046323b7beba685a72fd12ecbe8
   subpackages:
   - rfc3164
 - name: github.com/jeromer/syslogparser
diff --git a/glide.yaml b/glide.yaml
index 312e7db..7037e45 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -4,6 +4,7 @@ import:
   subpackages:
   - writer
 - package: github.com/Clever/syslogparser
+  version: master
   subpackages:
   - rfc3164
 - package: github.com/aws/aws-sdk-go
@@ -14,9 +15,9 @@ import:
 - package: golang.org/x/time
   subpackages:
   - rate
+- package: gopkg.in/Clever/kayvee-go.v6
+  version: ^6.0.0
 testImport:
 - package: github.com/stretchr/testify
   subpackages:
   - assert
-- package: gopkg.in/Clever/kayvee-go.v6
-  version: ^6.0.0