From 395a9d3f57745b250d7f610b830c27e4957aeea5 Mon Sep 17 00:00:00 2001 From: Christopher LaPointe Date: Wed, 20 Jul 2022 22:42:07 -0400 Subject: [PATCH] Add default time format as empty string --- pkg/expressions/stdlib/funcsTime.go | 1 + pkg/expressions/stdlib/funcsTime_test.go | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/pkg/expressions/stdlib/funcsTime.go b/pkg/expressions/stdlib/funcsTime.go index 7a3695f..fb00953 100644 --- a/pkg/expressions/stdlib/funcsTime.go +++ b/pkg/expressions/stdlib/funcsTime.go @@ -14,6 +14,7 @@ import ( const defaultTimeFormat = time.RFC3339 var timeFormats = map[string]string{ + "": defaultTimeFormat, // Standard formats "ASNIC": time.ANSIC, "UNIX": time.UnixDate, diff --git a/pkg/expressions/stdlib/funcsTime_test.go b/pkg/expressions/stdlib/funcsTime_test.go index facbcb1..3ba5eaf 100644 --- a/pkg/expressions/stdlib/funcsTime_test.go +++ b/pkg/expressions/stdlib/funcsTime_test.go @@ -20,14 +20,21 @@ func TestTimeExpression(t *testing.T) { } func TestFormatExpression(t *testing.T) { + // Defined type testExpression(t, mockContext("14/Apr/2016:19:12:25 +0200"), "{timeformat {time {0} NGINX} RFC3339 utc}", "2016-04-14T17:12:25Z") + // Explicit testExpression(t, mockContext("14/Apr/2016:19:12:25 +0200"), `{timeformat {time {0} "_2/Jan/2006:15:04:05 -0700"} RFC3339 utc}`, "2016-04-14T17:12:25Z") + // Default/empty-string + testExpression(t, + mockContext("14/Apr/2016:19:12:25 +0200"), + `{timeformat {time {0}} "" utc}`, + "2016-04-14T17:12:25Z") } func TestTimeExpressionDetection(t *testing.T) {