diff --git a/report/html/template.go b/report/html/template.html similarity index 96% rename from report/html/template.go rename to report/html/template.html index 6af286e341..0a3e48a6e1 100644 --- a/report/html/template.go +++ b/report/html/template.html @@ -1,20 +1,3 @@ -// (c) Copyright 2016 Hewlett Packard Enterprise Development LP -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package html - -const templateContent = ` @@ -454,4 +437,4 @@ ); -` + \ No newline at end of file diff --git a/report/html/writer.go b/report/html/writer.go index fed01c345f..36b2f94484 100644 --- a/report/html/writer.go +++ b/report/html/writer.go @@ -1,12 +1,18 @@ package html import ( + + // use go embed to import template + _ "embed" "html/template" "io" "github.com/securego/gosec/v2" ) +//go:embed template.html +var templateContent string + // WriteReport write a report in html format to the output writer func WriteReport(w io.Writer, data *gosec.ReportInfo) error { t, e := template.New("gosec").Parse(templateContent) diff --git a/report/text/template.go b/report/text/template.txt similarity index 94% rename from report/text/template.go rename to report/text/template.txt index 5cc5d14d77..68f2632f52 100644 --- a/report/text/template.go +++ b/report/text/template.txt @@ -1,6 +1,4 @@ -package text - -const templateContent = `Results: +Results: {{range $filePath,$fileErrors := .Errors}} Golang errors in file: [{{ $filePath }}]: {{range $index, $error := $fileErrors}} @@ -23,4 +21,3 @@ Golang errors in file: [{{ $filePath }}]: {{- danger .Stats.NumFound }} {{- end }} -` diff --git a/report/text/writer.go b/report/text/writer.go index c773cc7685..08698ea4ca 100644 --- a/report/text/writer.go +++ b/report/text/writer.go @@ -3,6 +3,9 @@ package text import ( "bufio" "bytes" + + // use go embed to import template + _ "embed" "fmt" "io" "strconv" @@ -17,6 +20,9 @@ var ( errorTheme = color.New(color.FgLightWhite, color.BgRed) warningTheme = color.New(color.FgBlack, color.BgYellow) defaultTheme = color.New(color.FgWhite, color.BgBlack) + + //go:embed template.txt + templateContent string ) // WriteReport write a (colorized) report in text format