From 13423c3d4df2427d545fb3b78f30661d4e796c87 Mon Sep 17 00:00:00 2001 From: Fadi Abbud <39081670+Fadiabb@users.noreply.github.com> Date: Tue, 24 May 2022 16:59:27 +0200 Subject: [PATCH] Add datetime and version info to report of checker Resolve #142 Co-authored-by: Bernhard Reiter --- cmd/csaf_checker/processor.go | 3 +++ cmd/csaf_checker/report.go | 2 ++ cmd/csaf_checker/tmpl/report.html | 16 +++++++++++----- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/cmd/csaf_checker/processor.go b/cmd/csaf_checker/processor.go index d9f16b2..e3b9083 100644 --- a/cmd/csaf_checker/processor.go +++ b/cmd/csaf_checker/processor.go @@ -189,6 +189,9 @@ 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 8313f64..b224bf1 100644 --- a/cmd/csaf_checker/report.go +++ b/cmd/csaf_checker/report.go @@ -24,6 +24,8 @@ type Domain struct { // Report is the overall report. type Report struct { Domains []*Domain `json:"domains,omitempty"` + Version string `json:"version,omitempty"` + Date string `json:"date,omitempty"` } func (r *Requirement) message(msg ...string) { diff --git a/cmd/csaf_checker/tmpl/report.html b/cmd/csaf_checker/tmpl/report.html index ab86c0f..6d42281 100644 --- a/cmd/csaf_checker/tmpl/report.html +++ b/cmd/csaf_checker/tmpl/report.html @@ -6,17 +6,23 @@ CSAF-Checker - Report -

CSAF-Checker - Report

+

CSAF-Checker - Report

{{- range .Domains }} -

{{ .Name }}

-
+

{{ .Name }}

+ +
{{ range .Requirements }} -
Requirement {{ .Num }}: {{ .Description }}
+
Requirement {{ .Num }}: {{ .Description }}
{{ range .Messages }}
- {{ . }}
{{ end }} {{ end }} -
+
{{ end }} + +