diff --git a/cmd/csaf_checker/processor.go b/cmd/csaf_checker/processor.go index 90d55b7..4402848 100644 --- a/cmd/csaf_checker/processor.go +++ b/cmd/csaf_checker/processor.go @@ -192,7 +192,10 @@ func (p *processor) clean() { // It returns a pointer to the report and nil, otherwise an error. func (p *processor) run(reporters []reporter, domains []string) (*Report, error) { - var report Report + report := Report{ + Date: ReportTime{Time: time.Now().UTC()}, + Version: util.SemVersion, + } for _, d := range domains { if err := p.checkDomain(d); err != nil { @@ -205,9 +208,6 @@ func (p *processor) run(reporters []reporter, domains []string) (*Report, error) for _, r := range reporters { r.report(p, domain) } - report.Version = util.SemVersion - now := time.Now() - report.Date = now.Format("2006-01-02T15:04:05Z") report.Domains = append(report.Domains, domain) p.clean() } diff --git a/cmd/csaf_checker/report.go b/cmd/csaf_checker/report.go index a718d69..1c48749 100644 --- a/cmd/csaf_checker/report.go +++ b/cmd/csaf_checker/report.go @@ -8,7 +8,10 @@ package main -import "fmt" +import ( + "fmt" + "time" +) // MessageType is the kind of the message. type MessageType int @@ -41,11 +44,19 @@ type Domain struct { Requirements []*Requirement `json:"requirements,omitempty"` } +// ReportTime stores the time of the report. +type ReportTime struct{ time.Time } + // Report is the overall report. type Report struct { - Domains []*Domain `json:"domains,omitempty"` - Version string `json:"version,omitempty"` - Date string `json:"date,omitempty"` + Domains []*Domain `json:"domains,omitempty"` + Version string `json:"version,omitempty"` + Date ReportTime `json:"date,omitempty"` +} + +// MarshalText implements the encoding.TextMarshaller interface. +func (rt ReportTime) MarshalText() ([]byte, error) { + return []byte(rt.Format(time.RFC3339)), nil } // HasErrors tells if this requirement has errors. diff --git a/cmd/csaf_checker/tmpl/report.html b/cmd/csaf_checker/tmpl/report.html index b0e6579..abb90a7 100644 --- a/cmd/csaf_checker/tmpl/report.html +++ b/cmd/csaf_checker/tmpl/report.html @@ -21,8 +21,8 @@ {{ end }}