From cda69dc7f0971f6ccbeec8fb3f1f1575bf6ed97b Mon Sep 17 00:00:00 2001
From: Oliver Bristow <evilumbrella+github@gmail.com>
Date: Mon, 14 Nov 2016 19:10:58 +0000
Subject: [PATCH] Use RFC3339 timestamps in the results

---
 report/azureblob.go | 2 +-
 report/json.go      | 3 +--
 report/s3.go        | 2 +-
 report/util.go      | 3 +--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/report/azureblob.go b/report/azureblob.go
index 4991b78d..bf2ef35b 100644
--- a/report/azureblob.go
+++ b/report/azureblob.go
@@ -113,7 +113,7 @@ func (w AzureBlobWriter) upload(res models.ScanResult) (err error) {
 	if err != nil {
 		return err
 	}
-	timestr := time.Now().Format("20060102_1504")
+	timestr := time.Now().Format(time.RFC3339)
 	name := ""
 	if len(res.Container.ContainerID) == 0 {
 		name = fmt.Sprintf("%s/%s.json", timestr, res.ServerName)
diff --git a/report/json.go b/report/json.go
index acff8c89..31f6ac98 100644
--- a/report/json.go
+++ b/report/json.go
@@ -134,8 +134,7 @@ func LoadOneScanHistory(jsonDir string) (scanHistory models.ScanHistory, err err
 	if scanResults[0].ScannedAt.IsZero() {
 		splitPath := strings.Split(jsonDir, string(os.PathSeparator))
 		timeStr := splitPath[len(splitPath)-1]
-		timeformat := "20060102_1504"
-		if scannedAt, err = time.Parse(timeformat, timeStr); err != nil {
+		if scannedAt, err = time.Parse(time.RFC3339, timeStr); err != nil {
 			err = fmt.Errorf("Failed to parse %s: %s", timeStr, err)
 			return
 		}
diff --git a/report/s3.go b/report/s3.go
index f5548410..06262303 100644
--- a/report/s3.go
+++ b/report/s3.go
@@ -77,7 +77,7 @@ func (w S3Writer) Write(scanResults []models.ScanResult) (err error) {
 
 	// http://docs.aws.amazon.com/sdk-for-go/latest/v1/developerguide/common-examples.title.html
 	svc := getS3()
-	timestr := time.Now().Format("20060102_1504")
+	timestr := time.Now().Format(time.RFC3339)
 	for _, r := range scanResults {
 		key := ""
 		if len(r.Container.ContainerID) == 0 {
diff --git a/report/util.go b/report/util.go
index 123d22f7..e236c750 100644
--- a/report/util.go
+++ b/report/util.go
@@ -31,8 +31,7 @@ import (
 )
 
 func ensureResultDir(scannedAt time.Time) (path string, err error) {
-	const timeLayout = "20060102_1504"
-	jsonDirName := scannedAt.Format(timeLayout)
+	jsonDirName := scannedAt.Format(time.RFC3339)
 
 	resultsDir := config.Conf.ResultsDir
 	if len(resultsDir) == 0 {